Browse Source

添加默认URM后处理配置

jeremy 9 months ago
parent
commit
1d801a5ca6
2 changed files with 19 additions and 51 deletions
  1. 18 21
      URMManage/ImagePostProcess.cs
  2. 1 30
      URMManage/UrmProcessRequest.cs

+ 18 - 21
URMManage/ImagePostProcess.cs

@@ -75,22 +75,19 @@ namespace WingAIDiagnosisService.URMManage
             InitURMProcessor(request);
             try
             {
-                var drawUniqueCode = request.GetDrawUniqueCode();
                 var processorClass = UrmProcessorList.FirstOrDefault(x => x.GUID == request.GUID);
+                processorClass.LastActiveTime = DateTime.UtcNow;
                 var processor = processorClass.Processor;
 
-                var drawParamChanged = processorClass.DrawUniqueCode != drawUniqueCode;
-                if (drawParamChanged)
-                {
-                    processor.setUrmDrawParam(request.ZoomOn, request.ZoomRoix, request.ZoomRoiy, request.ZoomRoiwidth, request.ZoomRoiheight, request.Roix, request.Roiy, request.Roiwidth, request.Roiheight, request.LeftRight, request.UpDown, request.ScreenWidth, request.ScreenHeight, false);
-                    processorClass.Processor = processor;
-                    processorClass.DrawUniqueCode = drawUniqueCode;
-                }
+                // var drawUniqueCode = request.GetDrawUniqueCode();
+                // var drawParamChanged = processorClass.DrawUniqueCode != drawUniqueCode;
+                // if (drawParamChanged)
+                // {
+                //     processor.setUrmDrawParam(request.ZoomOn, request.ZoomRoix, request.ZoomRoiy, request.ZoomRoiwidth, request.ZoomRoiheight, request.Roix, request.Roiy, request.Roiwidth, request.Roiheight, request.LeftRight, request.UpDown, request.ScreenWidth, request.ScreenHeight, false);
+                //     processorClass.Processor = processor;
+                //     processorClass.DrawUniqueCode = drawUniqueCode;
+                // }
                 processor.CalTracePointMask(request.UrmTraceDPoints);
-
-                // imgBase64 = processor.getURMImageBase64(true, ref urmMinVal, ref urmMaxVal);
-                // processorClass.UrmMinVal = urmMinVal;
-                // processorClass.UrmMaxVal = urmMaxVal;
                 imgBase64 = processor.getURMImageBase64(true, ref urmMinVal, ref urmMaxVal);
                 processorClass.UrmMinVal = urmMinVal;
                 processorClass.UrmMaxVal = urmMaxVal;
@@ -116,18 +113,18 @@ namespace WingAIDiagnosisService.URMManage
             InitURMProcessor(request);
             try
             {
-                var drawUniqueCode = request.GetDrawUniqueCode();
                 var processorClass = UrmProcessorList.FirstOrDefault(x => x.GUID == request.GUID);
+                processorClass.LastActiveTime = DateTime.UtcNow;
                 var processor = processorClass.Processor;
 
-                var drawParamChanged = processorClass.DrawUniqueCode != drawUniqueCode;
-                if (drawParamChanged)
-                {
-                    processor.setUrmDrawParam(request.ZoomOn, request.ZoomRoix, request.ZoomRoiy, request.ZoomRoiwidth, request.ZoomRoiheight, request.Roix, request.Roiy, request.Roiwidth, request.Roiheight, request.LeftRight, request.UpDown, request.ScreenWidth, request.ScreenHeight, false);
-                    processorClass.Processor = processor;
-                    processorClass.DrawUniqueCode = drawUniqueCode;
-                }
-                processorClass.LastActiveTime = DateTime.UtcNow;
+                // var drawUniqueCode = request.GetDrawUniqueCode();
+                // var drawParamChanged = processorClass.DrawUniqueCode != drawUniqueCode;
+                // if (drawParamChanged)
+                // {
+                //     processor.setUrmDrawParam(request.ZoomOn, request.ZoomRoix, request.ZoomRoiy, request.ZoomRoiwidth, request.ZoomRoiheight, request.Roix, request.Roiy, request.Roiwidth, request.Roiheight, request.LeftRight, request.UpDown, request.ScreenWidth, request.ScreenHeight, false);
+                //     processorClass.Processor = processor;
+                //     processorClass.DrawUniqueCode = drawUniqueCode;
+                // }
                 imgBase64 = processor.CreateUrmColorbarImage();
             }
             catch (Exception ex)

+ 1 - 30
URMManage/UrmProcessRequest.cs

@@ -121,36 +121,7 @@ namespace WingAIDiagnosisService.URMManage
         {
             try
             {
-                var datas = new StringBuilder();
-                datas.Append(DenDataPath);
-                datas.Append(DirDataPath);
-                datas.Append(VelDataPath);
-                datas.Append(AngleDataPath);
-                datas.Append(MaskDataPath);
-                datas.Append(FamilyName);
-                datas.Append(TypeInfo);
-                datas.Append(NativeId);
-                datas.Append(UrmImageType);
-                datas.Append(UrmBlend);
-                datas.Append(DownsampleIndex);
-                datas.Append(IntPowerDen);
-                datas.Append(IntPowerDir);
-                datas.Append(SigmaGauss);
-                datas.Append(VessScale);
-                datas.Append(VelMaxScaler);
-                datas.Append(VelMinScaler);
-                datas.Append(Iterations);
-                datas.Append(Res);
-                datas.Append(Urmsrcwidth);
-                datas.Append(Urmsrcheight);
-                datas.Append(ScaleOfPixel_x);
-                datas.Append(ScaleOfPixel_y);
-                datas.Append(ImgProcessVer);
-                datas.Append(Isliner);
-                datas.Append(Newtonsoft.Json.JsonConvert.SerializeObject(UrmTraceDPoints));
-                datas.Append(RemedicalCode);
-                datas.Append(Token);
-                return ToSHA256(datas.ToString());
+                return ToSHA256(GetUniqueValue());
             }
             catch
             {