diagnosis otscontrol.

OTSCPP/OTSClrInterface/ControlClr/OTSControlFunExport.h

@@ -67,11 +67,7 @@ namespace NSOTSController
 			m_pScan = (m_pHardWareMgr->GetScanControllerPtr()).get();
 			m_pEDS = (m_pHardWareMgr->GetEDSControllerPtr()).get();			
 
-			m_pSem->Connect();
 			
-			m_pScan->Init();
-
-			m_pEDS->Init();
 		}
 
 		~COTSControlFunExport()
@@ -380,30 +376,7 @@ namespace NSOTSController
 		}
 
 
-		// Ę͡Ĺ
-		/*void FreeHardware()
-		{
-			if (NULL != m_pHardWareMgr)
-			{
-				if (m_pSem != NULL)
-				{
-				
-					delete m_pSem;
-				}
-				if (m_pScan != NULL)
-				{
-				
-					delete m_pScan;
-				}
-				if (m_pEDS!= NULL)
-				{
-					
-					delete m_pEDS;
-				}
-				
-				m_pHardWareMgr = NULL;
-			}
-		}*/
+	
 
 
 

OTSCPP/OTSControl/Bruker/OTSBrukerImpl.cpp

@@ -1820,7 +1820,7 @@ BOOL COTSBrukerImpl::CloseClient(void)
 		LogErrorTrace(__FILE__, __LINE__, "  COTSBrukerImpl::CloseClient   failed  ");
 		return FALSE;
 	}
-	m_nClientID = 0;	
+	//m_nClientID = 0;	
 	
 	return TRUE;
 }

OTSCPP/OTSControl/COTSHardwareMgr.cpp

@@ -103,6 +103,7 @@ namespace OTSController {
 					break;
 			}
 		}
+		m_SemBasePtr->Connect();
 		return m_SemBasePtr;
 	}
 
@@ -156,7 +157,7 @@ namespace OTSController {
 			}
 		}
 		
-
+		m_EDSPtr->Init();
 		return m_EDSPtr;
 
 	}
@@ -206,7 +207,7 @@ namespace OTSController {
 					break;
 			}
 		}
-
+		m_SCanPtr->Init();
 		return m_SCanPtr;
 	}
 

OTSIncAMeasureApp/0-OTSModel/Measure/GetBSEPic/CMsrThread.cs

@@ -124,8 +124,8 @@ namespace OTSModelSharp
           
           
             m_SemController = new SemController();
-            
-          
+           
+
         }
 
        

OTSIncAMeasureApp/0-OTSModel/Measure/GetBSEPic/CSmplMeasure.cs

@@ -51,6 +51,7 @@ namespace OTSModelSharp
             m_SemHardwareMgr = new SemController();
             m_ScanHardwareMgr = new ScanController();
             m_EDSHardwareMgr = new EDSController();
+
             m_listHoleBSEImg = new CHoleBSEImgsList();
         }
 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.Designer.cs

@@ -45,7 +45,6 @@ namespace OTSMeasureApp
             this.DeleteBSEPicture = new System.Windows.Forms.ToolStripMenuItem();
             this.dgvFocus = new System.Windows.Forms.DataGridView();
             this.lblFocus = new System.Windows.Forms.Label();
-            this.control_Ruler2 = new MyControls.Control_Ruler();
             this.CMStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvFocus)).BeginInit();
             this.SuspendLayout();
@@ -66,7 +65,7 @@ namespace OTSMeasureApp
             this.ShootBSEPicture,
             this.DeleteBSEPicture});
             this.CMStrip.Name = "CMStrip";
-            this.CMStrip.Size = new System.Drawing.Size(195, 308);
+            this.CMStrip.Size = new System.Drawing.Size(197, 308);
             this.CMStrip.Text = "添加样品";
             this.CMStrip.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.CMStrip_ItemClicked);
             // 
@@ -74,35 +73,35 @@ namespace OTSMeasureApp
             // 
             this.AddStage.Image = global::OTSMeasureApp.Properties.Resources.添加样品;
             this.AddStage.Name = "AddStage";
-            this.AddStage.Size = new System.Drawing.Size(194, 30);
+            this.AddStage.Size = new System.Drawing.Size(196, 30);
             this.AddStage.Text = "增加样品测量";
             // 
             // DeleteStage
             // 
             this.DeleteStage.Image = global::OTSMeasureApp.Properties.Resources.删除样品;
             this.DeleteStage.Name = "DeleteStage";
-            this.DeleteStage.Size = new System.Drawing.Size(194, 30);
+            this.DeleteStage.Size = new System.Drawing.Size(196, 30);
             this.DeleteStage.Text = "删除样品测量";
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(191, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(193, 6);
             // 
             // ReadSEMData
             // 
             this.ReadSEMData.Enabled = false;
             this.ReadSEMData.Image = global::OTSMeasureApp.Properties.Resources.GetSemData_32;
             this.ReadSEMData.Name = "ReadSEMData";
-            this.ReadSEMData.Size = new System.Drawing.Size(194, 30);
+            this.ReadSEMData.Size = new System.Drawing.Size(196, 30);
             this.ReadSEMData.Text = "读取SEM数据";
-            // 
+          
             // SetSemData
             // 
             this.SetSemData.Enabled = false;
             this.SetSemData.Image = global::OTSMeasureApp.Properties.Resources.SetSemData;
             this.SetSemData.Name = "SetSemData";
-            this.SetSemData.Size = new System.Drawing.Size(194, 30);
+            this.SetSemData.Size = new System.Drawing.Size(196, 30);
             this.SetSemData.Text = "设定SEM数据";
             // 
             // SetSEMCenterLocation
@@ -110,16 +109,15 @@ namespace OTSMeasureApp
             this.SetSEMCenterLocation.Enabled = false;
             this.SetSEMCenterLocation.Image = global::OTSMeasureApp.Properties.Resources.MoveToCenter_32;
             this.SetSEMCenterLocation.Name = "SetSEMCenterLocation";
-            this.SetSEMCenterLocation.Size = new System.Drawing.Size(194, 30);
+            this.SetSEMCenterLocation.Size = new System.Drawing.Size(196, 30);
             this.SetSEMCenterLocation.Text = "定位到当前位置";
-           
             // 
             // DriveSEMToCenterLocation
             // 
             this.DriveSEMToCenterLocation.Enabled = false;
             this.DriveSEMToCenterLocation.Image = global::OTSMeasureApp.Properties.Resources.SEMMoveToCenter_32;
             this.DriveSEMToCenterLocation.Name = "DriveSEMToCenterLocation";
-            this.DriveSEMToCenterLocation.Size = new System.Drawing.Size(194, 30);
+            this.DriveSEMToCenterLocation.Size = new System.Drawing.Size(196, 30);
             this.DriveSEMToCenterLocation.Text = "驱动SEM到中心位置";
             // 
             // DriveSEMToCurrentLocation
@@ -127,20 +125,20 @@ namespace OTSMeasureApp
             this.DriveSEMToCurrentLocation.Enabled = false;
             this.DriveSEMToCurrentLocation.Image = global::OTSMeasureApp.Properties.Resources.SEMMoveToCurrent_32;
             this.DriveSEMToCurrentLocation.Name = "DriveSEMToCurrentLocation";
-            this.DriveSEMToCurrentLocation.Size = new System.Drawing.Size(194, 30);
+            this.DriveSEMToCurrentLocation.Size = new System.Drawing.Size(196, 30);
             this.DriveSEMToCurrentLocation.Text = "驱动SEM到当前位置";
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(191, 6);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(193, 6);
             // 
             // ShootBSEPicture
             // 
             this.ShootBSEPicture.Enabled = false;
             this.ShootBSEPicture.Image = global::OTSMeasureApp.Properties.Resources.GetSampleImage;
             this.ShootBSEPicture.Name = "ShootBSEPicture";
-            this.ShootBSEPicture.Size = new System.Drawing.Size(194, 30);
+            this.ShootBSEPicture.Size = new System.Drawing.Size(196, 30);
             this.ShootBSEPicture.Text = "拍摄样品孔BSE照片";
             // 
             // DeleteBSEPicture
@@ -148,7 +146,7 @@ namespace OTSMeasureApp
             this.DeleteBSEPicture.Enabled = false;
             this.DeleteBSEPicture.Image = global::OTSMeasureApp.Properties.Resources.DeleteSampleImage;
             this.DeleteBSEPicture.Name = "DeleteBSEPicture";
-            this.DeleteBSEPicture.Size = new System.Drawing.Size(194, 30);
+            this.DeleteBSEPicture.Size = new System.Drawing.Size(196, 30);
             this.DeleteBSEPicture.Text = "删除BSE照片";
             // 
             // dgvFocus
@@ -170,6 +168,7 @@ namespace OTSMeasureApp
             this.lblFocus.Size = new System.Drawing.Size(0, 12);
             this.lblFocus.TabIndex = 4;
             this.lblFocus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            control_Ruler2 = new MyControls.Control_Ruler();
             // 
             // OTSSamplespaceWindow
             // 

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -3576,17 +3576,9 @@ namespace OTSMeasureApp
                     
                 }
                 m_SEMDATAFieldManage.CloseSEM();
-                //else
-                //{
-                //    return;
-                //}
+              
             }
-            //else
-            //{
-            //    //关闭电镜连接
-            //    CloseSEM();
-            //    return;
-            //}
+           
             #endregion
             #endregion
             if (m_SingleGDIObjects != null)
@@ -4642,6 +4634,8 @@ namespace OTSMeasureApp
             OTSSamplespaceGraphicsPanelFun.ChangeSampleFillSingleInfo(m_ALLSingleGDIObjects, m_SingleGDIObjects, sampleName);
         }
 
+     
+
         #endregion
 
         #region 设置工作样品测量区域