测量

URMManage/ImagePostProcess.cs

@@ -185,22 +185,6 @@ namespace WingAIDiagnosisService.URMManage
             {
                 var processor = UrmProcessorList.FirstOrDefault(x => x.GUID == request.GUID);
                 processor.LastActiveTime = DateTime.UtcNow;
-                //赋值
-               
-                processor.Processor.setUrmParams(RecordParams.UrmImageType, request.UrmImageType);
-                processor.Processor.setUrmParams(RecordParams.UrmBlend, request.UrmBlend ? 2 : 0);
-                processor.Processor.setUrmParams(RecordParams.URMDownSampleIndex, request.DownsampleIndex);
-                processor.Processor.setUrmParams(RecordParams.URMIntPowerDen, request.IntPowerDen);
-                processor.Processor.setUrmParams(RecordParams.URMIntPowerDir, request.IntPowerDir);
-                processor.Processor.setUrmParams(RecordParams.URMSigmaGauss, request.SigmaGauss);
-                processor.Processor.setUrmParams(RecordParams.URMVessScale, request.VessScale);
-                processor.Processor.setUrmParams(RecordParams.URMVelMaxScaler, request.VelMaxScaler);
-                processor.Processor.setUrmParams(RecordParams.URMVelMinScaler, request.VelMinScaler);
-                processor.Processor.setUrmParams(RecordParams.URMIterations, request.Iterations);
-                processor.Processor.setUrmBaseParam(request.Res, processor.DenArray, processor.DirArray, processor.VelArray, processor.AngleArray, processor.MaskArray, request.Urmsrcwidth, request.Urmsrcheight, request.ScaleOfPixel_x, request.ScaleOfPixel_y, request.ImgProcessVer);
-                processor.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);
-                processor.Processor.CalTracePointMask(request.UrmTraceDPoints);
-                processor.Processor.GetURMImage();
 
                 urmMinVal = 0;
                 urmMaxVal = 0;
@@ -363,15 +347,34 @@ namespace WingAIDiagnosisService.URMManage
                     NativeArray MaskArray = ResultDataIOHelper.ReadByteArrayFromFile(request.MaskDataPath, request.Urmsrcwidth * request.Urmsrcheight); // Mask
 
                     Logger.WriteLineInfo("AIDiagnosis DoUrmProcess InitURMProcessor init"); // 参数设置
-                    var UrmProcessor = new URMProcess();
-                    var URMProcessInitSuccess = UrmProcessor.init(request.FamilyName, request.TypeInfo, request.NativeId);
+                    var urmProcessor = new URMProcess();
+                    urmProcessor.init(request.FamilyName, request.TypeInfo, request.NativeId);
+                    //测量
+                    if (request.ProcessType == 3)
+                    {
+                        //赋值
+                        urmProcessor.setUrmParams(RecordParams.UrmImageType, request.UrmImageType);
+                        urmProcessor.setUrmParams(RecordParams.UrmBlend, request.UrmBlend ? 2 : 0);
+                        urmProcessor.setUrmParams(RecordParams.URMDownSampleIndex, request.DownsampleIndex);
+                        urmProcessor.setUrmParams(RecordParams.URMIntPowerDen, request.IntPowerDen);
+                        urmProcessor.setUrmParams(RecordParams.URMIntPowerDir, request.IntPowerDir);
+                        urmProcessor.setUrmParams(RecordParams.URMSigmaGauss, request.SigmaGauss);
+                        urmProcessor.setUrmParams(RecordParams.URMVessScale, request.VessScale);
+                        urmProcessor.setUrmParams(RecordParams.URMVelMaxScaler, request.VelMaxScaler);
+                        urmProcessor.setUrmParams(RecordParams.URMVelMinScaler, request.VelMinScaler);
+                        urmProcessor.setUrmParams(RecordParams.URMIterations, request.Iterations);
+                        urmProcessor.setUrmBaseParam(request.Res, DenArray, DirArray, VelArray, AngleArray, MaskArray, request.Urmsrcwidth, request.Urmsrcheight, request.ScaleOfPixel_x, request.ScaleOfPixel_y, request.ImgProcessVer);
+                        urmProcessor.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);
+                        urmProcessor.CalTracePointMask(request.UrmTraceDPoints);
+                        urmProcessor.GetURMImage();
+                    }
 
                     Logger.WriteLineInfo("AIDiagnosis DoUrmProcess InitURMProcessor setUrmParams");
 
                     processorClass = new URMProcessorClass
                     {
                         GUID = request.GUID,
-                        Processor = UrmProcessor,
+                        Processor = urmProcessor,
                         LastActiveTime = DateTime.UtcNow,
                         DenArray = DenArray,
                         DirArray = DirArray,

URMManage/UrmProcessRequest.cs

@@ -208,11 +208,7 @@ namespace WingAIDiagnosisService.URMManage
         {
             try
             {
-                var datas = new StringBuilder();
-                datas.Append(Token);
-                datas.Append(RemedicalCode);
-                datas.Append(ProcessType);
-                return ToSHA256(datas.ToString());
+                return ToSHA256(GetUniqueValue());
             }
             catch
             {