Merge branch 'GSP' of http://36.129.163.148:30080/gogsadmin/OTS into GSP

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -721,16 +721,16 @@ namespace OTSMeasureApp
             m_cotsimgscanprm.SetStopMode(tB_StopMode.Text);
 
             //终止时间
-            //m_cotsimgscanprm.SetStopParamMeasTime(Convert.ToInt32(IDC_EDIT_STOP_TIME.Text));
+            m_cotsimgscanprm.SetStopParamMeasTime(StopModeDialog.TimeMode);
 
             ////终止帧图数
-            //m_cotsimgscanprm.SetStopParamFields(Convert.ToInt32(IDC_EDIT_STOP_FIELD_NUM.Text));
+            m_cotsimgscanprm.SetStopParamFields(StopModeDialog.FieldMode);
 
             ////终止夹杂物数
-            //m_cotsimgscanprm.SetStopParamParticles(Convert.ToInt32(IDC_EDIT_STOP_INCA_NUM.Text));
+            m_cotsimgscanprm.SetStopParamParticles(StopModeDialog.ParticleMode);
 
             ////终止面积
-            //m_cotsimgscanprm.SetStopParamArea(Convert.ToInt32(IDC_EDIT_STOP_INCA_AREA.Text));
+            m_cotsimgscanprm.SetStopParamArea(StopModeDialog.AreaMode);
 
             //取图方式
             ComboBoxItem enum_fetchimgmode = (ComboBoxItem)IDC_COMBO_FETCHIMGMODE.SelectedItem;