debug measure thread

HOZProject/FormUnitControl.cs

@@ -635,10 +635,6 @@ namespace HOZProject
             mf.FilePath = path;
 
             CutHole ch = new CutHole();
-            ch.SampleName = "SampleName1";
-            ch.PT = true;
-            ch.FIBTemp = "FIBTemp1";
-            ch.PTTemp = "PTTemp1";
             ch.OPT = Operation.Image;
             ch.START = System.DateTime.Now;
             ch.END = System.DateTime.Now.AddHours(2);
@@ -658,10 +654,6 @@ namespace HOZProject
             mf.ListCutHole.Add(ch);
 
             ch = new CutHole();
-            ch.SampleName = "SampleName2";
-            ch.PT = true;
-            ch.FIBTemp = "FIBTemp2";
-            ch.PTTemp = "PTTemp2";
             ch.OPT = Operation.Image;
             ch.START = System.DateTime.Now;
             ch.END = System.DateTime.Now.AddHours(2);

HOZProject/Program.cs

@@ -17,8 +17,8 @@ namespace HOZProject
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //Application.Run(new FormUCMain());
-            Application.Run(new FormUnitControl());
-            //Application.Run(new FormMeasureTest());
+            //Application.Run(new FormUnitControl());
+            Application.Run(new FormMeasureTest());
         }
     }
 }

MeasureData/CutHole.cs

@@ -61,48 +61,6 @@ namespace MeasureData
         }
         #endregion
 
-        #region 工作条件
-        #region 样品名
-        /// <summary>
-        /// 样品名
-        /// </summary>
-        private string m_SampleName;
-
-        public string SampleName
-        {
-            get { return this.m_SampleName; }
-            set { this.m_SampleName = value; }
-        }
-        #endregion
-
-        //是否有pt工序
-        private Boolean m_pt;
-
-        public Boolean PT
-        {
-            get { return this.m_pt; }
-            set { this.m_pt = value; }
-        }
-
-        //FIB工作模板
-        private string m_fibTemp;
-
-        public string FIBTemp
-        {
-            get { return this.m_fibTemp; }
-            set { this.m_fibTemp = value; }
-        }
-
-        //PT工作模板
-        private string m_ptTemp;
-
-        public string PTTemp
-        {
-            get { return this.m_ptTemp; }
-            set { this.m_ptTemp = value; }
-        }
-        #endregion
-
         #region 工作状态
         //操作步骤
         private Operation m_opt;
@@ -178,7 +136,7 @@ namespace MeasureData
 
             //样品名称
             xString SampleName = new xString();
-            SampleName.AssignValue(this.SampleName);
+            SampleName.AssignValue(this.HoleName);
             slo_cuthole.Register("SampleName", SampleName);
 
             Slo<SemPosition> slo_sp = new Slo<SemPosition>();
@@ -206,20 +164,7 @@ namespace MeasureData
             ptx.AssignValue(this.Position.M);
             slo_sp.Register("M", ptm);
             slo_cuthole.Register("Position", slo_sp);
-
-            //是否有PT沉积
-            xBool PT = new xBool();
-            PT.AssignValue(this.PT);
-            slo_cuthole.Register("PT", PT);
-            //FIB工作模板
-            xString FIBTemp = new xString();
-            FIBTemp.AssignValue(this.FIBTemp);
-            slo_cuthole.Register("FIBTemp", FIBTemp);
-            //PT工作模板
-            xString PTTemp = new xString();
-            PTTemp.AssignValue(this.PTTemp);
-            slo_cuthole.Register("PTTemp", PTTemp);
-
+           
             //操作步骤
             xInt OPT = new xInt();
             OPT.AssignValue(this.OPT.GetHashCode());
@@ -249,10 +194,6 @@ namespace MeasureData
             {
                 slo_cuthole.Serialize(false, xml, rootNode);
 
-                this.SampleName = SampleName.value();
-                this.PT = PT.value();
-                this.FIBTemp = FIBTemp.value();
-                this.PTTemp = PTTemp.value();
                 this.OPT = (Operation)OPT.value();
                 this.START = START.value();
                 this.END = END.value();

MeasureData/MeasureFile.cs

@@ -250,6 +250,8 @@ namespace MeasureData
                 holePos.T = (float)Convert.ToDouble(CurrentPos[nTPos]);
                 holePos.R = (float)Convert.ToDouble(CurrentPos[nRPos]);
                 CHole.Position = holePos;
+                //默认切割点均参与测试
+                CHole.SWITCH = true;
 
                 //更新切孔链表
                 this.ListCutHole.Add(CHole);

MeasureData/MeasureParam.cs

@@ -15,6 +15,12 @@ namespace MeasureData
 {
     public class MeasureParam : ISlo
     {
+        public enum FMode
+        {
+            Manual,
+            Auto
+        }
+
         #region 内容
         //工作条件，一次测量的全部切孔都是一类的
 
@@ -49,6 +55,14 @@ namespace MeasureData
             get { return this.m_ptTemp; }
             set { this.m_ptTemp = value; }
         }
+
+        //对焦方式，自动对焦还是手动对焦
+        private FMode m_fMode;
+        public FMode FocusMode
+        {
+            get { return m_fMode; }
+            set { m_fMode = value; }
+        }
         #endregion
 
         //构造函数
@@ -74,16 +88,19 @@ namespace MeasureData
             xBool pt = new xBool();
             xString FIBtemp = new xString();
             xString PTtemp = new xString();
+            xInt FocMode = new xInt();
 
             sampleName.AssignValue(this.SampleName);
             pt.AssignValue(this.PT);
             FIBtemp.AssignValue(this.FIBTemp);
             PTtemp.AssignValue(this.PTTemp);
+            FocMode.AssignValue((int)this.FocusMode);
 
             slo_msparam.Register("SampleName", sampleName);
             slo_msparam.Register("PT", pt);
             slo_msparam.Register("FIBTemp", FIBtemp);
             slo_msparam.Register("PTTemp", PTtemp);
+            slo_msparam.Register("FocusMode", FocMode);
 
             if (isStoring)
             {
@@ -97,6 +114,7 @@ namespace MeasureData
                 this.PT = pt.value();
                 this.FIBTemp = FIBtemp.value();
                 this.PTTemp = PTtemp.value();
+                this.FocusMode = (FMode)FocMode.value();
             }
         }
 

MeasureThread/Measure.cs

@@ -14,12 +14,6 @@ using MeasureData;
 
 namespace MeasureThread
 {
-    public enum FMode
-    {
-        Manual,
-        Auto
-    }
-
     public enum ImageMode
     {
         FIB,
@@ -73,22 +67,14 @@ namespace MeasureThread
             set { this.m_ThreadStatus = value; }
         }
 
-        //对焦模式
-        private FMode m_bFocusMode;
-        public FMode FocusMode
+        //测量参数
+        private MeasureParam m_MsParam;
+        public MeasureParam MeasParam
         {
-            get { return this.m_bFocusMode; }
-            set { this.m_bFocusMode = FocusMode; }
+            get { return this.m_MsParam; }
+            set { this.m_MsParam = value; }
         }
 
-        //// SEM data general
-        //CSEMDataGnrPtr m_pSEMDataGnr;
-
-        ////MeasureAppFormName
-        //CString m_strMAppFormName;
-
-        //HWND m_hWnd;
-
         //构造函数
         public Measure()
         {
@@ -97,7 +83,7 @@ namespace MeasureThread
 
         public void Init()
         {
-            FocusMode = FMode.Manual;
+            
         }
 
         //初始化测量业务, 读测量文件，判断是否有可测试的切孔
@@ -117,6 +103,8 @@ namespace MeasureThread
             if(m_cutHoles.Count == 0)
                 return false;
 
+            this.m_MsParam = m_measureFile.MParam;
+
             return true;
         }
 
@@ -201,13 +189,13 @@ namespace MeasureThread
         {
             MeasureData.CutHole firstHole = m_cutHoles[0];
             //12.根据样品类型参数确定是否需要PT沉积，控制PT针插入
-            if (firstHole.PT == true)
-            {
-                if (!iSEM.InsertPT())
-                {
-                    return false;
-                }
-            }
+            //if (firstHole.PT == true)
+            //{
+            //    if (!iSEM.InsertPT())
+            //    {
+            //        return false;
+            //    }
+            //}
 
             //13.自动定位切割
             {
@@ -314,13 +302,13 @@ namespace MeasureThread
                 //6.设置FIB解冻：先读取状态，如果冻结状态则进行解冻
             }
             //15.根据样品类型决定是否撤出PT针
-            if (firstHole.PT == false)
-            {
-                if (!iSEM.OutputPT())
-                {
-                    return false;
-                }
-            }
+            //if (firstHole.PT == false)
+            //{
+            //    if (!iSEM.OutputPT())
+            //    {
+            //        return false;
+            //    }
+            //}
 
             //16.自动调整SEM找到切割位置
             {