1、测量库更新

lib/process/calcuators/urm_calcuators/urm_curvature_trace_measure.dart

@@ -1,6 +1,8 @@
 import 'package:fis_common/logger/logger.dart';
+import 'package:fis_measure/interfaces/process/items/item_metas.dart';
 import 'package:fis_measure/interfaces/process/items/terms.dart';
 import 'package:fis_measure/process/primitives/trace.dart';
+import 'package:fis_measure/process/primitives/urm_measure/urm_curvature_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_curvature_trace_measure.dart';
 import 'package:fis_measure/process/workspace/urm/application.dart';
 import 'package:fis_jsonrpc/rpc.dart';
@@ -41,12 +43,31 @@ class URMCurvatureTraceMeasureCal extends Calculator<Trace, double> {
         if (feature is! TraceCurvatureFeature) return;
         feature.autoLinePoints =
             urmApplication.urmPointsToDPoints(result.resultDPoints);
-        for (var output in ref.meta.outputs) {
-          if (output.name == MeasureTerms.URMCurvature) {
-            output.unit = VidUsUnit.None;
-            feature.updateFloatValue(output, result.resultData, output.unit);
+
+        ItemMeta? meta = feature.refItem.meta;
+        var revert = meta.name == URMCurvatureMeasure.revertRatioName;
+        if (revert) {
+          for (var output in ref.meta.outputs) {
+            if (output.name == MeasureTerms.URMCurvature) {
+              output.unit = VidUsUnit.None;
+              feature.updateFloatValue(
+                  output, 1 / result.resultData, output.unit);
+            }
+          }
+        } else {
+          for (var output in ref.meta.outputs) {
+            if (output.name == MeasureTerms.URMCurvature) {
+              output.unit = VidUsUnit.None;
+              feature.updateFloatValue(output, result.resultData, output.unit);
+            }
           }
         }
+        // for (var output in ref.meta.outputs) {
+        //   if (output.name == MeasureTerms.URMCurvature) {
+        //     output.unit = VidUsUnit.None;
+        //     feature.updateFloatValue(output, result.resultData, output.unit);
+        //   }
+        // }
       } else {
         throw Exception("URM Measure API error");
       }

lib/process/calcuators/urm_calcuators/urm_curve_curvature_line.dart

@@ -1,5 +1,5 @@
 import 'package:fis_common/logger/logger.dart';
-import 'package:fis_measure/interfaces/process/items/item.dart';
+import 'package:fis_measure/interfaces/process/items/item_metas.dart';
 import 'package:fis_measure/interfaces/process/items/terms.dart';
 import 'package:fis_measure/process/primitives/trace.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_curvature_measure.dart';
@@ -42,29 +42,17 @@ class URMCurveCurvatureLineCal extends Calculator<Trace, double> {
         if (feature is! TraceCurvatureLineFeature) return;
         feature.autoLinePoints =
             urmApplication.urmPointsToDPoints(result.resultDPoints);
-        if (feature.refItem.parent is URMCurvatureMeasure) {
-          IMeasureItem? parent = feature.refItem.parent;
-          var revert =
-              parent?.meta.description == URMCurvatureMeasure.revertRatioName;
-          if (revert) {
-            for (var output in ref.meta.outputs) {
-              if (output.name == URMCurvatureMeasure.revertRatioName) {
-                output.unit = VidUsUnit.None;
-                feature.updateFloatValue(
-                    output, 1 / result.resultData, output.unit);
-              }
-            }
-          } else {
-            for (var output in ref.meta.outputs) {
-              if (output.name == URMCurvatureMeasure.ratioName) {
-                output.unit = VidUsUnit.None;
-                feature.updateFloatValue(
-                    output, result.resultData, output.unit);
-              }
+        ItemMeta? meta = feature.refItem.meta;
+        var revert = meta.name == URMCurvatureMeasure.revertRatioName;
+        if (revert) {
+          for (var output in ref.meta.outputs) {
+            if (output.name == MeasureTerms.URMCurvature) {
+              output.unit = VidUsUnit.None;
+              feature.updateFloatValue(
+                  output, 1 / result.resultData, output.unit);
             }
           }
         } else {
-          /// TODO 后端配置 需要测试
           for (var output in ref.meta.outputs) {
             if (output.name == MeasureTerms.URMCurvature) {
               output.unit = VidUsUnit.None;

lib/process/calcuators/urm_calcuators/urm_straight_curvature_line.dart

@@ -1,8 +1,10 @@
 import 'package:fis_common/logger/logger.dart';
 import 'package:fis_jsonrpc/rpc.dart';
 import 'package:fis_measure/interfaces/date_types/point.dart';
+import 'package:fis_measure/interfaces/process/items/item_metas.dart';
 import 'package:fis_measure/interfaces/process/items/terms.dart';
 import 'package:fis_measure/process/primitives/straightline.dart';
+import 'package:fis_measure/process/primitives/urm_measure/urm_curvature_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_straight_curvature_line_measure.dart';
 import 'package:fis_measure/process/workspace/urm/application.dart';
 import 'package:vid/us/vid_us_unit.dart';
@@ -49,12 +51,30 @@ class URMStraightCurvatureLineCal extends Calculator<StraightLine, double> {
         final feature = ref.feature!;
         if (feature is! StraightCurvatureFeature) return;
         feature.autoLinePoints = app.urmPointsToDPoints(result.resultDPoints);
-        for (var output in ref.meta.outputs) {
-          if (output.name == MeasureTerms.URMCurvature) {
-            output.unit = VidUsUnit.None;
-            feature.updateFloatValue(output, result.resultData, output.unit);
+        ItemMeta? meta = feature.refItem.meta;
+        var revert = meta.name == URMCurvatureMeasure.revertRatioName;
+        if (revert) {
+          for (var output in ref.meta.outputs) {
+            if (output.name == MeasureTerms.URMCurvature) {
+              output.unit = VidUsUnit.None;
+              feature.updateFloatValue(
+                  output, 1 / result.resultData, output.unit);
+            }
+          }
+        } else {
+          for (var output in ref.meta.outputs) {
+            if (output.name == MeasureTerms.URMCurvature) {
+              output.unit = VidUsUnit.None;
+              feature.updateFloatValue(output, result.resultData, output.unit);
+            }
           }
         }
+        // for (var output in ref.meta.outputs) {
+        //   if (output.name == MeasureTerms.URMCurvature) {
+        //     output.unit = VidUsUnit.None;
+        //     feature.updateFloatValue(output, result.resultData, output.unit);
+        //   }
+        // }
       } else {
         throw Exception("URM Measure API error");
       }

lib/process/primitives/urm_measure/urm_curvature_measure.dart

@@ -3,8 +3,8 @@ import 'package:fis_measure/interfaces/process/items/item_metas.dart';
 import 'package:fis_measure/interfaces/process/items/types.dart';
 
 class URMCurvatureMeasure {
-  static String ratioName = "URMCurvature(E/A)";
-  static String revertRatioName = "URMCurvature(A/E)";
+  static String ratioName = "URMCurvatureAE";
+  static String revertRatioName = "URMCurvatureEA";
   URMCurvatureMeasure(ItemMeta meta, IMeasureItem parent);
 
   static URMCurvatureMeasure createURMCurvatureMeasure(

pubspec.yaml

@@ -66,7 +66,7 @@ dependencies:
   fis_i18n:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git
-      ref: "94500e9"
+      ref: "85b7102"
   fis_lib_qrcode:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_qrcode.git