多条件测量结束完成待测

OTSIncAMeasureApp/0-OTSModel/OTSDataType/COTSSample.cs

@@ -944,20 +944,21 @@ namespace OTSDataType
                                 a_listPropItems.Add(poPropItem);
 
                             //// stop parameter
-
-                            poPropItem = new CPropItem();
-                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            a_listPropItems.Add(poPropItem);
                             // field
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                            a_listPropItems.Add(poPropItem);
+
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
                             a_listPropItems.Add(poPropItem);
+                            
                             // used time
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
                             a_listPropItems.Add(poPropItem);
                             // scan speed
 
@@ -1372,55 +1373,29 @@ namespace OTSDataType
 
                             poPropItem = new CPropItem();
                             nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE;
-                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.COMBO, false, bShow);
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.STRING, true, bShow);
                             a_listPropItems.Add(poPropItem);
 
-                            //// stop parameter
-                            //switch (m_poMsrParams.GetImageScanParam().GetStopMode())
-                            //{
-                            //    case OTS_MEASURE_STOP_MODE.ParticleMode:
-                            //        {
-                            //            // particle
-
-                            //            poPropItem = new CPropItem();
-                            //            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
-                            //            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            //            a_listPropItems.Add(poPropItem);
-
-                            //        }
-                            //        break;
-
-                            //    case OTS_MEASURE_STOP_MODE.FieldMode:
-                            //        {
-                            //            // field
-
-                            //            poPropItem = new CPropItem();
-                            //            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
-                            //            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            //            a_listPropItems.Add(poPropItem);
-
-                            //        }
-                            //        break;
-
-                            //    case OTS_MEASURE_STOP_MODE.TimeMode:
-                            //        {
-                            //            // used time
-
-                            //            poPropItem = new CPropItem();
-                            //            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
-                            //            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, false, bShow);
-                            //            a_listPropItems.Add(poPropItem);
-
-                            //        }
-                            //        break;
-
-                            //    case OTS_MEASURE_STOP_MODE.CoverMode:
-                            //    default:
-                            //        {
-                            //            // no stop parameter item
-                            //        }
-                            //        break;
-                            //}
+                            poPropItem = new CPropItem();
+                            nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD;
+                            poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                            a_listPropItems.Add(poPropItem);
+                                        // particle
+
+                                        poPropItem = new CPropItem();
+                                        nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE;
+                                        poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                                        a_listPropItems.Add(poPropItem);
+
+                                       
+
+                                        // used time
+
+                                        poPropItem = new CPropItem();
+                                        nItemId = OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME;
+                                        poPropItem.SetSmplParameter(modelResource, nItemId, OTS_ITEM_TYPES.INT, true, false);
+                                        a_listPropItems.Add(poPropItem);
+
 
                             // scan speed
 
@@ -2116,7 +2091,6 @@ namespace OTSDataType
                         if (m_poMsrParams.GetImageScanParam().GetStopMode() != a_strValue)
                         {
                             m_poMsrParams.GetImageScanParam().SetStopMode(a_strValue);
-                            m_Status = new CMsrSampleStatus();
                         }
                     }
                     break;

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -59,7 +59,6 @@ namespace OTSMeasureApp
         public static int Const_Grid_Row = 48;    //总行数
         public static int Const_Grid_Column = 3;   //总列数
 
-        MeasureStopMode StopModeDialog;
 
         //后台工作线程
         BackgroundWorker m_bgWorker = null;
@@ -102,43 +101,6 @@ namespace OTSMeasureApp
             m_linkClickEvent3.Executed += new EventHandler(CellLink_Click_Status);
         }
 
-        /// <summary>
-        /// 帧结束方式事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void clickEvent_Click(object sender, EventArgs e)
-        {
-            SourceGrid.CellContext context = (SourceGrid.CellContext)sender;
-            int i = context.Position.Row;
-            int j = context.Position.Column;
-
-            /// 保证鼠标点击的GRID行和列是有效的
-            if (i >= 0 && j >= 0)
-            {
-                if(StopModeDialog==null)
-                {
-                    StopModeDialog = new MeasureStopMode();
-                }
-                DialogResult result = StopModeDialog.ShowDialog();
-                
-                if (result == DialogResult.OK)
-                {   
-                    string[] rst= StopModeDialog.StopMode.Split(',');
-                    m_PropWindow.PropGrid[i, j].Value = "";
-                    for (int k=0;k< rst.Length;k++)
-                    {
-                        m_PropWindow.PropGrid[i, j].Value += rst[k].Split(':')[0] + " + ";
-                    }
-                    m_PropWindow.PropGrid[i, j].Value = m_PropWindow.PropGrid[i, j].Value.ToString().Substring(0, m_PropWindow.PropGrid[i, j].Value.ToString().Length-3);
-
-                    //m_SampleGrid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, ValType, objVal);
-                }
-            }
-            m_PropWindow.PropGrid.Refresh();
-        }
-
-
         //初始化工作线程
         private void InitWorkThread()
         {

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -171,6 +171,45 @@ namespace OTSMeasureApp
                     DisplaySampleMeasureInfo(SMInfo);
                     return;
                 }
+                if(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_MODE==SampleId)
+                {
+                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_FIELD, OTS_ITEM_TYPES.INT, StopModeDialog.FieldMode))    // Prop值变化，修改样品值成功
+                    {
+                        string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
+                        //重新获取原来工作样品值重新设置
+                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        {
+                            return;
+                        }
+                        //Prop重新获显示工作样品的原来值
+                        DisplaySampleMeasureInfo(SMInfo);
+                        return;
+                    }
+                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, StopModeDialog.TimeMode))    // Prop值变化，修改样品值成功
+                    {
+                        string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
+                        //重新获取原来工作样品值重新设置
+                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        {
+                            return;
+                        }
+                        //Prop重新获显示工作样品的原来值
+                        DisplaySampleMeasureInfo(SMInfo);
+                        return;
+                    }
+                    if (!m_DataMgr.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_PARTICLE, OTS_ITEM_TYPES.INT, StopModeDialog.ParticleMode))    // Prop值变化，修改样品值成功
+                    {
+                        string sLog = "SampleId = " + SampleId.ToString() + "," + "ValType = " + ValType.ToString() + "," + "ObjVal = " + ObjVal.ToString();
+                        //重新获取原来工作样品值重新设置
+                        if (!m_DataMgr.GetWorkSamplePerameter(m_DataMgr.GetWorkSample(), ref SMInfo))
+                        {
+                            return;
+                        }
+                        //Prop重新获显示工作样品的原来值
+                        DisplaySampleMeasureInfo(SMInfo);
+                        return;
+                    }
+                }
             }
             //更新GROUPID和ITEMID的变化
             OTS_SAMPLE_PROP_GRID_ITEMS ItemID = (OTS_SAMPLE_PROP_GRID_ITEMS)SampleId;
@@ -249,19 +288,18 @@ namespace OTSMeasureApp
                     {
                         StopModeDialog = new MeasureStopMode();
                     }
+                    StopModeDialog.FieldMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value.ToString());
+                    StopModeDialog.TimeMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value.ToString());
+                    StopModeDialog.ParticleMode = int.Parse(PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value.ToString());
+                    StopModeDialog.StopMode = PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value.ToString();
                     DialogResult result = StopModeDialog.ShowDialog();
 
                     if (result == DialogResult.OK)
                     {
-                        string[] rst = StopModeDialog.StopMode.Split(',');
-                        string str="";
-                        for (int k = 0; k < rst.Length; k++)
-                        {
-                            str += rst[k].Split(':')[0] + " + ";
-                        }
-                        PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = str.Substring(0, str.Length - 3);
-
-                        //m_SampleGrid.m_PropWindow.SampleGridInfoChange((OTS_SAMPLE_PROP_GRID_ITEMS)SampleId, ValType, objVal);
+                        PropGrid[m_SampleGrid.m_ClickRow, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.StopMode;
+                        PropGrid[m_SampleGrid.m_ClickRow + 2, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.FieldMode;
+                        PropGrid[m_SampleGrid.m_ClickRow + 3, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.TimeMode;
+                        PropGrid[m_SampleGrid.m_ClickRow + 1, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.ParticleMode;
                     }
                 }
             }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -452,12 +452,12 @@ namespace OTSMeasureApp
 
             //测量终止方式
             tB_StopMode.Text = m_cotsimgscanprm.GetStopMode().ToString();
-            //终止时间
-            IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
-            //终止帧图数
-            IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
-            //终止夹杂物数
-            IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
+            ////终止时间
+            //IDC_EDIT_STOP_TIME.Text = m_cotsimgscanprm.GetStopParamMeasTime().ToString();
+            ////终止帧图数
+            //IDC_EDIT_STOP_FIELD_NUM.Text = m_cotsimgscanprm.GetStopParamFields().ToString();
+            ////终止夹杂物数
+            //IDC_EDIT_STOP_INCA_NUM.Text = m_cotsimgscanprm.GetStopParamParticles().ToString();
             //取图方式
             foreach (ComboBoxItem cbi in IDC_COMBO_FETCHIMGMODE.Items)
             {
@@ -2046,6 +2046,10 @@ namespace OTSMeasureApp
             if (StopModeDialog == null)
             {
                 StopModeDialog = new MeasureStopMode();
+                StopModeDialog.FieldMode = m_cotsimgscanprm.GetStopParamFields();
+                StopModeDialog.TimeMode = m_cotsimgscanprm.GetStopParamMeasTime();
+                StopModeDialog.ParticleMode = m_cotsimgscanprm.GetStopParamParticles();
+                StopModeDialog.StopMode = tB_StopMode.Text;
             }
             DialogResult result = StopModeDialog.ShowDialog();
 
@@ -2058,6 +2062,9 @@ namespace OTSMeasureApp
                     str += rst[k].Split(':')[0] + " + ";
                 }
                 tB_StopMode.Text = str.Substring(0, str.Length - 3);
+                IDC_EDIT_STOP_TIME.Text = StopModeDialog.TimeMode.ToString();
+                IDC_EDIT_STOP_FIELD_NUM.Text = StopModeDialog.FieldMode.ToString();
+                IDC_EDIT_STOP_INCA_NUM.Text = StopModeDialog.ParticleMode.ToString();
             }
         }
     }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -405,31 +405,25 @@
             // 
             this.groupBox3.Controls.Add(this.tB_StopMode);
             this.groupBox3.Controls.Add(this.btn_StopMode);
-            this.groupBox3.Controls.Add(this.IDC_EDIT_STOP_INCA_NUM);
-            this.groupBox3.Controls.Add(this.IDC_EDIT_STOP_FIELD_NUM);
-            this.groupBox3.Controls.Add(this.IDC_EDIT_STOP_TIME);
             this.groupBox3.Controls.Add(this.label13);
             this.groupBox3.Controls.Add(this.IDC_COMBO_IMGSIZE);
             this.groupBox3.Controls.Add(this.IDC_COMBO_IMGSCANSPEED);
             this.groupBox3.Controls.Add(this.IDC_COMBO_FETCHIMGMODE);
             this.groupBox3.Controls.Add(this.label12);
             this.groupBox3.Controls.Add(this.label11);
-            this.groupBox3.Controls.Add(this.label10);
-            this.groupBox3.Controls.Add(this.label9);
-            this.groupBox3.Controls.Add(this.label8);
             this.groupBox3.Controls.Add(this.label7);
-            this.groupBox3.Location = new System.Drawing.Point(8, 530);
+            this.groupBox3.Location = new System.Drawing.Point(8, 540);
             this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox3.Name = "groupBox3";
             this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBox3.Size = new System.Drawing.Size(408, 225);
+            this.groupBox3.Size = new System.Drawing.Size(408, 197);
             this.groupBox3.TabIndex = 230;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "图像扫描参数";
             // 
             // tB_StopMode
             // 
-            this.tB_StopMode.Location = new System.Drawing.Point(129, 19);
+            this.tB_StopMode.Location = new System.Drawing.Point(143, 23);
             this.tB_StopMode.Name = "tB_StopMode";
             this.tB_StopMode.ReadOnly = true;
             this.tB_StopMode.Size = new System.Drawing.Size(174, 25);
@@ -437,9 +431,9 @@
             // 
             // btn_StopMode
             // 
-            this.btn_StopMode.Location = new System.Drawing.Point(309, 18);
+            this.btn_StopMode.Location = new System.Drawing.Point(323, 23);
             this.btn_StopMode.Name = "btn_StopMode";
-            this.btn_StopMode.Size = new System.Drawing.Size(75, 23);
+            this.btn_StopMode.Size = new System.Drawing.Size(60, 29);
             this.btn_StopMode.TabIndex = 371;
             this.btn_StopMode.Text = "选择";
             this.btn_StopMode.UseVisualStyleBackColor = true;
@@ -447,7 +441,7 @@
             // 
             // IDC_EDIT_STOP_INCA_NUM
             // 
-            this.IDC_EDIT_STOP_INCA_NUM.Location = new System.Drawing.Point(228, 106);
+            this.IDC_EDIT_STOP_INCA_NUM.Location = new System.Drawing.Point(955, 647);
             this.IDC_EDIT_STOP_INCA_NUM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_INCA_NUM.MaxLength = 10;
             this.IDC_EDIT_STOP_INCA_NUM.Name = "IDC_EDIT_STOP_INCA_NUM";
@@ -458,7 +452,7 @@
             // 
             // IDC_EDIT_STOP_FIELD_NUM
             // 
-            this.IDC_EDIT_STOP_FIELD_NUM.Location = new System.Drawing.Point(228, 76);
+            this.IDC_EDIT_STOP_FIELD_NUM.Location = new System.Drawing.Point(955, 617);
             this.IDC_EDIT_STOP_FIELD_NUM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_FIELD_NUM.MaxLength = 10;
             this.IDC_EDIT_STOP_FIELD_NUM.Name = "IDC_EDIT_STOP_FIELD_NUM";
@@ -469,7 +463,7 @@
             // 
             // IDC_EDIT_STOP_TIME
             // 
-            this.IDC_EDIT_STOP_TIME.Location = new System.Drawing.Point(228, 48);
+            this.IDC_EDIT_STOP_TIME.Location = new System.Drawing.Point(955, 589);
             this.IDC_EDIT_STOP_TIME.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_EDIT_STOP_TIME.MaxLength = 10;
             this.IDC_EDIT_STOP_TIME.Name = "IDC_EDIT_STOP_TIME";
@@ -481,7 +475,7 @@
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(8, 192);
+            this.label13.Location = new System.Drawing.Point(8, 154);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(82, 15);
             this.label13.TabIndex = 360;
@@ -491,10 +485,10 @@
             // 
             this.IDC_COMBO_IMGSIZE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_IMGSIZE.FormattingEnabled = true;
-            this.IDC_COMBO_IMGSIZE.Location = new System.Drawing.Point(157, 190);
+            this.IDC_COMBO_IMGSIZE.Location = new System.Drawing.Point(144, 152);
             this.IDC_COMBO_IMGSIZE.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_COMBO_IMGSIZE.Name = "IDC_COMBO_IMGSIZE";
-            this.IDC_COMBO_IMGSIZE.Size = new System.Drawing.Size(227, 23);
+            this.IDC_COMBO_IMGSIZE.Size = new System.Drawing.Size(240, 23);
             this.IDC_COMBO_IMGSIZE.TabIndex = 370;
             this.IDC_COMBO_IMGSIZE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_IMGSIZE_SelectedIndexChanged);
             // 
@@ -502,10 +496,10 @@
             // 
             this.IDC_COMBO_IMGSCANSPEED.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_IMGSCANSPEED.FormattingEnabled = true;
-            this.IDC_COMBO_IMGSCANSPEED.Location = new System.Drawing.Point(157, 162);
+            this.IDC_COMBO_IMGSCANSPEED.Location = new System.Drawing.Point(144, 108);
             this.IDC_COMBO_IMGSCANSPEED.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_COMBO_IMGSCANSPEED.Name = "IDC_COMBO_IMGSCANSPEED";
-            this.IDC_COMBO_IMGSCANSPEED.Size = new System.Drawing.Size(227, 23);
+            this.IDC_COMBO_IMGSCANSPEED.Size = new System.Drawing.Size(240, 23);
             this.IDC_COMBO_IMGSCANSPEED.TabIndex = 350;
             this.IDC_COMBO_IMGSCANSPEED.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_IMGSCANSPEED_SelectedIndexChanged);
             // 
@@ -513,17 +507,17 @@
             // 
             this.IDC_COMBO_FETCHIMGMODE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.IDC_COMBO_FETCHIMGMODE.FormattingEnabled = true;
-            this.IDC_COMBO_FETCHIMGMODE.Location = new System.Drawing.Point(157, 135);
+            this.IDC_COMBO_FETCHIMGMODE.Location = new System.Drawing.Point(144, 66);
             this.IDC_COMBO_FETCHIMGMODE.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.IDC_COMBO_FETCHIMGMODE.Name = "IDC_COMBO_FETCHIMGMODE";
-            this.IDC_COMBO_FETCHIMGMODE.Size = new System.Drawing.Size(227, 23);
+            this.IDC_COMBO_FETCHIMGMODE.Size = new System.Drawing.Size(240, 23);
             this.IDC_COMBO_FETCHIMGMODE.TabIndex = 330;
             this.IDC_COMBO_FETCHIMGMODE.SelectedIndexChanged += new System.EventHandler(this.IDC_COMBO_FETCHIMGMODE_SelectedIndexChanged);
             // 
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(8, 165);
+            this.label12.Location = new System.Drawing.Point(7, 111);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(82, 15);
             this.label12.TabIndex = 340;
@@ -532,7 +526,7 @@
             // label11
             // 
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(8, 138);
+            this.label11.Location = new System.Drawing.Point(8, 69);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(67, 15);
             this.label11.TabIndex = 320;
@@ -541,7 +535,7 @@
             // label10
             // 
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(8, 109);
+            this.label10.Location = new System.Drawing.Point(841, 653);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(97, 15);
             this.label10.TabIndex = 300;
@@ -550,7 +544,7 @@
             // label9
             // 
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(8, 79);
+            this.label9.Location = new System.Drawing.Point(841, 623);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(82, 15);
             this.label9.TabIndex = 280;
@@ -559,7 +553,7 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(8, 50);
+            this.label8.Location = new System.Drawing.Point(841, 594);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(98, 15);
             this.label8.TabIndex = 260;
@@ -568,7 +562,7 @@
             // label7
             // 
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(8, 22);
+            this.label7.Location = new System.Drawing.Point(7, 26);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(97, 15);
             this.label7.TabIndex = 240;
@@ -1470,7 +1464,7 @@
             // 
             // btnok
             // 
-            this.btnok.Location = new System.Drawing.Point(614, 722);
+            this.btnok.Location = new System.Drawing.Point(613, 709);
             this.btnok.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnok.Name = "btnok";
             this.btnok.Size = new System.Drawing.Size(88, 28);
@@ -1481,7 +1475,7 @@
             // 
             // btncancel
             // 
-            this.btncancel.Location = new System.Drawing.Point(724, 722);
+            this.btncancel.Location = new System.Drawing.Point(724, 709);
             this.btncancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btncancel.Name = "btncancel";
             this.btncancel.Size = new System.Drawing.Size(88, 28);
@@ -1531,10 +1525,13 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(835, 759);
+            this.ClientSize = new System.Drawing.Size(834, 742);
             this.Controls.Add(this.IDC_IMAGE_SIZE_SWITCH);
             this.Controls.Add(this.groupBox7);
+            this.Controls.Add(this.IDC_EDIT_STOP_INCA_NUM);
             this.Controls.Add(this.IDC_SCAN_SPEED_SWITCH);
+            this.Controls.Add(this.IDC_EDIT_STOP_FIELD_NUM);
+            this.Controls.Add(this.IDC_EDIT_STOP_TIME);
             this.Controls.Add(this.btncancel);
             this.Controls.Add(this.IDC_FETCH_IMAGE_SWITCH);
             this.Controls.Add(this.IDC_XRAY_COUNT_SWITCH);
@@ -1542,8 +1539,11 @@
             this.Controls.Add(this.btnok);
             this.Controls.Add(this.IDC_STOP_FIELD_SWITCH);
             this.Controls.Add(this.IDC_PART_GRAY_MIN_SWITCH);
+            this.Controls.Add(this.label10);
             this.Controls.Add(this.IDC_STOP_TIME_SWITCH);
+            this.Controls.Add(this.label9);
             this.Controls.Add(this.IDC_XRAY_TIME_SWITCH);
+            this.Controls.Add(this.label8);
             this.Controls.Add(this.IDC_STOP_MODE_SWITCH);
             this.Controls.Add(this.IDC_BACK_MIN_SWITCH);
             this.Controls.Add(this.groupBox6);
@@ -1560,7 +1560,9 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(852, 789);
             this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(852, 789);
             this.Name = "ProgMgrInfoForm";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;