瀏覽代碼

add URM Rect Measure

gavin.chen 9 月之前
父節點
當前提交
7a85c7170e

+ 11 - 10
lib/process/items/factory.dart

@@ -19,8 +19,8 @@ import 'package:fis_measure/process/primitives/combos/two_location.dart';
 import 'package:fis_measure/process/primitives/combos/two_ray.dart';
 import 'package:fis_measure/process/primitives/combos/two_straightline.dart';
 import 'package:fis_measure/process/primitives/combos/two_sv.dart';
-import 'package:fis_measure/process/primitives/combos/urm_den.dart';
-import 'package:fis_measure/process/primitives/combos/urm_vel.dart';
+import 'package:fis_measure/process/primitives/urm_measure/urm_den.dart';
+import 'package:fis_measure/process/primitives/urm_measure/urm_vel.dart';
 import 'package:fis_measure/process/primitives/detection.dart';
 import 'package:fis_measure/process/primitives/ellipse.dart';
 import 'package:fis_measure/process/primitives/empty.dart';
@@ -38,6 +38,7 @@ import 'package:fis_measure/process/primitives/trace.dart';
 import 'package:fis_measure/process/primitives/twoline_angle.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_ellipse_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_location_vel.dart';
+import 'package:fis_measure/process/primitives/urm_measure/urm_rect_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_shell_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_vessel_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_curvature_trace_measure.dart';
@@ -260,7 +261,7 @@ class MeasureItemFactory {
     _singleton._register(MeasureTypes.URMCurvatureTraceMeasure,
         URMCurvatureTraceMeasure.createURMCurvatureTraceMeasure);
     _singleton._register(
-        MeasureTypes.URMRectDensity, URMRectMeasure.CreateURMRectDensity);
+        MeasureTypes.URMRectDensity, URMRectMeasure.createURMRectDensity);
     _singleton._register(
         MeasureTypes.URMTraceDensity, URMTraceMeasure.CreateURMTraceDensity);
     _singleton._register(MeasureTypes.URMEllipseDensity,
@@ -268,7 +269,7 @@ class MeasureItemFactory {
     _singleton._register(MeasureTypes.URMLocationVel,
         URMLocationVelMeasure.createURMLocationVelMeasure);
     _singleton._register(
-        MeasureTypes.URMRectFractalDim, URMRectMeasure.CreateURMRectFractalDim);
+        MeasureTypes.URMRectFractalDim, URMRectMeasure.createURMRectFractalDim);
     _singleton._register(MeasureTypes.URMTraceFractalDim,
         URMTraceMeasure.CreateURMTraceFractalDim);
     _singleton._register(MeasureTypes.URMEllipseFractalDim,
@@ -276,8 +277,8 @@ class MeasureItemFactory {
     // _singleton._register(
     //     MeasureTypes.FractalDimURM, FractalDimURM.CreateFractalDimURM);
     // _singleton._register(MeasureTypes.DensityURM, DensityURM.CreateDensityURM);
-    _singleton._register(MeasureTypes.URMDen, URMDen.Create);
-    _singleton._register(MeasureTypes.URMVel, URMVel.Create);
+    _singleton._register(MeasureTypes.URMDen, URMDen.create);
+    _singleton._register(MeasureTypes.URMVel, URMVel.create);
 
     // _singleton._register(MeasureTypes.AutoUterusVertical,
     //     AutoUterusVertical.CreateAutoUterusVertical);
@@ -286,7 +287,7 @@ class MeasureItemFactory {
     _singleton._register(MeasureTypes.URMDensityRation, AbRatio.Create);
     _singleton._register(MeasureTypes.URMFractalDimRation, AbRatio.Create);
     _singleton._register(
-        MeasureTypes.URMRectDenMeasure, URMRectMeasure.CreateURMRectDenMeasure);
+        MeasureTypes.URMRectDenMeasure, URMRectMeasure.createURMRectDenMeasure);
     _singleton._register(MeasureTypes.URMTraceDenMeasure,
         URMTraceMeasure.CreateURMTraceDenMeasure);
     _singleton._register(MeasureTypes.URMEllipseDenMeasure,
@@ -307,13 +308,13 @@ class MeasureItemFactory {
     _singleton._register(
         MeasureTypes.URMVesselMeasure, URMVesselMeasure.createURMVesselMeasure);
     _singleton._register(
-        MeasureTypes.URMRectPerfusion, URMRectMeasure.CreateURMRectPerfusion);
+        MeasureTypes.URMRectPerfusion, URMRectMeasure.createURMRectPerfusion);
     _singleton._register(MeasureTypes.URMTracePerfusion,
         URMTraceMeasure.CreateURMTracePerfusion);
     _singleton._register(MeasureTypes.URMEllipsePerfusion,
         URMEllipseMeasure.createURMEllipseDenMeasure);
     _singleton._register(
-        MeasureTypes.URMRectHist, URMRectMeasure.CreateURMRectHist);
+        MeasureTypes.URMRectHist, URMRectMeasure.createURMRectHist);
     _singleton._register(
         MeasureTypes.URMTraceHist, URMTraceMeasure.CreateURMTraceHist);
     _singleton._register(
@@ -337,7 +338,7 @@ class MeasureItemFactory {
         URMShellMeasure.createURMShellHistMeasure);
 
     _singleton._register(MeasureTypes.URMRectDenVelMeasure,
-        URMRectMeasure.CreateURMRectDenVelMeasure);
+        URMRectMeasure.createURMRectDenVelMeasure);
     _singleton._register(MeasureTypes.URMTraceDenVelMeasure,
         URMTraceMeasure.CreateURMTraceDenVelMeasure);
     _singleton._register(MeasureTypes.URMEllipseDenVelMeasure,

+ 1 - 1
lib/process/primitives/combos/urm_den.dart → lib/process/primitives/urm_measure/urm_den.dart

@@ -61,7 +61,7 @@ class URMDen extends URMDenAbstract<URMVelFeature> {
   @override
   void onCancelingOnce() {}
 
-  static URMDen crateURMDen(ItemMeta meta, [IMeasureItem? parent]) {
+  static URMDen create(ItemMeta meta, [IMeasureItem? parent]) {
     var urmDen = URMDen(meta);
     urmDen.calculator = URMDenCal(urmDen);
 

+ 48 - 0
lib/process/primitives/urm_measure/urm_rect_measure.dart

@@ -22,6 +22,54 @@ class URMRectMeasure extends MeasureItem<URMRectFeature> {
     return measureRect;
   }
 
+  static URMRectMeasure createURMRectDensity(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
+  static URMRectMeasure createURMRectFractalDim(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
+  static URMRectMeasure createURMRectDenMeasure(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
+  static URMRectMeasure createURMRectPerfusion(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
+  static URMRectMeasure createURMRectHist(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
+  static URMRectMeasure createURMRectDenVelMeasure(ItemMeta meta,
+      [IMeasureItem? parent]) {
+    URMRectMeasure measureRect = URMRectMeasure(meta, parent);
+    // TODO 实现专用的 Cal
+    measureRect.calculator = URMRectCal(measureRect, type: meta.name);
+    return measureRect;
+  }
+
   @override
   bool onExecuteMouse(PointInfo args) {
     if (waitingResult) return false;

+ 1 - 1
lib/process/primitives/combos/urm_vel.dart → lib/process/primitives/urm_measure/urm_vel.dart

@@ -42,7 +42,7 @@ class URMVel extends URMVelAbstract<URMVelFeature> {
   @override
   void onCancelingOnce() {}
 
-  static URMVel crateURMVel(ItemMeta meta, [IMeasureItem? parent]) {
+  static URMVel create(ItemMeta meta, [IMeasureItem? parent]) {
     var urmVel = URMVel(meta);
     urmVel.calculator = URMVelCal(urmVel);