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

lib/interfaces/process/items/item_metas.dart

@@ -28,12 +28,15 @@ class ItemMeta {
   ///   /// 【TODO】 暂时屏蔽 buyStatus
   // WorkingItemStatusEnum? buyStatus;
 
+  int? rimWidth;
+
   ItemMeta(
     this.name, {
     required this.measureType,
     required this.description,
     required this.outputs,
     // this.buyStatus,
+    this.rimWidth,
     this.briefAnnotation = '',
     this.childItems = const [],
   });

lib/process/calcuators/urm_calcuators/urm_shell_den_measure.dart

@@ -23,13 +23,14 @@ class URMShellDenMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
 
       URMMeasureProcessResult? outResult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMDenMeasure,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
       var result = outResult?.denMeasureResult;
 

lib/process/calcuators/urm_calcuators/urm_shell_den_vel_measure.dart

@@ -24,13 +24,13 @@ class URMShellDenVelMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
-
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
       URMMeasureProcessResult? outresult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMDenVelMeasure,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
       if (outresult == null) {
         return;

lib/process/calcuators/urm_calcuators/urm_shell_density_measure.dart

@@ -21,13 +21,13 @@ class URMShellDensityMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
-
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
       URMMeasureProcessResult? outresult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMDen,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
       if (outresult == null) {
         return;

lib/process/calcuators/urm_calcuators/urm_shell_fractal_dim_measure.dart

@@ -20,13 +20,13 @@ class URMShellFractalDimMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
-
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
       URMMeasureProcessResult? outresult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMFracetalDim,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
       if (outresult == null) {
         return;

lib/process/calcuators/urm_calcuators/urm_shell_perfusion_measure.dart

@@ -25,13 +25,14 @@ class URMShellPerfusionMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
 
       URMMeasureProcessResult? outResult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMPerfusion,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
 
       if (outResult != null) {

lib/process/calcuators/urm_calcuators/urm_shell_vel_measure.dart

@@ -23,13 +23,14 @@ class URMShellVelMeasureCal extends URMShellMeasureCal {
       if (ref.feature == null) return;
       if (ref.application is! URMApplication) return;
       final URMApplication urmApplication = ref.application as URMApplication;
+      double rimWidth = (ref.meta.rimWidth ?? 0) / 10;
 
       URMMeasureProcessResult? outresult =
           await urmApplication.getURMMeasureResult(
         urmMeasureType: URMMeasureType.URMVelMeasure,
         rOIType: URMROIType.URMShell,
         srcDPoints: param!.srcDPoints,
-        shellWidth: 0.1,
+        shellWidth: rimWidth,
       );
       if (outresult == null) {
         return;

lib/process/items/item_meta_convert.dart

@@ -10,8 +10,11 @@ class ItemMetaConverter {
   late String _measureType = dto.measureTypeName!;
 
   late final List<ItemOutputMeta> _outputs;
+
   late final List<ItemMeta> _childItems = [];
 
+  int? _rimWidth;
+
   /// 输出测量项元
   ItemMeta output() {
     if (dto.multiMethodItems != null && dto.multiMethodItems!.isNotEmpty) {
@@ -35,6 +38,7 @@ class ItemMetaConverter {
 
       /// 【TODO】 暂时屏蔽 buyStatus
       // buyStatus: dto.status,
+      rimWidth: _rimWidth,
     );
 
     return meta;
@@ -62,6 +66,9 @@ class ItemMetaConverter {
         _childItems.add(_convertChildItem(child));
       }
     }
+    if (workingItem.rimWidth != null) {
+      _rimWidth = workingItem.rimWidth;
+    }
     _outputs = _convetOutputsFromCalc(workingItem.calculator!);
   }
 

pubspec.yaml

@@ -100,7 +100,7 @@ dependency_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
-      ref: "625df14"
+      ref: "38056fe"
   fis_lib_business_components:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_business_components.git