Browse Source

fit urm um convert

Melon 9 months ago
parent
commit
cf01414b86
4 changed files with 14 additions and 5 deletions
  1. 1 0
      lib/values/unit_desc.dart
  2. 10 2
      lib/view/result/converter.dart
  3. 2 2
      pubspec.lock
  4. 1 1
      pubspec.yaml

+ 1 - 0
lib/values/unit_desc.dart

@@ -46,6 +46,7 @@ class UnitDescriptionMap {
     //Length
     _add(VidUsUnit.cm);
     _add(VidUsUnit.mm);
+    _add(VidUsUnit.um, "μm");
     _add(VidUsUnit.inch, 'in');
     _add(VidUsUnit.ft);
     //Time

+ 10 - 2
lib/view/result/converter.dart

@@ -20,11 +20,14 @@ class FeatureValueDescConverter {
 
   String kidIdPlaceStr = ' ';
   String kidIdStr = ' ';
+  bool _isCurrURM = false;
 
   List<ResultLine> generate(int idLength) {
     idPlaceStr = ' '.padRight(idLength, ' ');
     idStr = feature.id.toString().padRight(idLength, ' ');
 
+    _isCurrURM = feature.refItem.meta.name.contains("URM");
+
     final List<ResultLine> arr = [];
     final mainLines = _findFeatureLines(feature);
     arr.addAll(mainLines);
@@ -172,8 +175,13 @@ class FeatureValueDescConverter {
     try {
       final measureData = Get.find<MeasureDataController>();
       if (distanceUnits.contains(unit)) {
-        return VidUsUnitMap.getUnit(
-            measureData.measureSystemSetting.distanceUnit.index);
+        if (_isCurrURM) {
+          return VidUsUnitMap.getUnit(
+              measureData.measureSystemSetting.uRMDistanceUnit.index);
+        } else {
+          return VidUsUnitMap.getUnit(
+              measureData.measureSystemSetting.distanceUnit.index);
+        }
       }
       if (areaUnits.contains(unit)) {
         return VidUsUnitMap.getUnit(

+ 2 - 2
pubspec.lock

@@ -191,8 +191,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: ed234d396f6e45a8b305adae2e6f2318e9ddd940
-      resolved-ref: ed234d396f6e45a8b305adae2e6f2318e9ddd940
+      ref: "6f1d87578b"
+      resolved-ref: "6f1d87578b23b0ac151297b7d7d5b6215bf65412"
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git"
     source: git
     version: "0.0.1"

+ 1 - 1
pubspec.yaml

@@ -100,7 +100,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: "ed234d396f6e45a8b305adae2e6f2318e9ddd940"
+      ref: "6f1d87578b"
   fis_lib_business_components:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_business_components.git