Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4

OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.h

@@ -123,8 +123,11 @@ namespace OTSCLRINTERFACE
 		}
 		bool IsConnected()
 		{
-
-			BOOL bRev = m_pSem->IsConnected();
+			BOOL bRev = false;
+			if(m_pSem != nullptr)
+			{ 
+			   bRev = m_pSem->IsConnected();
+			}
 			return bRev;
 		}
 

OTSSysMgrApp/ControllerSettingForm.cs

@@ -254,7 +254,7 @@ namespace OTSSysMgrApp
                             bitmap = CImageHandler.ToGrayBitmap(ImageByte, width, height);
                             pbImage.Image = bitmap;
                             btnSaveImage.Enabled = true;
-                            log.Info("Image capture success!\nImage resolution:" + tbRWidth.Text + "X" + tbRHeight.Text + ";");
+                            log.Info("Image capture success!\nImage resolution:" + bitmap.Width + "X" + bitmap.Height + ";");
                         }
                         else
                         {
@@ -319,7 +319,11 @@ namespace OTSSysMgrApp
                         //采集时间
                         a_Milliseconds = Convert.ToUInt32(tbCollectionTime.Text);
                         //采集XRay数据
-                        m_EDSHardwareMgr.CollectSpectrum(a_Milliseconds, ref a_XrayData);
+                        bool result=m_EDSHardwareMgr.CollectSpectrum(a_Milliseconds, ref a_XrayData);
+                        if(!result)
+                        {
+                            log.Error("m_EDSHardwareMgr.CollectSpectrum failed!");
+                        }
                         int[] XData = new int[2000];
                         uint nXrayCount = 0;
                         for (int i = 1; i <= 2000; i++)
@@ -897,7 +901,11 @@ namespace OTSSysMgrApp
                         }
 
                         m_EDSHardwareMgr.SetResolution(int.Parse(tbRWidth.Text), int.Parse(tbRHeight.Text));
-                        m_EDSHardwareMgr.GetXRayByPoints(cOTSParticleClrs, a_Milliseconds, false);
+                        bool result=m_EDSHardwareMgr.GetXRayByPoints(cOTSParticleClrs, a_Milliseconds, false);
+                        if(!result)
+                        {
+                            log.Error("m_EDSHardwareMgr.GetXRayByPoints failed!");
+                        }
 
                         int[] XData = new int[2000];
                         uint nXrayCount = 0;
@@ -979,6 +987,10 @@ namespace OTSSysMgrApp
                         fea.SetSegmentsList(segs,false);
                         string ele = "";
                         bool isTrue = m_EDSHardwareMgr.GetXRayBySingleFeature(a_Milliseconds, fea, ref a_XrayData,ref ele, false);
+                        if (!isTrue)
+                        {
+                            log.Error("GetAreaRay() failed!");
+                        }
                         int[] XData = new int[2000];
                         uint nXrayCount = 0;
                         for (int i = 1; i <= 2000; i++)

OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -137,6 +137,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\Nlog\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OTSClrInterface, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Bin\x64\Debug\OTSClrInterface.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -257,10 +261,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OTSCPP\OTSClrInterface\OTSClrInterface.vcxproj">
-      <Project>{490a8592-7b13-4536-b475-028e73007fae}</Project>
-      <Name>OTSClrInterface</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OTSIncAMeasureApp\OTSIncAMeasureApp.csproj">
       <Project>{474772DC-334A-4E87-BB46-3ABD913AA44A}</Project>
       <Name>OTSIncAMeasureApp</Name>

OTSSysMgrApp/SemTestForms.cs

@@ -583,8 +583,8 @@ namespace OTSSysMgrApp
                 //赋值
                 double PositionX = Convert.ToDouble(tbSPositionX.Text);
                 double PositionY = Convert.ToDouble(tbSPositionY.Text);
-                double PositionR = Convert.ToDouble(tbSPositionR.Text);
-                bool result = m_SemHardwareMgr.MoveSEMToPoint(PositionX, PositionY, PositionR);
+                //double PositionR = Convert.ToDouble(tbSPositionR.Text);
+                bool result = m_SemHardwareMgr.MoveSEMToPoint(PositionX, PositionY);
                 if (result)
                 {
                     //配置结果提示