Ver código fonte

Merge branch 'master' of http://git.ius.plus:88/Project-Wing/fis_lib_measure

gavin.chen 9 meses atrás
pai
commit
5bc441c022

+ 1 - 5
lib/process/calcuators/urm_calcuators/urm_ellipse_perfusion.dart

@@ -3,7 +3,6 @@ import 'dart:typed_data';
 
 import 'package:fis_common/logger/logger.dart';
 import 'package:fis_jsonrpc/rpc.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/calcuators/urm_calcuators/urm_ellipse_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_ellipse_measure.dart';
@@ -34,10 +33,7 @@ class URMEllipsePerfusionCal extends URMEllipseMeasureCal {
 
       if (outResult != null) {
         final feature = ref.feature!;
-        feature.updateStringValue(
-            ItemOutputMeta("Placeholder", "Placeholder", VidUsUnit.None),
-            "",
-            VidUsUnit.None);
+
         for (var output in ref.meta.outputs) {
           if (output.name == MeasureTerms.URMPerfusionIndex) {
             output.unit = VidUsUnit.None;

+ 1 - 5
lib/process/calcuators/urm_calcuators/urm_rect_perfusion.dart

@@ -3,7 +3,6 @@ import 'dart:typed_data';
 
 import 'package:fis_common/logger/logger.dart';
 import 'package:fis_jsonrpc/rpc.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/calcuators/urm_calcuators/urm_rect_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_rect_measure.dart';
@@ -35,10 +34,7 @@ class URMRectPerfusionCal extends URMRectMeasureCal {
 
       if (outResult != null) {
         final feature = ref.feature!;
-        feature.updateStringValue(
-            ItemOutputMeta("Placeholder", "Placeholder", VidUsUnit.None),
-            "",
-            VidUsUnit.None);
+
         for (var output in ref.meta.outputs) {
           if (output.name == MeasureTerms.URMPerfusionIndex) {
             output.unit = VidUsUnit.None;

+ 1 - 5
lib/process/calcuators/urm_calcuators/urm_shell_perfusion_measure.dart

@@ -5,7 +5,6 @@ import 'dart:ui' as ui;
 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/calcuators/urm_calcuators/urm_shell_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_shell_measure.dart';
@@ -42,10 +41,7 @@ class URMShellPerfusionMeasureCal extends URMShellMeasureCal {
           if (output.name == MeasureTerms.URMPerfusionIndex) {
             output.unit = VidUsUnit.None;
             feature.updateFloatValue(output, outResult.resultData, output.unit);
-            feature.updateStringValue(
-                ItemOutputMeta("Placeholder", "Placeholder", VidUsUnit.None),
-                "",
-                VidUsUnit.None);
+
             if (feature is! ShellPerfusionImageFeature) return;
             if (outResult.perfusionImgBase64 != null) {
               feature.perfusionImg =

+ 1 - 5
lib/process/calcuators/urm_calcuators/urm_trace_perfusion.dart

@@ -1,6 +1,5 @@
 import 'package:fis_common/logger/logger.dart';
 import 'package:fis_jsonrpc/rpc.dart';
-import 'package:fis_measure/interfaces/process/items/item_metas.dart';
 import 'package:fis_measure/process/calcuators/urm_calcuators/urm_trace_measure.dart';
 import 'package:fis_measure/process/primitives/urm_measure/urm_trace_measure.dart';
 import 'package:fis_measure/process/workspace/urm/application.dart';
@@ -39,10 +38,7 @@ class URMTracePerfusionCal extends URMTraceMeasureCal {
         final first = ref.meta.outputs.first;
         first.unit = VidUsUnit.None;
         if (first == null) return;
-        feature.updateStringValue(
-            ItemOutputMeta("Placeholder", "Placeholder", VidUsUnit.None),
-            "",
-            VidUsUnit.None);
+
         feature.updateFloatValue(first, outresult.resultData, first.unit);
 
         if (feature is! TracePerfusionImageFeature) return;

+ 6 - 1
lib/process/calcuators/urm_calcuators/urm_vessel_measure.dart

@@ -2,11 +2,13 @@ import 'dart:math';
 
 import 'package:fis_common/logger/logger.dart';
 import 'package:fis_jsonrpc/rpc.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/urm_measure/urm_vessel_measure.dart';
 
 // import 'package:fis_measure/process/primitives/urm_straightline.dart';
 import 'package:fis_measure/process/workspace/urm/application.dart';
+import 'package:vid/us/vid_us_unit.dart';
 // import 'package:fis_measure/view/measure/measure_images_bar.dart';
 import 'dart:math' as math;
 import '../calculator.dart';
@@ -49,7 +51,10 @@ class URMVesselMeasureCal extends Calculator<URMVesselMeasure, double> {
         final pp1 = viewport.convert(p1);
         final pp2 = viewport.convert(p2);
         final cmlength = (pp2 - pp1).length.abs();
-
+        feature.updateStringValue(
+            ItemOutputMeta("Placeholder", "Placeholder", VidUsUnit.None),
+            "",
+            VidUsUnit.None);
         for (var output in ref.meta.outputs) {
           if (output.name == MeasureTerms.MaxVessDistance) {
             // output.unit = VidUsUnit.None;