add base class

HOZ.sln

@@ -7,6 +7,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitControl", "HOZProject\U
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartSEMControl", "SmartSEMControl\SmartSEMControl.csproj", "{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeasureThread", "MeasureThread\MeasureThread.csproj", "{9A5851E4-73FD-48E1-876C-68BED40A0512}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoDo", "AutoDo\AutoDo.csproj", "{0938309A-9C6B-4F93-8638-C94EA58487ED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileManager", "FileManager\FileManager.csproj", "{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBManager", "DBManager\DBManager.csproj", "{5674DD32-3A9F-4D74-B177-A693A75A0255}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{682CF60F-46F7-451A-9887-91C2DCB80B10}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{33C9F14C-8C29-4E5A-A77F-ABFA931402E3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dedicated", "Dedicated", "{371F2331-83C6-41DB-8D59-9232ECB09801}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeasureData", "MeasureData\MeasureData.csproj", "{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,10 +37,39 @@ Global
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A5851E4-73FD-48E1-876C-68BED40A0512}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0938309A-9C6B-4F93-8638-C94EA58487ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0938309A-9C6B-4F93-8638-C94EA58487ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0938309A-9C6B-4F93-8638-C94EA58487ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0938309A-9C6B-4F93-8638-C94EA58487ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5674DD32-3A9F-4D74-B177-A693A75A0255}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{ABBA5E64-536B-4EA0-8305-490A48822C89} = {682CF60F-46F7-451A-9887-91C2DCB80B10}
+		{BF7F80B0-A6DA-4470-A331-4C96057FC7FA} = {371F2331-83C6-41DB-8D59-9232ECB09801}
+		{9A5851E4-73FD-48E1-876C-68BED40A0512} = {33C9F14C-8C29-4E5A-A77F-ABFA931402E3}
+		{0938309A-9C6B-4F93-8638-C94EA58487ED} = {682CF60F-46F7-451A-9887-91C2DCB80B10}
+		{14C99F54-B3C2-47CF-ADB3-E79FDD2D382F} = {371F2331-83C6-41DB-8D59-9232ECB09801}
+		{5674DD32-3A9F-4D74-B177-A693A75A0255} = {371F2331-83C6-41DB-8D59-9232ECB09801}
+		{12617585-8D9A-4AD4-B6C4-6894A48CEE9E} = {371F2331-83C6-41DB-8D59-9232ECB09801}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F291AB01-6941-478D-BA98-1C371698FFAD}
 	EndGlobalSection

HOZProject/FormUnitControl.cs

@@ -1,4 +1,8 @@
-using System;
+//时间：
+//作者：
+//功能：单元测试功能
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

SmartSEMControl/SmartSEM.cs

@@ -77,12 +77,11 @@ namespace SmartSEMControl
         /// <returns>return:true or false</returns>
         public Boolean Init()
         {
-<<<<<<< HEAD
-            //lrt = CZEMApi.Initialise("");
+#if ROMOTE
             lrt = CZEMApi.InitialiseRemoting();
-            if (lrt!=0)
-=======
+#else
             lrt = CZEMApi.Initialise("");
+#endif
             if (lrt != 0)
             {
                 m_bInitialised = false;
@@ -94,9 +93,9 @@ namespace SmartSEMControl
                 return true;
             }
         }
-        #endregion
+#endregion
 
-        #region 设备远程初始化
+#region 设备远程初始化
         /// <summary>
         /// 设备远程初始化
         /// </summary>
@@ -105,7 +104,6 @@ namespace SmartSEMControl
         {
             lrt = CZEMApi.InitialiseRemoting();
             if (lrt != 0)
->>>>>>> d024f5d5b8a815002f9bb9d30c911d0849ddba85
             {
                 m_bInitialised = false;
                 return false;
@@ -116,9 +114,9 @@ namespace SmartSEMControl
                 return true;
             }
         }
-        #endregion
+#endregion
 
-        #region 关闭设备
+#region 关闭设备
         /// <summary>
         /// 关闭设备
         /// </summary>
@@ -143,9 +141,9 @@ namespace SmartSEMControl
                 return false;
             }
         }
-        #endregion
+#endregion
 
-        #region 读参数函数
+#region 读参数函数
         private Boolean ReadParams(String str_param, ref float value)
         {
             if (m_bInitialised)
@@ -167,9 +165,9 @@ namespace SmartSEMControl
                 return false;
             }
         }
-        #endregion
+#endregion
 
-        #region 写参数函数
+#region 写参数函数
         private Boolean WriteParams(String str_param, float value)
         {
             if (m_bInitialised)
@@ -213,9 +211,9 @@ namespace SmartSEMControl
                 return false;
             }
         }
-        #endregion
+#endregion
 
-        #region 执行命令
+#region 执行命令
         private Boolean ExecuteCmd(String cmd)
         {
             if (m_bInitialised)
@@ -235,9 +233,9 @@ namespace SmartSEMControl
                 return false;
             }
         }
-        #endregion
+#endregion
 
-        #region 放大缩小
+#region 放大缩小
         /// <summary>
         /// 读取缩放倍数
         /// </summary>
@@ -264,9 +262,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_MAG, set);
         }
-        #endregion
+#endregion
 
-        #region 焦距
+#region 焦距
         /// <summary>
         /// 读取工作距离
         /// </summary>
@@ -293,9 +291,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_WD, set);
         }
-        #endregion
+#endregion
 
-        #region 亮度
+#region 亮度
         /// <summary>
         /// 读取亮度
         /// </summary>
@@ -322,9 +320,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_BRIGHTNESS, set);
         }
-        #endregion
+#endregion
 
-        #region 对比度
+#region 对比度
         /// <summary>
         /// 读取对比度
         /// </summary>
@@ -351,9 +349,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_CONTRAST, set);
         }
-        #endregion
+#endregion
 
-        #region 消像散
+#region 消像散
         /// <summary>
         /// 读取消像散X
         /// </summary>
@@ -407,9 +405,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_STIG_Y, set);
         }
-        #endregion
+#endregion
 
-        #region 角度补偿
+#region 角度补偿
         /// <summary>
         /// 读取角度补偿
         /// </summary>
@@ -436,9 +434,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_TILT_ANGLE, set);
         }
-        #endregion
+#endregion
 
-        #region 抓取图像
+#region 抓取图像
         /// <summary>
         /// 抓取图像
         /// </summary>
@@ -462,9 +460,9 @@ namespace SmartSEMControl
                 return false;
             }
         }
-        #endregion
+#endregion
 
-        #region SEM移动接口
+#region SEM移动接口
         /// <summary>
         /// 返回样品台坐标数组
         /// </summary>
@@ -661,9 +659,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_STAGE_GOTO_M, set);
         }
-        #endregion
+#endregion
 
-        #region Scan Rotate角度接口
+#region Scan Rotate角度接口
         /// <summary>
         /// 获取Scan Rotate角度接口
         /// </summary>
@@ -690,9 +688,9 @@ namespace SmartSEMControl
         {
             return WriteParams(AP_SCANROTATION, set);
         }
-        #endregion
+#endregion
 
-        #region 像素读取PixelSize
+#region 像素读取PixelSize
         /// <summary>
         /// 获取Pixel Size 接口,只读
         /// </summary>
@@ -709,20 +707,20 @@ namespace SmartSEMControl
                 return float.NaN;
             }
         }
-        #endregion
+#endregion
 
-        #region 开启电压
+#region 开启电压
         public Boolean CmdOpenVoltage()
         {
             return ExecuteCmd(CMD_BEAM_ON);
         }
-        #endregion
+#endregion
 
-        #region 关闭电压
+#region 关闭电压
         public Boolean CmdCloseVoltage()
         {
             return ExecuteCmd(CMD_EHT_OFF);
         }
-        #endregion
+#endregion
     }
 }

SmartSEMControl/SmartSEMControl.csproj

@@ -41,6 +41,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="HardwareInterface.cs" />
     <Compile Include="SmartSEM.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>