upgrade the opencvsharp to latest version(4.8) to adapt the win10 platform. fix other minor problem that is brought by optimizing the sysmgrApp

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" />
+  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Oxford" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

Bin/x64/Debug/Resources/XMLData/ResourceForMeasureSourceGrid-ZH.xml

@@ -134,8 +134,9 @@
         <member itemKey="20150" itemName="" itemText="未测量"/>
         <member itemKey="20151" itemName="" itemText="正在执行测量"/>
         <member itemKey="20152" itemName="" itemText="测量中断"/>
-        <member itemKey="20153" itemName="" itemText="测量失败"/>
-        <member itemKey="20154" itemName="" itemText="测量完成"/>
+        <member itemKey="20153" itemName="" itemText="测量停止"/>
+		<member itemKey="20154" itemName="" itemText="测量失败"/>		
+        <member itemKey="20155" itemName="" itemText="测量完成"/>
 
 
         <member itemKey="20190" itemName="" itemText="测量结果数据"/>

OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -48,9 +48,11 @@ void OxfordControllerWrapper::CloseClient(void)
 {
 	if (_controllerThread && _controllerThread->IsAlive)
 	{
+		_oxfordControllerData.m_nCommand = OxfordControllerCommand::EXIT;
+		//_controllerThread->Abort();
 	}
 
-	_controllerThread->Abort();
+	
 	//_controllerThread = nullptr;
 	_microscopeController = nullptr;
 	_edSpectrumController = nullptr;
@@ -63,19 +65,14 @@ void OxfordControllerWrapper::CloseClient(void)
 
 OxfordControllerWrapper::~OxfordControllerWrapper(void)
 {	
-	if (_controllerThread && _controllerThread->IsAlive)
-	{
-	}
+	
 
 	CloseClient();
 }
 
 OxfordControllerWrapper::!OxfordControllerWrapper(void)
 {
-	if (_controllerThread && _controllerThread->IsAlive)
-	{
-		
-	}
+	
 	
 	CloseClient();
 }
@@ -126,6 +123,8 @@ void OxfordControllerWrapper::ControllerThreadFunction()
 	{
 		while (true)
 		{
+			if (_oxfordControllerData.m_nCommand == OxfordControllerCommand::EXIT) break;
+				
 			if (m_startControllerEvent->WaitOne(0, true))
 			{
 				m_startControllerEvent->Reset();
@@ -136,7 +135,7 @@ void OxfordControllerWrapper::ControllerThreadFunction()
  			Application::DoEvents();
 			Thread::Sleep(g_nOxfordControllerEventSleepTimerInt);
 		}
-
+		if (_oxfordControllerData.m_nCommand == OxfordControllerCommand::EXIT) break;
 		switch (_oxfordControllerData.m_nCommand)
 		{
 
@@ -1512,7 +1511,7 @@ bool OxfordControllerWrapper::CollectXrayPoints(const long a_nAcTimeMilliseconds
 
 	
 
-	Thread::Sleep(1000);
+	//Thread::Sleep(1000);
 
 	m_startControllerEvent->Set();
 	long nCollectedTime = 1000;
@@ -1573,7 +1572,7 @@ bool OxfordControllerWrapper::CollectXrayArea(const long a_nAcTimeMilliseconds,
 	_oxfordControllerData.m_nPixelNum = a_pXrayDataList[_oxfordControllerData.m_nCollectedXrayCounts].m_nPixelNum;
 	_oxfordControllerData.m_nCollectedPixelCounts = 0;
 
-	Thread::Sleep(1000);
+	//Thread::Sleep(1000);
 
 	m_startControllerEvent->Set();
 

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CFieldPositionMgr.cs

@@ -3,7 +3,7 @@ using OTSDataType;
 using OTSIMGPROC;
 using System;
 using System.Collections.Generic;
-using System.Drawing;
+//using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -76,11 +76,11 @@ namespace OTSModelSharp
 
             //m_listUnmeasuredFieldCentrePoints = fieldmgrclr.GetUnmeasuredFieldCentrePoints(fieldpoints);
 
-            List<Point> fieldpoints = new List<Point>();
+            List<System.Drawing.Point> fieldpoints = new List<System.Drawing.Point>();
             for(int i=0;i<a_listMeasuredFieldCentrePoints.Count;i++)
             {
                 var p = a_listMeasuredFieldCentrePoints[i];
-                fieldpoints.Add(new Point((int)p.X, (int)p.Y));
+                fieldpoints.Add(new System.Drawing.Point((int)p.X, (int)p.Y));
             }
            var sortedlistUnmeasuredFieldCentrePoints = fieldmgrclr.GetUnmeasuredFieldCentrePoints(fieldpoints);
             for (int i = 0; i < sortedlistUnmeasuredFieldCentrePoints.Count; i++)
@@ -157,7 +157,7 @@ namespace OTSModelSharp
             // get left top
             System.Drawing.Point ptLeftTop = m_listFieldCentrePoints[a_nIndex];
             // get field rectangle
-            a_rectField =new Rectangle(ptLeftTop, sizeImage);
+            a_rectField =new System.Drawing.Rectangle(ptLeftTop, sizeImage);
 
             return true;
         }
@@ -267,7 +267,7 @@ namespace OTSModelSharp
             // move to left top postion.
             a_poiField.X -= (a_sizeImageSize.Width / 2);
             a_poiField.Y -= (a_sizeImageSize.Height / 2);
-            Rectangle rectFiled = new Rectangle(a_poiField, a_sizeImageSize);
+            System.Drawing.Rectangle rectFiled = new System.Drawing.Rectangle(a_poiField, a_sizeImageSize);
 
             // check field position
             if (rectFiled.Left <= poiMsrAreaCentre.X && rectFiled.Right>= poiMsrAreaCentre.X)

OTSIncAMeasureApp/0-OTSModel/Measure/BSEPicData/COTSFieldData.cs

@@ -348,12 +348,6 @@ namespace OTSModelSharp
             m_otsPos = a_poiPos;
         }
 
- 
-
-
-
-
-
         public List<COTSParticleClr>    GetTopBorderedParticles()
         {
             List<COTSParticleClr> parts = new List<COTSParticleClr>();
@@ -459,7 +453,7 @@ namespace OTSModelSharp
             if (isStoring)
             {
               
-                xPos.AssignValue(new Point((int)m_otsPos.X,(int)m_otsPos.Y));
+                xPos.AssignValue(new System.Drawing.Point((int)m_otsPos.X,(int)m_otsPos.Y));
                 slo.Serialize(true, classDoc, rootNode);
             }
             else

OTSIncAMeasureApp/0-OTSModel/OTSDataType/XMLSerialization.cs

@@ -231,10 +231,10 @@ namespace OTSDataType
             List<string> point = new List<string>();
             SplitString(m_sValue, ref point, ",");
 
-            Point pReftTop = new Point();
+            System.Drawing.Point pReftTop = new System.Drawing.Point();
             pReftTop.X = int.Parse(point[0]);
             pReftTop.Y = int.Parse(point[1]);
-            Size pRightBottom = new Size();
+            System.Drawing.Size pRightBottom = new System.Drawing.Size();
             pRightBottom.Width = int.Parse(point[2]);
             pRightBottom.Height = int.Parse(point[3]);
             Rectangle rectangle = new Rectangle(pReftTop, pRightBottom);

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSSampleVisualPropertyInfo.cs

@@ -1685,7 +1685,7 @@ namespace OTSMeasureApp
                                 // total measured area 
                                 poPropItem = new CPropItem();
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_AREA;
-                                poPropItem.InitialSmplParameter(a_nId, nItemId, OTS_ITEM_TYPES.INT, true, true);
+                                poPropItem.InitialSmplParameter(a_nId, nItemId, OTS_ITEM_TYPES.DOUBLE, true, true);
                                 a_listPropItems.Add(poPropItem);
 
                                 // total particles 
@@ -1697,7 +1697,7 @@ namespace OTSMeasureApp
                                 // total particle area
                                 poPropItem = new CPropItem();
                                 nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.TOTAL_PARTICLE_AREA;
-                                poPropItem.InitialSmplParameter(a_nId, nItemId, OTS_ITEM_TYPES.INT, true, true);
+                                poPropItem.InitialSmplParameter(a_nId, nItemId, OTS_ITEM_TYPES.DOUBLE, true, true);
                                 a_listPropItems.Add(poPropItem);
                             }
                         }
@@ -1975,7 +1975,7 @@ namespace OTSMeasureApp
                     {
                         OTS_MSR_SAMPLE_STATUS nStatus = m_Status.GetStatus();
                         string strStatus = nStatus.ToString();
-                        strStatus = XmlResourceData.GetInstance().GetStringByKey(GrpMeasureResult, IDS_MEASURE_STATUS_FIRST + (int)nStatus);
+                        strStatus = XmlResourceData.GetInstance().GetStringByKey(GrpMeasureState, IDS_MEASURE_STATUS_FIRST + (int)nStatus);
                         a_strValue = strStatus;
                     }
                     break;

OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props')" />
+  <Import Project="..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" />
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -214,21 +214,20 @@
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.Blob.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.4.8.0.20230708\lib\net48\OpenCvSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.Extensions.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.Extensions.4.8.0.20230708\lib\net48\OpenCvSharp.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.UserInterface.dll</HintPath>
+    <Reference Include="OpenCvSharp.WpfExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenCvSharp4.WpfExtensions.4.8.0.20230708\lib\net48\OpenCvSharp.WpfExtensions.dll</HintPath>
     </Reference>
     <Reference Include="OTS.WinFormsUI.Docking, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\OTS.WinFormsUI.Docking.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="SlmRuntimeCSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\x64\Release_oxford50\SlmRuntimeCSharp.dll</HintPath>
@@ -255,10 +254,10 @@
       <HintPath>..\packages\System.Data.SQLite.Linq.1.0.115.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Design" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Drawing.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Common.7.0.0\lib\net462\System.Drawing.Common.dll</HintPath>
     </Reference>
+    <Reference Include="System.Management" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
@@ -277,6 +276,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\WordApiDll\System.Windows.Forms.Ribbon.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -285,6 +285,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="0-OTSModel\Measure\1-OTSInclution\CFieldDataIncA.cs" />
@@ -963,7 +964,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props'))" />
+    <Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>

OTSIncAMeasureApp/ResourceManage/ResourceData.cs

@@ -81,16 +81,7 @@ namespace OTSModelSharp.ResourceManage
         TOTAL_PARTICLE = 20062,
         TOTAL_PARTICLE_AREA = 20063,
        
-        //FIELD_STOP_TYPEMIN = 400,
-        //FIELD_STOP_TYPE = 400,
-        //FIELDSTOP_AREAPERCENTAGE = 401,
-        //FIELDSTOP_LARGEPARTICLES = 404,
-        //FIELDSTOP_SMALLPARTICLES = 405,
-        //FIELDSTOP_LARGEPARTICLESPERCENTAGE = 406,
-        //FIELDSTOP_SMALLPARTICLESPERCENTAGE = 407,
-        //FIELD_STOP_TYPEMAX = 407,
-
-        //MAX = 407
+      
     }
 
 

OTSIncAMeasureApp/ResourceManage/ResourceID.cs

@@ -12,7 +12,7 @@ namespace OTSModelSharp.ResourceManage
         public const int GrpImageScan = 1;
         public const int GrpImageProcess = 2;
         public const int GrpXray = 3;
-        //public const int GrpFieldStopMode = 4;
+      
         public const int GrpSEMParameter = 5;
         public const int GrpMeasureState = 6;
         public const int GrpMeasureResult = 7;

OTSIncAMeasureApp/ServiceCenter/CImageHandler.cs

@@ -573,7 +573,7 @@ namespace OTSModelSharp.ServiceCenter
             {
                 COTSFieldDataClr fldclr = new COTSFieldDataClr();
                 PointF p1 = f.GetOTSPosition();
-                Point p2 = new Point((int)p1.X, (int)p1.Y);
+                System.Drawing.Point p2 = new System.Drawing.Point((int)p1.X, (int)p1.Y);
                 fldclr.SetPosition((int)p1.X,(int)p1.Y);
                 fldclr.SetImageWidth(f.Width);
                 fldclr.SetImageHeight(f.Height);
@@ -607,7 +607,7 @@ namespace OTSModelSharp.ServiceCenter
                 {
                     Cv2.Line(mat, new OpenCvSharp.Point(segmentClrs[i].GetStart(), segmentClrs[i].GetHeight()), new OpenCvSharp.Point(segmentClrs[i].GetStart() + segmentClrs[i].GetLength(), segmentClrs[i].GetHeight()), Scalar.White, 1, LineTypes.AntiAlias);
                 }
-                Point[][] contours;
+                OpenCvSharp.Point[][] contours;
                 HierarchyIndex[] hierarchy;
                 Cv2.FindContours(mat, out contours, out hierarchy, RetrievalModes.External, ContourApproximationModes.ApproxSimple, null);
                 for (int i = 0; i < contours.ToList().Count(); i++)

OTSIncAMeasureApp/packages.config

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
-  <package id="OpenCvSharp4" version="4.2.0.20191223" targetFramework="net48" />
-  <package id="OpenCvSharp4.runtime.win" version="4.2.0.20191223" targetFramework="net48" />
+  <package id="OpenCvSharp4" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.Extensions" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.runtime.win" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.Windows" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.WpfExtensions" version="4.8.0.20230708" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Data.SQLite.EF6" version="1.0.115.0" targetFramework="net472" />
   <package id="System.Data.SQLite.Linq" version="1.0.115.0" targetFramework="net472" />
   <package id="System.Data.SQLite.x64" version="1.0.115.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Drawing.Common" version="7.0.0" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props')" />
+  <Import Project="..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props" Condition="Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" />
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -296,16 +296,13 @@
       <HintPath>..\OpenDll\WordApiDll\office.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenCvSharp.Blob, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.Blob.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.4.8.0.20230708\lib\net48\OpenCvSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.Extensions.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.Extensions.4.8.0.20230708\lib\net48\OpenCvSharp.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="OpenCvSharp.UserInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.2.0.20191223\lib\net461\OpenCvSharp.UserInterface.dll</HintPath>
+    <Reference Include="OpenCvSharp.WpfExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenCvSharp4.WpfExtensions.4.8.0.20230708\lib\net48\OpenCvSharp.WpfExtensions.dll</HintPath>
     </Reference>
     <Reference Include="OTS.WinFormsUI.Docking">
       <HintPath>..\Bin\x64\Debug\OTS.WinFormsUI.Docking.dll</HintPath>
@@ -1539,7 +1536,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.2.0.20191223\build\net\OpenCvSharp4.runtime.win.props'))" />
+    <Error Condition="!Exists('..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenCvSharp4.runtime.win.4.8.0.20230708\build\net48\OpenCvSharp4.runtime.win.props'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
   <PropertyGroup>

OTSIncAReportApp/packages.config

@@ -2,9 +2,11 @@
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
   <package id="NPOI" version="2.5.6" targetFramework="net472" />
-  <package id="OpenCvSharp4" version="4.2.0.20191223" targetFramework="net48" />
-  <package id="OpenCvSharp4.runtime.win" version="4.2.0.20191223" targetFramework="net48" />
-  <package id="OpenCvSharp4.Windows" version="4.2.0.20191223" targetFramework="net48" />
+  <package id="OpenCvSharp4" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.Extensions" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.runtime.win" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.Windows" version="4.8.0.20230708" targetFramework="net48" />
+  <package id="OpenCvSharp4.WpfExtensions" version="4.8.0.20230708" targetFramework="net48" />
   <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net462" />
   <package id="SharpZipLib" version="1.3.3" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />

OTSSysMgrApp/App.config

@@ -53,7 +53,7 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
-    </assemblyBinding>
+    </assemblyBinding>    
   </runtime>
   <system.windows.forms jitDebugging="true" />
 </configuration>

OTSSysMgrApp/ControllerSettingForm.cs

@@ -1131,7 +1131,7 @@ namespace OTSSysMgrApp
             part.SetXRayPos(pos);
             var parts = new List<COTSParticleClr>();
             parts.Add(part);
-            eds.GetXRayByFeatures(parts, a_nXRayAQTime, true);
+            eds.GetXRayByParts(parts, a_nXRayAQTime, true);
 
             a_XrayData = parts[0].GetXray().GetXrayData();
             a_strResult = parts[0].GetXray().GetQuantifiedElementsStr();

OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -294,6 +294,7 @@
     <ProjectReference Include="..\OTSIncAMeasureApp\OTSIncAMeasureApp.csproj">
       <Project>{474772DC-334A-4E87-BB46-3ABD913AA44A}</Project>
       <Name>OTSIncAMeasureApp</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -6,13 +6,14 @@ using System.Windows.Forms;
 using Microsoft.Win32;
 using System.Collections;
 using System.Runtime.InteropServices;
+using OTSModelSharp.ServiceCenter;
 
 namespace OTSSysMgrApp
 {
     public struct PostLogMsg
     {
         public int logLevel;//1 trace 2 debug 3info 4 warn 5 error 6 fatal
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = (int)200)]
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = (int)2000)]
         public char[] logMessage;
     };
     public partial class OTSSystemManagerForms : Form
@@ -470,7 +471,8 @@ namespace OTSSysMgrApp
 
         private void OTSSystemManagerForms_FormClosing(object sender, FormClosingEventArgs e)
         {
-           
+         var   m_SemHardwareMgr = SemController.GetSEMController();
+            m_SemHardwareMgr.DisConnect();
 
         }
 

OTSSysMgrApp/SemTestForms.cs

@@ -39,7 +39,7 @@ namespace OTSSysMgrApp
             InitializeComponent();
             //控制类对象初始化
 
-            //cfun = COTSControlFunExport.GetControllerInstance();
+          
             m_SemHardwareMgr = SemController.GetSEMController();
 
             //国际化
@@ -313,30 +313,7 @@ namespace OTSSysMgrApp
 
         private void btnDone_Click(object sender, EventArgs e)
         {
-            //遍历tabHardwareSet标签中所有的TextBox控件 
-            //foreach (Control control in this.gbSetMethods.Controls)
-            //{
-            //    //节点名称与节点参数值
-            //    string Name = string.Empty;
-            //    string Value = string.Empty;
-            //    //判断类型名称
-            //    if (control is TextBox)
-            //    {
-            //        Name = (control as TextBox).Name.Substring(2);
-            //        //获取节点名称与节点参数值
-            //        Value = (control as TextBox).Text;
-            //        if(!Value.Equals(""))
-            //        SaveSetting(Name, Value);
-            //    }
-            //    //判断类型名称
-            //    if (control is CheckBox)
-            //    {
-            //        Name = (control as CheckBox).Name.Substring(2);
-            //        //获取节点名称与节点参数值
-            //        Value = (control as CheckBox).Checked ? "true" : "false";
-            //        SaveSetting(Name, Value);
-            //    }
-            //}
+          
             //返回关闭窗口返回值
             this.DialogResult = DialogResult.OK;
         }