调整

URMManage/URMAnalysisManager.cs

@@ -256,7 +256,7 @@ namespace WingAIDiagnosisService.URMManage
         {
             var urmFolder = Path.Combine(ServiceManager.RootPath, "URM");
             var urmRunFolder = Path.Combine(ServiceManager.RootPath, "URM", "net6.0");
-            var privatePath = @$"C:\VinnoApp\Depends;C:\VinnoApp\ipp_2018;AIMeasure;AI;Depends;DicomMpeg;Syncfusion;RemoteDiagnosis;vCloud;Test;VFetus;{urmFolder};{urmRunFolder};";
+            var privatePath = @$"C:\VinnoAppLab\Depends;C:\VinnoAppLab\ipp_2018;AIMeasure;AI;Depends;DicomMpeg;Syncfusion;RemoteDiagnosis;vCloud;Test;VFetus;{urmFolder};{urmRunFolder};";
             bool enforcePentiumMode = false;
             string workPathPerCPU = string.Empty;
             string workPathForGPU = string.Empty;

URMManage/URMAnalysisProcessV3.cs

@@ -7,6 +7,8 @@ using System.IO.MemoryMappedFiles;
 using System.Threading;
 using Vinno.DataManager.Utilities;
 using Vinno.DataTypes;
+using WingServerCommon.Log;
+using Logger = WingServerCommon.Log.Logger;
 
 namespace WingAIDiagnosisService.URMManage
 {
@@ -105,7 +107,7 @@ namespace WingAIDiagnosisService.URMManage
                         {
                             case "step1ok":
                                 var needmemorysize = long.Parse(infos[2]);
-                                Logger.ForceWriteLineIf(Debug, "Akio step1ok needmemorysize is {0}", needmemorysize);
+                                Logger.WriteLineInfo($"Akio step1ok needmemorysize is {needmemorysize}");
                                 if (_file != null)
                                     _file.Dispose();
                                 _file = MemoryMappedFile.CreateNew(mapName, needmemorysize,
@@ -114,13 +116,13 @@ namespace WingAIDiagnosisService.URMManage
                                 _SRLibWrapperProcess.StandardInput.WriteLine(step2info);
                                 break;
                             case "step2ok":
-                                Logger.ForceWriteLineIf(Debug, "Akio step2ok");
+                                Logger.WriteLineInfo("Akio step2ok");
                                 signal.Set();
                                 break;
                             case "SRLibFail":
                                 _processFlag = false;
                                 signal.Set();
-                                Logger.WriteLineErrorIf(Debug, "AKio " + e.Data);
+                                Logger.WriteLineError("AKio " + e.Data);
                                 break;
 
                         }
@@ -140,7 +142,7 @@ namespace WingAIDiagnosisService.URMManage
                 signal.Reset();
                 if (ResourceManager.GetValue("Product-GeneralSpecification", "UrmParamLogOut", false))
                 {
-                    Logger.ForceWriteLine("Matlab " + urmFold);
+                    Logger.WriteLineInfo("Matlab " + urmFold);
                 }
 
                 if (_SRLibWrapperProcess.HasExited)
@@ -198,7 +200,7 @@ namespace WingAIDiagnosisService.URMManage
                 }
                 else
                 {
-                    Logger.WriteLineErrorIf(Debug, "Akio:URMAnalysisi TimeOut Or _SRLibWrapperProcess not exit");
+                    Logger.WriteLineError("Akio:URMAnalysisi TimeOut Or _SRLibWrapperProcess not exit");
                 }
                 if (_file != null)
                     _file.Dispose();
@@ -262,8 +264,7 @@ namespace WingAIDiagnosisService.URMManage
                         Buffer.MemoryCopy(pointptr, matangleout.Start.ToPointer(), _urmwidth * _urmheight * sizeof(double), _urmwidth * _urmheight * sizeof(double));
                         pointptr += _urmwidth * _urmheight * sizeof(double);
 
-                        Logger.WriteLineInfo("Akio:_urmBeams is {0},_urmSamples is {1},packets is {2}", _urmwidth,
-                            _urmheight, packets);
+                        Logger.WriteLineInfo($"Akio:_urmBeams is {_urmwidth},_urmSamples is {_urmheight},packets is {packets}");
 
 
                         //_urmModeRecord.SetParameter(RecordParams.URMDenArray, matout, TimeStamp.ErrorTime);
@@ -348,8 +349,7 @@ namespace WingAIDiagnosisService.URMManage
                         Buffer.MemoryCopy(pointptr, matvelout.Start.ToPointer(), _urmwidth * _urmheight * sizeof(double), _urmwidth * _urmheight * sizeof(double));
                         pointptr += _urmwidth * _urmheight * sizeof(double);
 
-                        Logger.WriteLineInfo("Akio:_urmBeams is {0},_urmSamples is {1}", _urmwidth,
-                            _urmheight);
+                        Logger.WriteLineInfo($"Akio:_urmBeams is {_urmwidth},_urmSamples is {_urmheight}");
 
                         //_urmModeRecord.SetParameter(RecordParams.URMDenArray, matout, TimeStamp.ErrorTime);
                         //_urmModeRecord.SetParameter(RecordParams.URMDirArray, matdirout, TimeStamp.ErrorTime);

URMManage/URMFileIO.cs

@@ -4,6 +4,8 @@ using Newtonsoft.Json;
 using Vinno.DataManager.Process;
 using Vinno.Infrastructure;
 using Vinno.Services.ServiceManagerImpl;
+using WingServerCommon.Log;
+using Logger = WingServerCommon.Log.Logger;
 
 namespace WingAIDiagnosisService.URMManage
 {
@@ -87,7 +89,7 @@ namespace WingAIDiagnosisService.URMManage
             }
             WingServerCommon.Log.Logger.WriteLineInfo($"AIService URMAnalysisManager DoURMAnalysis URMFileIO ImagePPRes.Initial");
             ImagePPRes.Initial();
-            Logger.WriteLineInfo("ImagePPRes Initial", familyName, typeInfo, nativeId);
+            Logger.WriteLineInfo($"ImagePPRes Initial familyName:{familyName},typeInfo:{typeInfo},nativeId:{nativeId}");
             WingServerCommon.Log.Logger.WriteLineInfo($"AIService URMAnalysisManager DoURMAnalysis URMFileIO ImagePPRes.Initial, familyName:{familyName}");
             ImagePPRes.Initial(familyName, typeInfo, nativeId);
             WingServerCommon.Log.Logger.WriteLineInfo($"AIService URMAnalysisManager DoURMAnalysis URMFileIO end");
@@ -95,7 +97,7 @@ namespace WingAIDiagnosisService.URMManage
 
         public void UpdateParamJson(String UrmDatapath, int VecLens, int Mlas, int FramesGot, double CenterFrequencyMhz, int SupersonicSpeed, double FrequencyMin, double FrameRateDisplay, double Depth, double X0, double Z0, string ProbeType, double ScaleOfPixel_x, double ScaleOfPixel_y, string section, string MOCOYN, int MidProc_DeciFactor, int VectorStartForMid, int startX, int startY, int width, int height, int? CustomizedStartFrame, int? CustomizedEndFrame, out string parms, out double URMRes)
         {
-            WingServerCommon.Log.Logger.WriteLineInfo($"AIService URMAnalysisManager DoURMAnalysis URMFileIO UpdateParamJson start");
+            Logger.WriteLineInfo($"AIService URMAnalysisManager DoURMAnalysis URMFileIO UpdateParamJson start");
             var urmnalysisparams = new URMAnalysisParam();
             urmnalysisparams.UrmDatapath = UrmDatapath;
             urmnalysisparams.VecLens = VecLens.ToString();

URMManage/URMMeasureAlg.cs

@@ -7,6 +7,8 @@ using System.Collections.Generic;
 using Vinno.Enums;
 using System.Linq;
 using Vinno.Infrastructure.DataTypes;
+using WingServerCommon.Log;
+using Logger = WingServerCommon.Log.Logger;
 
 namespace WingAIDiagnosisService.URMManage
 {
@@ -84,12 +86,32 @@ namespace WingAIDiagnosisService.URMManage
 
         public void Relase()
         {
-            PIA_URMMeasure_Release(_handle);
-            _URMDenMeasureImg.Dispose();
-            _URMVelMeasureImg.Dispose();
+            try
+            {
+                PIA_URMMeasure_Release(_handle);
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineWarn(ex.ToString());
+            }
+            try
+            {
+                _URMDenMeasureImg.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineWarn(ex.ToString());
+            }
+            try
+            {
+                _URMVelMeasureImg.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineWarn(ex.ToString());
+            }
         }
-
-
+        
 
         public URMMeasureDataOutput CalURMMeasureData(URMMeasureDataInput inputparam, int width, int height, double colorMapMax, double colorMapMin)
         {
@@ -103,7 +125,7 @@ namespace WingAIDiagnosisService.URMManage
                 piexlPoints.Add(new DPoint(srcPoint[i].X * width, srcPoint[i].Y * height));
             }
             DPoint[] Points = piexlPoints.ToArray();
-            owner.CreateURMMeasuerImg(URMType.Den, _URMDenMeasureImg.Start, ref _denMax,ref _denMin);
+            owner.CreateURMMeasuerImg(URMType.Den, _URMDenMeasureImg.Start, ref _denMax, ref _denMin);
             owner.CreateURMMeasuerImg(URMType.Vel, _URMVelMeasureImg.Start, ref _velMax, ref _velMin);
             double resultData = 0;
             double velScaler = (_velMax - _velMin) / 255;

URMManage/URMProcess.cs

@@ -13,7 +13,8 @@ using System;
 using Vinno.DataManager.Utilities;
 using SkiaSharp;
 using System.Diagnostics;
-
+using WingServerCommon.Log;
+using Logger = WingServerCommon.Log.Logger;
 
 namespace WingAIDiagnosisService.URMManage
 {
@@ -53,12 +54,12 @@ namespace WingAIDiagnosisService.URMManage
                 ImagePP = new ImagePPNative();
             }
             ImagePP.Initial();
-            Logger.WriteLineInfo("Record.SetProbeApp({0},{1},{2})", familyName, typeInfo, nativeId);
+            Logger.WriteLineInfo($"Record.SetProbeApp({familyName},{typeInfo},{nativeId})");
             ImagePP.Initial(familyName, typeInfo, nativeId);
             // TODO Delete me
             var maplength = new List<int>();
             var result = ImagePP.GetParameter("SRColorMap:AngleMap", "SR_Map_Length", maplength, null);
-            Logger.WriteLineInfo("ImagePP.GetParameter", result);
+            Logger.WriteLineInfo("ImagePP.GetParameter," + result);
             // TODO Delete me
             _urmProcessAlg = new URMProcessAlg(ImagePP);
             _urmType.Init(URMType.Den);
@@ -493,7 +494,7 @@ namespace WingAIDiagnosisService.URMManage
                     }
                     catch (Exception ex)
                     {
-                        Logger.WriteLineError("x:{0}, y:{1}, index:{2}, ex:{3}", x, y, index, ex.Message);
+                        Logger.WriteLineError($"x:{x}, y:{y}, index:{index}, ex:{ex.Message}");
                         throw;
                     }
                 }
@@ -545,15 +546,29 @@ namespace WingAIDiagnosisService.URMManage
             {
                 handle.Free();
             }
-            catch(Exception ex)
+            catch (Exception ex)
+            {
+                Logger.WriteLineWarn(ex.ToString());
+            }
+            try
+            {
+                _urmProcessAlg.Release();
+            }
+            catch (Exception ex)
             {
-                Logger.WriteLineWarning(ex.ToString());
+                Logger.WriteLineWarn(ex.ToString());
             }
-            _urmProcessAlg.Release();
             if (ImagePP != null)
             {
-                ImagePP.Dispose();
-                ImagePP = null;
+                try
+                {
+                    ImagePP.Dispose();
+                    ImagePP = null;
+                }
+                catch (Exception ex)
+                {
+                    Logger.WriteLineWarn(ex.ToString());
+                }
             }
         }
     }