Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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" DelayQuantify="true" />
+  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Bruker" DelayQuantify="true" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.cpp

@@ -239,6 +239,7 @@ namespace OTSCLRINTERFACE
 		{
 			CPosXrayPtr pXRayPoint = parts[i]->GetXray()->GetPosXrayPtr();
 			pXRayPoint->SetPosition(CPoint(points[i].X, points[i].Y));
+			pXRayPoint->SetIndex(parts[i]->GetXray()->GetIndex());
 			listXRayPoints.push_back(pXRayPoint);
 		}
 	

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -2452,7 +2452,7 @@ BOOL COTSBrukerImpl::QuantifyPosXrayPointsOnLine(CPosXrayList& a_listXrayPois)
 	// Fail a_vXPoints is empty
 	if (a_listXrayPois.empty())
 	{
-		LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::SetXRayPoints Empty point list given in argument a_oPointList"));
+		LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::QuantifyPosXrayPointsOnLine: Empty point list given in argument a_oPointList"));
 		return TRUE;
 	}
 
@@ -2475,7 +2475,7 @@ BOOL COTSBrukerImpl::QuantifyPosXrayPointsOnLine(CPosXrayList& a_listXrayPois)
 			int xraySequence = a_listXrayPois[i]->GetIndex();
 			if (BrukerDll::QuantifyPointListSpectrum(m_nClientID, xraySequence, pcMethod, pcParams, cResult, 10000, (BrukerDll::PRTSpectrumHeaderRec)m_psRTSpectrumBuffer.get(), (int)BRUKER_PARAM::RT_SPECTRUM_BUFFER_SIZE) != 0)
 			{
-				LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::SetXRayPoints failed to call QuantifyPointListSpectrum method at index %d, error code %d"), i, -1);
+				LogErrorTrace(__FILE__, __LINE__, _T("COTSBrukerImpl::QuantifyPosXrayPointsOnLine failed to call QuantifyPointListSpectrum method at index %d, error code %d"), xraySequence, -1);
 				
 			}
 			CElementChemistriesList listElement = CElement::ExtractElementChemistrys(CControllerHelper::CharToString(cResult));

OTSCPP/OTSControl/Bruker/OTSEDSBrucker.cpp

@@ -6,6 +6,7 @@ namespace OTSController {
 	// constructor
 	COTSEDSBrucker::COTSEDSBrucker(void)
 	{
+		Init();
 	}
 
 	// destructor

OTSCPP/OTSControl/Bruker/OTSSEMBruker.cpp

@@ -7,6 +7,7 @@ namespace OTSController {
 	COTSSEMBruker::COTSSEMBruker()
 		: m_bConnected(FALSE)
 	{
+		Connect();
 	}
 
 	// destructor

OTSCPP/OTSControl/Bruker/OTSScanBrucker.cpp

@@ -8,6 +8,7 @@ namespace OTSController {
 	COTSScanBrucker::COTSScanBrucker()
 		: m_pBrukerImpl(nullptr)
 	{
+		Init();
 	}
 
 	// destructor

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -1562,6 +1562,9 @@ namespace OTSMeasureApp
             var eds = EDSController.GetEDSController(m_iWidth,m_iHeight,expC);
             var part = new COTSParticleClr();
             part.SetXRayPos(new Point(dMouseImgX, dMouseImgY));
+            var xray = part.GetXray();
+            xray.SetIndex(0);
+            part.SetXray(xray);
             var parts = new List<COTSParticleClr>();
             parts.Add(part);
             eds.GetXRayByParts(parts, a_nXRayAQTime, true);