remove useless notations in the otscontrol dll.

OTSCPP/OTSControl/COTSHardwareMgr.cpp

@@ -12,8 +12,7 @@
 
 namespace OTSController {
 
-	//using namespace COTSXmlFileDll;
-	//Registry Path And KeyName
+
 	const CString cssSubKeyRegeditPath = "SOFTWARE\\OTSDevName";
 	const CString csKey_DevName = "SEMName";
 	const CString csKey_EDSName = "EDSName";
@@ -81,20 +80,20 @@ namespace OTSController {
 				{
 
 						m_SemBasePtr = CSemBasePtr(new COTSSEMBruker());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetSemControllerMgrPtr) new COTSSEMBruker() ");
+				
 						break;
 				}
 				case (int)SEM_DEV_ID::OFFLINE:
 				{
 						m_SemBasePtr = CSemBasePtr(new COTSSemSim());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetSemControllerMgrPtr) new COTSSemSim() ");
+						
          				break;
 				}
 				case (int)SEM_DEV_ID::OXFORD:
 				{
 	
 						m_SemBasePtr = CSemBasePtr(new COTSSEMOxford());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetSemControllerMgrPtr) new COTSSEMOxford() ");
+					
 				
 					break;
 				}
@@ -122,7 +121,6 @@ namespace OTSController {
 					return nullptr;
 				}
 			}
-			//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
 
 			iDevID = this->GetEDSControllerID(szEdsName);
 			switch (iDevID)
@@ -131,7 +129,6 @@ namespace OTSController {
 				{
 			
 						m_EDSPtr = COTSEDSBasePtr(new COTSEDSBrucker());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) new COTSEDSBrucker() ");
 				
 					break;
 				}
@@ -139,7 +136,6 @@ namespace OTSController {
 				{
 				
 						m_EDSPtr = COTSEDSBasePtr(new COTSEDSSim());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) new COTSEDSSim() ");
 				
 
 					break;
@@ -148,7 +144,6 @@ namespace OTSController {
 				{
 				
 						m_EDSPtr = COTSEDSBasePtr(new COTSEDSOxford());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetEDSControllerPtr) new COTSEDSOxford() ");
 				
 
 					break;
@@ -181,7 +176,6 @@ namespace OTSController {
 				}
 			}
 
-			//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) szSemName = %s,  szEdsName = %s", szSemName, szEdsName);
 
 			iDevID = this->GetEDSControllerID(szEdsName);
 
@@ -191,19 +185,16 @@ namespace OTSController {
 				{
 
 						m_SCanPtr = COTSScanBasePtr(new COTSScanBrucker());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) new COTSScanBrucker() ");
 					break;
 				}
 				case (int)EDS_DEV_ID::OFFLINE:
 				{
 						m_SCanPtr = COTSScanBasePtr(new COTSScanSim());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) new COTSScanSim() ");
 					break;
 				}
 				case (int)EDS_DEV_ID::OXFORD:
 				{
 						m_SCanPtr = COTSScanBasePtr(new COTSScanOxford());
-						//LogInfoTrace(__FILE__, __LINE__, "(COTSHardwareMgr::GetScanControllerPtr) new COTSScanSim() ");
 					break;
 				}
 				default:
@@ -258,7 +249,6 @@ namespace OTSController {
 				return i;
 			}			
 		}
-		//LogErrorTrace(__FILE__, __LINE__, "GetSemControllerID:: SEMControllerName is Valied, ControllerName =%s ", SemControllerName);
 		return -1;
 		
 	}
@@ -277,7 +267,6 @@ namespace OTSController {
 				return i;
 			}
 		}
-		//LogErrorTrace(__FILE__, __LINE__, "GetEDSControllerID:: EDSControllerName is Valied, ControllerName =%s ", EDSControllerName);
 		return -1;
 
 	}

OTSCPP/OTSControl/Oxford/OTSEDSOxford.cpp

@@ -10,14 +10,12 @@
 
 		COTSEDSOxford::COTSEDSOxford(void)
 		{
-			//LogTrace(__FILE__, __LINE__, _T("%s controller created"), (LPCTSTR)GetName());
 			m_oxfordImpl = OxfordImpl::GetInstance();
 		}
 
 
 		COTSEDSOxford::~COTSEDSOxford(void)
 		{
-			//LogTrace(__FILE__, __LINE__, _T("%s controller finished"), (LPCTSTR)GetName());
 		}
 
 

OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -120,26 +120,7 @@ bool OxfordControllerWrapper::Init()
 
 void OxfordControllerWrapper::ControllerThreadFunction()
 {
-	/*if (_microscopeController == nullptr)
-	{
-		auto ctrl=CreateMicroscopeController();
-		if (ctrl == nullptr) return;
-	}
-
-	if (_edSpectrumController == nullptr)
-	{
-		CreateEdsSpectrumController();
-	}
-
-	if (_imageAcqusitionController == nullptr)
-	{
-		CreateImageAcqusitionController();
-	}
-
-	if (_edsChordListController == nullptr)
-	{
-		CreateChordlistController();
-	}*/
+	
 
 	while (true)
 	{
@@ -209,7 +190,7 @@ void OxfordControllerWrapper::ControllerThreadFunction()
 		case OxfordControllerCommand::COLLECT_CURRENTXRAYPOINT:
 		{
 			auto edsController = CreateEdsSpectrumController();
-			//auto edsController = _edSpectrumController;
+			
 
 			bool bRet = false;
 
@@ -300,7 +281,7 @@ void OxfordControllerWrapper::ControllerThreadFunction()
 		case OxfordControllerCommand::COLLECT_XRAYCHOILDLIST:
 		{
 			auto edsController = CreateEdsSpectrumController();
-			//auto edsController = _edSpectrumController;
+			
 			if (!edsController || !_oxfordControllerData.m_pXrayDataList || _oxfordControllerData.m_nXrayDataCount <= 0)
 			{
 				_oxfordControllerData.m_nState = OxfordControllerState::FAILED;
@@ -922,13 +903,6 @@ bool OxfordControllerWrapper::SetBeamOnToController(bool a_bBeamOn)
 	}
 
 	(void)a_bBeamOn;
-	//// notice: false: 0.0 and true: 1.0
-	//double dValue = a_bBeamOn? 1.0: 0.0;
-
-	//Dictionary<Column, double>^ columnDictionary = gcnew Dictionary<Column, double>;
-	//columnDictionary->Add(Column::BeamOn, dValue);
-
-	//_microscopeController->SetColumnConditions(columnDictionary);
 
 	return true;
 }
@@ -1013,7 +987,7 @@ bool OxfordControllerWrapper::SetBeamBlankToController(bool a_bBeamBlank)
 	(void)a_bBeamBlank;
 	//try
 	//{
-	//    _microscopeController->ColumnConditions->BeamBlank = a_bBeamBlank;
+	    //_microscopeController->ColumnConditions->BeamOn = a_bBeamBlank;
 	//}
 	//catch(...)
 	//{

OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.h

@@ -132,8 +132,6 @@ ref class OxfordControllerWrapper
 
 		System::String^ m_sElementResult; //one point
 
-		// should lock data every time read / write
-		//Object^ m_dataLock;
 	};
 
 public:

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSXRayParam.cs

@@ -37,7 +37,7 @@ namespace OTSDataType
         const int Default_Xray_Limit = 50;
         private OTS_X_RAY_SCAN_MODE m_nScanMode;
 
-        //private OTS_IMAGE_SCANSPEED_OPTIONS m_nAnalySpeed;
+      
         private int m_nAnalyExpCount;
         private int m_nMidSearchAQTime;
         private int m_nMidAnalyAQTime;
@@ -55,7 +55,7 @@ namespace OTSDataType
         {
             m_nScanMode = DEFAULE_XRAY_SCAN_MODE;
     
-            //m_nAnalySpeed = DEFAULE_ANALYSIS_XRAY_SPEED;
+        
             m_nAnalyExpCount = DEFAULE_XRAY_EXP_COUNT;
             m_nMidSearchAQTime = DEFAULE_XRAY_SEARCH_MID_TIME;
             m_nMidAnalyAQTime = DEFAULE_XRAY_ANALY_MID_TIME;

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -865,11 +865,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 731);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1277, 24);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -877,20 +877,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(48, 21);
+            this.TSGrayVal.Size = new System.Drawing.Size(48, 19);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(62, 21);
+            this.STSemCoordinate.Size = new System.Drawing.Size(59, 19);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(54, 21);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(47, 19);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -905,9 +905,9 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
+            this.dockPanel.Size = new System.Drawing.Size(1277, 601);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -984,9 +984,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1277, 697);
+            this.ClientSize = new System.Drawing.Size(1277, 755);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -995,11 +995,12 @@
             this.IsMdiContainer = true;
             this.KeyPreview = true;
             this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
-            this.MinimumSize = new System.Drawing.Size(678, 500);
+            this.MinimumSize = new System.Drawing.Size(678, 538);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Activated += new System.EventHandler(this.OTSIncAMeasureAppForm_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.OTSIncAMeasureAppForm_FormClosing);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.OTSIncAMeasureAppForm_FormClosed);
             this.Load += new System.EventHandler(this.OTSIncAMeasureAppForm_Load);

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -202,21 +202,21 @@ namespace OTSMeasureApp
                 {
                     log.Error("(OTSIncAMeasureAppForm.OTSIncAMeasureAppForm_Load)  (LoadParamFile() && LoadStageParamFile()) failed");
                 }
-               
+
                 if (!m_MsrThreadWrapper.ConnectSEM())
                 {
                     MessageBox.Show("Connect SEM failed!Please goto the SysMgrApp.exe to setup the proper parameter or check other parameter of the EDS software");
                     System.Diagnostics.ProcessStartInfo process = new System.Diagnostics.ProcessStartInfo();
                     process.FileName = "OTSSysMgrApp.exe";//打开app的路径
-               
+
                     process.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
                     System.Diagnostics.Process.Start(process);
                     this.rbConnectHardware.Enabled = true;
                     this.rbDisconnectHardware.Enabled = false;
-                 
+
                 }
                 this.rbConnectHardware.Enabled = false;
-                
+
                 this.rbDisconnectHardware.Enabled = true;
                 log.Warn("SEM connect success!");
                 
@@ -1389,5 +1389,9 @@ namespace OTSMeasureApp
             }
         }
 
+        private void OTSIncAMeasureAppForm_Activated(object sender, EventArgs e)
+        {
+            
+        }
     }
 }