EDIT SOME ERRORS.

OTS/OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -77,6 +77,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\OpenDll\Json\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.4.7.4\lib\net45\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -111,6 +114,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Language.cs" />
     <Compile Include="MeasureCheckReportInfoWindow.cs">
       <SubType>Form</SubType>
     </Compile>

OTS/OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -111,7 +111,7 @@ namespace OTSIncAMeasureApp
             public SMSR_Sample_Status iMsrSampleStatu;
             public string csSampleName;
             public string csSampleMsrStartTime;
-            public List<Point> BCompleteFieldList;    //样品之前已经测试完的帧图数
+            public List<System.Windows.Point> BCompleteFieldList;    //样品之前已经测试完的帧图数
         }
 
 

OTS/OTSIncAMeasureApp/OTSMeasureThread/OTSGetMreRetThread.cs

@@ -9,6 +9,8 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using OTSDataType;
+using OTSModelSharp;
 
 namespace OTSIncAMeasureApp.OTSMeasureThread
 {
@@ -234,12 +236,12 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
                         //设置工作样品
                         m_MeasureApp.m_DataMgrFun.SetWorkSample(OTSSamplespaceWindow.m_SampleSelectName);
                         //获取工作样品信息
-                        COTSSampleClr WSample = m_MeasureApp.m_DataMgrFun.GetWorkSample();
-                        CMsrResultsClr cMsrResultsClr = WSample.GetMsrResults();
+                        COTSSample WSample = m_MeasureApp.m_DataMgrFun.GetWorkSample();
+                        CMsrResults cMsrResultsClr = WSample.GetMsrResults();
                         //获取结果文件 颗粒列表信息
-                        List<CMsrResultItemClr> cMsrResultItemClrList = cMsrResultsClr.GetResultItems();
+                        List<CMsrResultItem> cMsrResultItemClrList = cMsrResultsClr.GetResultItems();
                         //根据编号获取分类名称
-                        List<CMsrResultItemClr> cMsrResultItemClrListTemp = cMsrResultItemClrList;
+                        List<CMsrResultItem> cMsrResultItemClrListTemp = cMsrResultItemClrList;
                         //设置测量状态数据列表
                         otsMeasureResult.SetMeasureListInfo(cMsrResultItemClrList);
                     }
@@ -364,7 +366,7 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
             m_MeasureApp.m_DataMgrFun.GetMsrSampleStartTime(ref SampleMsrStartTime);           
             SMsrData.SampleStatu.csSampleMsrStartTime = SampleMsrStartTime.ToString("yyyy-MM-dd HH:mm:ss");
             string csSName = "";
-            List<Point> FieldList = new List<Point>();
+            List<System.Windows.Point> FieldList = new List<System.Windows.Point>();
             m_MeasureApp.m_DataMgrFun.GetBeforeCompleteField(ref csSName, ref FieldList);
             if(csSName == csSampleName)
             {

OTS/OTSIncAMeasureApp/OTSMeasureThread/OTSMeasureResult.cs

@@ -10,6 +10,9 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
+using OTSDataType;
+
+
 namespace OTSIncAMeasureApp.OTSMeasureThread
 {
     class OTSMeasureResult : OTSMeasureThreadInterface
@@ -137,12 +140,12 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
                         //设置工作样品
                         m_MeasureApp.m_DataMgrFun.SetWorkSample(OTSSamplespaceWindow.m_SampleSelectName);
                         //获取工作样品信息
-                        COTSSampleClr WSample = m_MeasureApp.m_DataMgrFun.GetWorkSample();
-                        CMsrResultsClr cMsrResultsClr = WSample.GetMsrResults();
+                        COTSSample WSample = m_MeasureApp.m_DataMgrFun.GetWorkSample();
+                        CMsrResults cMsrResultsClr = WSample.GetMsrResults();
                         //获取结果文件 颗粒列表信息
-                        List<CMsrResultItemClr> cMsrResultItemClrList = cMsrResultsClr.GetResultItems();
+                        List<CMsrResultItem> cMsrResultItemClrList = cMsrResultsClr.GetResultItems();
                         //根据编号获取分类名称
-                        List<CMsrResultItemClr> cMsrResultItemClrListTemp = cMsrResultItemClrList;
+                        List<CMsrResultItem> cMsrResultItemClrListTemp = cMsrResultItemClrList;
                         //设置测量状态数据列表
                         SetMeasureListInfo(cMsrResultItemClrList);
                     }
@@ -359,7 +362,7 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
             //用时
             TimeSpan measureTime = SMsrData.MsrStatus.SMsrCompleteData.MsrUsedTime;
             string measureState = string.Empty;
-            OTSSysMgrTools.Language lan = new OTSSysMgrTools.Language();
+            Language lan = new Language();
             Hashtable table= lan.GetNameTable("OTSMeasureResultWindow");
             
             //状态

OTS/OTSIncAMeasureApp/OTSMeasureThread/OTSMeasureThreadFun.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using OTSDataType;
 
 namespace OTSIncAMeasureApp.OTSMeasureThread
 {
@@ -22,7 +23,7 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
         //线程执行类型 1：测量 2：获取样品孔图片
         public static int DoRunType = 1;
         public static int m_HoleID;
-        public static CDomainClr c_DomainMessure;
+        public static CDomain c_DomainMessure;
         #endregion
 
         #region 构造方法
@@ -58,7 +59,7 @@ namespace OTSIncAMeasureApp.OTSMeasureThread
         /// </summary>
         /// <param name="HoleID">样品孔编号的序号</param>
         /// <param name="DomainMessure">测量区域属性对象</param>
-        public void SetHoleImagePreview(int HoleID, CDomainClr DomainMessure)
+        public void SetHoleImagePreview(int HoleID, CDomain DomainMessure)
         {
             //样品孔编号的序号
             m_HoleID = HoleID;

OTS/OTSIncAMeasureApp/OTSProgMgrInfo/OTSProgMgrInfoFunction/OTSProgMgrInfoFun.cs

@@ -8,7 +8,7 @@ using OTSPeriodicTable;
 //
 using OTSProgMgrInfo.OTSProgMgrInfoFunction;
 
-using NSLogFunExport;
+//using NSLogFunExport;
 using OTSDataType;
 using OTSModelSharp;
 
@@ -277,9 +277,9 @@ enum OTS_FIVE_TIES_OPTIONS
         public COTSProgMgrParamFile m_cotsprogmgrparamfileclr;          //参数类
         //
         public CSEMStageData m_csemstagedataclr;                        //SEM样品台处理类
-        public COTSImgScanPrm m_cotsimgscanprmclr;                      //图像扫描类
-        public CGenParam m_cgenparamclr;                                //一般参数类
-        public COTSImgProcPrm m_cotsimgprocprmclr;                      //图像处理类
+        public COTSImageScanParam m_cotsimgscanprmclr;                      //图像扫描类
+        public COTSGeneralParameters m_cgenparamclr;                                //一般参数类
+        public COTSImageProcessParam m_cotsimgprocprmclr;                      //图像处理类
         public COTSXRayParam m_cotsxrayprmclr;                            //X-Ray类
 
         //后加
@@ -289,7 +289,9 @@ enum OTS_FIVE_TIES_OPTIONS
         public CMsrParamFileMrg m_cmsrparamfilemrgclr;                       //参数文件类
 
         // 初始化日志类
-        public CFunExportClass m_LogFunExport = null;                           //日志类
+        //public CFunExportClass m_LogFunExport = null;                           //日志类
+        public static NLog.Logger loger = NLog.LogManager.GetCurrentClassLogger();
+
         const String m_csFileName = "OTSMeasureAppLog";                         // 测量程序日志文件名
         #endregion
 
@@ -297,8 +299,9 @@ enum OTS_FIVE_TIES_OPTIONS
         public OTSProgMgrInfoFun(ProgMgrInfoForm in_PMIF)
         {
             m_cotsprogmgrparamfileclr = new COTSProgMgrParamFile();
-            m_LogFunExport = new CFunExportClass();
-            m_LogFunExport.InitLog(m_csFileName);
+            //m_LogFunExport = new CFunExportClass();
+            //m_LogFunExport.InitLog(m_csFileName);
+            loger.Trace(m_csFileName);
 
             m_cstageclr = new CStage();
             m_cstagefileclr = new CStageFile();
@@ -323,7 +326,8 @@ enum OTS_FIVE_TIES_OPTIONS
 
             if (!m_cstagefileclr.Load((int)OTS_SOFT_PACKAGE_ID.OTSIncA, true, !PMIF.m_b_checkstagefile))
             {
-                m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.StageLoad)  加载样品台信息失败");
+                //m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.StageLoad)  加载样品台信息失败");
+                loger.Trace("(OTSProgMgrInfoFun.StageLoad)  加载样品台信息失败");
                 return false;
             }
 
@@ -341,7 +345,8 @@ enum OTS_FIVE_TIES_OPTIONS
             CStage ls_cstageclr = m_cstagefileclr.GetWorkingStage();
             if (null == ls_cstageclr)
             {
-                m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.GetWorkingStage)  获取正在工作的样品台类失败");
+                //m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.GetWorkingStage)  获取正在工作的样品台类失败");
+                loger.Trace("(OTSProgMgrInfoFun.GetWorkingStage)  获取正在工作的样品台类失败");
                 return ls_cstageclr;
             }
 
@@ -381,7 +386,8 @@ enum OTS_FIVE_TIES_OPTIONS
             //m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.StageSave)  保存样品台信息");
             if (!m_cstagefileclr.Save((int)OTS_SOFT_PACKAGE_ID.OTSIncA))
             {
-                m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.StageLoad)  保存样品台信息失败");
+                //m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.StageLoad)  保存样品台信息失败");
+                loger.Trace("(OTSProgMgrInfoFun.StageLoad)  保存样品台信息失败");
                 return false;
             }
             return true;
@@ -397,7 +403,8 @@ enum OTS_FIVE_TIES_OPTIONS
             List<CStage> l_cstageclr = m_cstagefileclr.GetStagesList();
             if (null == l_cstageclr)
             {
-                m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.GetStageList)  获取样品台信息列表失败");
+                //m_LogFunExport.TraceErrorLog("(OTSProgMgrInfoFun.GetStageList)  获取样品台信息列表失败");
+                loger.Trace("(OTSProgMgrInfoFun.GetStageList)  获取样品台信息列表失败");
                 return l_cstageclr;
             }
             return l_cstageclr;
@@ -438,8 +445,8 @@ enum OTS_FIVE_TIES_OPTIONS
         /// </summary>
         public void LoadSEMStageData()
         {
-            m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.LoadSEMStageData)  读取样品台SEM参数信息");
-
+            //m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.LoadSEMStageData)  读取样品台SEM参数信息");
+            loger.Trace("(OTSProgMgrInfoFun.LoadSEMStageData)  读取样品台SEM参数信息");
             //100倍时屏幕尺寸/mm
             PMIF.IDC_EDIT_SCREENWIDTH.Text = m_csemstagedataclr.GetScanFieldSize100().ToString();
             //x轴方向
@@ -479,14 +486,14 @@ enum OTS_FIVE_TIES_OPTIONS
         /// </summary>
         public void LoadImageScanPrm()
         {
-            m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.LoadImageScanPrm)  加载图像扫描参数");
-
+            //m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.LoadImageScanPrm)  加载图像扫描参数");
+            loger.Trace("(OTSProgMgrInfoFun.LoadImageScanPrm)  加载图像扫描参数");
             //测量终止方式
             //PMIF.IDC_COMBO_STOPMODE.Text = ((OTS_MEASURE_STOP_MODE)Enum.ToObject(typeof(OTS_MEASURE_STOP_MODE), PMIF.m_cotsimgscanprmclr.GetStopMode())).ToString();
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_STOPMODE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgscanprmclr.GetStopMode())
+                    if ((otsdataconst.OTS_MEASURE_STOP_MODE)cbi.Value == m_cotsimgscanprmclr.GetStopMode())
                     {
                         PMIF.IDC_COMBO_STOPMODE.SelectedItem = cbi;
                     }
@@ -502,7 +509,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_FETCHIMGMODE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgscanprmclr.GetStartImageMode())
+                    if ((otsdataconst.OTS_GET_IMAGE_MODE)cbi.Value == m_cotsimgscanprmclr.GetStartImageMode())
                     {
                         PMIF.IDC_COMBO_FETCHIMGMODE.SelectedItem = cbi;
                     }
@@ -512,7 +519,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_IMGSCANSPEED.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgscanprmclr.GetScanImageSpeed())
+                    if ((otsdataconst.OTS_THREE_TIES_OPTIONS)cbi.Value == m_cotsimgscanprmclr.GetScanImageSpeed())
                     {
                         PMIF.IDC_COMBO_IMGSCANSPEED.SelectedItem = cbi;
                     }
@@ -522,7 +529,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_IMGSIZE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgscanprmclr.GetImagePixelSize())
+                    if ((otsdataconst.OTS_FIVE_TIES_OPTIONS)cbi.Value == m_cotsimgscanprmclr.GetImagePixelSize())
                     {
                         PMIF.IDC_COMBO_IMGSIZE.SelectedItem = cbi;
                     }
@@ -540,7 +547,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_FrameEndMode.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgscanprmclr.GetFieldStopMode())
+                    if ((otsdataconst.OTS_MEASURE_FIELD_STOP_MODE)cbi.Value == m_cotsimgscanprmclr.GetFieldStopMode())
                     {
                         PMIF.IDC_COMBO_FrameEndMode.SelectedItem = cbi;
                     }
@@ -624,7 +631,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.cBMeasShape.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cgenparamclr.GetShape())
+                    if ((DOMAIN_SHAPE)cbi.Value == m_cgenparamclr.GetShape())
                     {
                         PMIF.cBMeasShape.SelectedItem = cbi;
                     }
@@ -664,9 +671,9 @@ enum OTS_FIVE_TIES_OPTIONS
             //m_LogFunExport.TraceLog("(OTSProgMgrInfoFun.LoadImageProc)  加载图像处理参数");
 
             //颗粒面积范围 最小
-            PMIF.IDC_EDIT_PARTAREAMIN.Text = m_cotsimgprocprmclr.GetIncArea().GetStart().ToString();
+            PMIF.IDC_EDIT_PARTAREAMIN.Text = m_cotsimgprocprmclr.GetIncAreaRange().GetStart().ToString();
             //颗粒面积范围 最大
-            PMIF.IDC_EDIT_PARTAREAMAX.Text = m_cotsimgprocprmclr.GetIncArea().GetEnd().ToString();
+            PMIF.IDC_EDIT_PARTAREAMAX.Text = m_cotsimgprocprmclr.GetIncAreaRange().GetEnd().ToString();
             //背景灰度范围 最小
             PMIF.IDC_EDIT_BACKMIN.Text = m_cotsimgprocprmclr.GetBGGray().GetStart().ToString();
             //背景灰度范围 最大
@@ -687,7 +694,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_AUTOBGREMOVE_TYPE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgprocprmclr.GetAutoBGRemoveType())
+                    if ((otsdataconst.OTS_AUTOBGREMOVE_TYPE)cbi.Value == m_cotsimgprocprmclr.GetAutoBGRemoveType())
                     {
                         PMIF.IDC_COMBO_AUTOBGREMOVE_TYPE.SelectedItem = cbi;
                     }
@@ -697,7 +704,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_AUTO.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsimgprocprmclr.GetBGRemoveType())
+                    if ((otsdataconst.OTS_BGREMOVE_TYPE)cbi.Value == m_cotsimgprocprmclr.GetBGRemoveType())
                     {
                         PMIF.IDC_COMBO_AUTO.SelectedItem = cbi;
                     }
@@ -716,7 +723,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_SEARCHXRAYSPEED.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsxrayprmclr.GetSearchSpeed())
+                    if ((otsdataconst.OTS_THREE_TIES_OPTIONS)cbi.Value == m_cotsxrayprmclr.GetSearchSpeed())
                     {
                         PMIF.IDC_COMBO_SEARCHXRAYSPEED.SelectedItem = cbi;
                     }
@@ -732,7 +739,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_XRAYSCANMODE.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsxrayprmclr.GetScanMode())
+                    if ((otsdataconst.OTS_X_RAY_SCAN_MODE)cbi.Value == m_cotsxrayprmclr.GetScanMode())
                     {
                         PMIF.IDC_COMBO_XRAYSCANMODE.SelectedItem = cbi;
                     }
@@ -742,7 +749,7 @@ enum OTS_FIVE_TIES_OPTIONS
             foreach (OTSPeriodicTable.ComboBoxItem cbi in PMIF.IDC_COMBO_ANALYXRAYSPEED.Items)
             {
                 if (cbi.Value.ToString() != "")
-                    if (Convert.ToInt32(cbi.Value) == m_cotsxrayprmclr.GetAnalySpeed())
+                    if ((otsdataconst.OTS_THREE_TIES_OPTIONS)cbi.Value == m_cotsxrayprmclr.GetAnalySpeed())
                     {
                         PMIF.IDC_COMBO_ANALYXRAYSPEED.SelectedItem = cbi;
                     }
@@ -781,7 +788,7 @@ enum OTS_FIVE_TIES_OPTIONS
             //x轴方向
             //OTS_X_AXIS_DIRECTION enum_x = (OTS_X_AXIS_DIRECTION)Enum.Parse(typeof(OTS_X_AXIS_DIRECTION), PMIF.IDC_COMBO_XDIREC.SelectedItem.ToString(), false);
             OTSPeriodicTable. ComboBoxItem cbi_x = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_XDIREC.SelectedItem;
-            m_csemstagedataclr.SetXAxisDir(Convert.ToInt32(cbi_x.Value));
+            m_csemstagedataclr.SetXAxisDir((otsdataconst.OTS_X_AXIS_DIRECTION)cbi_x.Value);
 
             //x轴行程/mm 起,始
             CIntRange crc_x = new CIntRange(Convert.ToInt32(PMIF.IDC_EDIT_XSTART.Text)*1000, Convert.ToInt32(PMIF.IDC_EDIT_XEND.Text)*1000);
@@ -790,7 +797,7 @@ enum OTS_FIVE_TIES_OPTIONS
             //y轴方向
             //OTS_Y_AXIS_DIRECTION enum_y = (OTS_Y_AXIS_DIRECTION)Enum.Parse(typeof(OTS_Y_AXIS_DIRECTION), PMIF.IDC_COMBO_YDIRECT.SelectedItem.ToString(), false);
             OTSPeriodicTable.ComboBoxItem cbi_y = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_YDIRECT.SelectedItem;
-            m_csemstagedataclr.SetYAxisDir(Convert.ToInt32(cbi_y.Value));
+            m_csemstagedataclr.SetYAxisDir((otsdataconst.OTS_Y_AXIS_DIRECTION)cbi_y.Value);
 
             //y轴行程/mm 起,始
             CIntRange crc_y = new CIntRange(Convert.ToInt32(PMIF.IDC_EDIT_YSTART.Text)*1000, Convert.ToInt32(PMIF.IDC_EDIT_YEND.Text)*1000);
@@ -810,7 +817,7 @@ enum OTS_FIVE_TIES_OPTIONS
             //测量终止方式
             //OTS_MEASURE_STOP_MODE enum_stopmode = (OTS_MEASURE_STOP_MODE)Enum.Parse(typeof(OTS_MEASURE_STOP_MODE), PMIF.IDC_COMBO_STOPMODE.SelectedItem.ToString(), false);
             OTSPeriodicTable.ComboBoxItem enum_stopmode = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_STOPMODE.SelectedItem;
-            m_cotsimgscanprmclr.SetStopMode(Convert.ToInt32(enum_stopmode.Value));
+            m_cotsimgscanprmclr.SetStopMode((otsdataconst.OTS_MEASURE_STOP_MODE)enum_stopmode.Value);
 
             //终止时间
             m_cotsimgscanprmclr.SetStopParamMeasTime(Convert.ToInt32(PMIF.IDC_EDIT_STOP_TIME.Text));
@@ -824,17 +831,17 @@ enum OTS_FIVE_TIES_OPTIONS
             //取图方式
             //OTS_GET_IMAGE_MODE enum_fetchimgmode = (OTS_GET_IMAGE_MODE)Enum.Parse(typeof(OTS_GET_IMAGE_MODE), PMIF.IDC_COMBO_FETCHIMGMODE.SelectedItem.ToString(), false);
             OTSPeriodicTable.ComboBoxItem enum_fetchimgmode = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_FETCHIMGMODE.SelectedItem;
-            m_cotsimgscanprmclr.SetStartImageMode(Convert.ToInt32(enum_fetchimgmode.Value));
+            m_cotsimgscanprmclr.SetStartImageMode((otsdataconst.OTS_MEASURE_STOP_MODE)enum_fetchimgmode.Value);
 
             //扫描图精度
             //OTS_THREE_TIES_OPTIONS enum_imgscanspeed = (OTS_THREE_TIES_OPTIONS)Enum.Parse(typeof(OTS_THREE_TIES_OPTIONS), PMIF.IDC_COMBO_IMGSCANSPEED.SelectedItem.ToString(), false);
             OTSPeriodicTable.ComboBoxItem enum_imgscanspeed = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_IMGSCANSPEED.SelectedItem;
-            m_cotsimgscanprmclr.SetScanImageSpeed(Convert.ToInt32(enum_imgscanspeed.Value));
+            m_cotsimgscanprmclr.SetScanImageSpeed((otsdataconst.OTS_MEASURE_STOP_MODE)enum_imgscanspeed.Value);
 
             //扫描图尺寸
             //OTS_FIVE_TIES_OPTIONS enum_imgsize = (OTS_FIVE_TIES_OPTIONS)Enum.Parse(typeof(OTS_FIVE_TIES_OPTIONS), PMIF.IDC_COMBO_IMGSIZE.SelectedItem.ToString(), false);
             OTSPeriodicTable.ComboBoxItem enum_imgsize = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_IMGSIZE.SelectedItem;
-            m_cotsimgscanprmclr.SetImagePixelSize(Convert.ToInt32(enum_imgsize.Value));
+            m_cotsimgscanprmclr.SetImagePixelSize((otsdataconst.OTS_MEASURE_STOP_MODE)enum_imgsize.Value);
 
             //m_cotsimgscanprmclr.SetShowStopMode(PMIF.IDC_STOP_MODE_SWITCH.Checked);
             //m_cotsimgscanprmclr.SetShowMeasTime(PMIF.IDC_STOP_TIME_SWITCH.Checked);
@@ -848,7 +855,7 @@ enum OTS_FIVE_TIES_OPTIONS
 
             //帧结束方式
             OTSPeriodicTable.ComboBoxItem enum_FrameEndMode = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_FrameEndMode.SelectedItem;
-            m_cotsimgscanprmclr.SetFieldStopMode(Convert.ToInt32(enum_FrameEndMode.Value));
+            m_cotsimgscanprmclr.SetFieldStopMode((otsdataconst.OTS_MEASURE_STOP_MODE)enum_FrameEndMode.Value);
 
             //帧结束方式对应参数
             if (PMIF.IDC_COMBO_FrameEndMode.SelectedItem.ToString()== "颗粒百分比")
@@ -898,7 +905,7 @@ enum OTS_FIVE_TIES_OPTIONS
 
             //测量区域形状
             OTSPeriodicTable.ComboBoxItem enum_Shape = (OTSPeriodicTable.ComboBoxItem)PMIF.cBMeasShape.SelectedItem;
-            m_cgenparamclr.SetShape(Convert.ToInt32(enum_Shape.Value));
+            m_cgenparamclr.SetShape((otsdataconst.OTS_MEASURE_STOP_MODE)enum_Shape.Value);
 
             //测量区域大小
             m_cgenparamclr.SetArea(Convert.ToDouble(PMIF.tBMeasArea.Text));
@@ -947,11 +954,11 @@ enum OTS_FIVE_TIES_OPTIONS
 
             //搜索X-ray精度
             OTSPeriodicTable.ComboBoxItem enum_AUTOBGREMOVETYPE = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_AUTOBGREMOVE_TYPE.SelectedItem;
-            m_cotsimgprocprmclr.SetBGRemoveType(Convert.ToInt32(enum_AUTOBGREMOVETYPE.Value));
+            m_cotsimgprocprmclr.SetBGRemoveType((otsdataconst.OTS_MEASURE_STOP_MODE)enum_AUTOBGREMOVETYPE.Value);
 
             //搜索X-ray精度
             OTSPeriodicTable.ComboBoxItem enum_IMAGEMODE = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_AUTO.SelectedItem;
-            m_cotsimgprocprmclr.SetAutoBGRemoveType(Convert.ToInt32(enum_IMAGEMODE.Value));
+            m_cotsimgprocprmclr.SetAutoBGRemoveType((otsdataconst.OTS_MEASURE_STOP_MODE)enum_IMAGEMODE.Value);
         }
 
         /// <summary>
@@ -962,7 +969,7 @@ enum OTS_FIVE_TIES_OPTIONS
 
             //搜索X-ray精度
             OTSPeriodicTable.ComboBoxItem enum_searchxrayspeed = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_SEARCHXRAYSPEED.SelectedItem;
-            m_cotsxrayprmclr.SetSearchSpeed(Convert.ToInt32(enum_searchxrayspeed.Value));
+            m_cotsxrayprmclr.SetSearchSpeed((otsdataconst.OTS_MEASURE_STOP_MODE)enum_searchxrayspeed.Value);
 
             //搜索X - ray精度对应的时间
             m_cotsxrayprmclr.SetMidSearchAQTime(Convert.ToInt32(PMIF.IDC_TEXTBOX_SEARCHXRAYSPEED_TIME.Text.Trim()));
@@ -972,11 +979,11 @@ enum OTS_FIVE_TIES_OPTIONS
 
             //X-ray扫描方式
             OTSPeriodicTable.ComboBoxItem enum_xrayscanmode = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_XRAYSCANMODE.SelectedItem;
-            m_cotsxrayprmclr.SetScanMode(Convert.ToInt32(enum_xrayscanmode.Value));
+            m_cotsxrayprmclr.SetScanMode((otsdataconst.OTS_MEASURE_STOP_MODE)enum_xrayscanmode.Value);
 
             //分析X-ray精度
             OTSPeriodicTable.ComboBoxItem enum_analyxrayspeed = (OTSPeriodicTable.ComboBoxItem)PMIF.IDC_COMBO_ANALYXRAYSPEED.SelectedItem;
-            m_cotsxrayprmclr.SetAnalySpeed(Convert.ToInt32(enum_analyxrayspeed.Value));
+            m_cotsxrayprmclr.SetAnalySpeed((otsdataconst.OTS_MEASURE_STOP_MODE)enum_analyxrayspeed.Value);
 
             //分析X-ray精度对应的时间
             m_cotsxrayprmclr.SetMidAnalyAQTime(Convert.ToInt32(PMIF.IDC_TEXTBOX_ANALYXRAYSPEED_TIME.Text.Trim()));