Browse Source

去除sysmgr中得一些检测

CXS 3 years ago
parent
commit
a319175068

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1024,7 +1024,7 @@
 	  <Control name="message4" text="X-axis travel cannot be empty" />
 	  <Control name="message5" text="Y-axis travel cannot be empty" />
 	  <Control name="message6" text="Y-Axis Travel Start Can't Be Empty" />
-	  <Control name="message7" text="Termination time cannot be empty" />
+	  <Control name="message7" text="StopMode cannot be empty" />
 	  <Control name="message8" text="The number of terminated frames cannot be null" />
 	  <Control name="message9" text="The number of terminated inclusions should not be empty" />
 	  <Control name="message10" text="Graphics cannot be empty" />

+ 1 - 1
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1023,7 +1023,7 @@
 	  <Control name="message4" text="x轴行程起不能为空" />
 	  <Control name="message5" text="y轴行程不能为空" />
 	  <Control name="message6" text="y轴行程起不能为空" />
-	  <Control name="message7" text="终止时间不能为空" />
+	  <Control name="message7" text="测量终止方式不能为空" />
 	  <Control name="message8" text="终止帧图数不能为空" />
 	  <Control name="message9" text="终止夹杂物数不能为空" />
 	  <Control name="message10" text="取图方式不能为空" />

+ 7 - 0
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -311,6 +311,13 @@ namespace OTSMeasureApp
                         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;
                         PropGrid[m_SampleGrid.m_ClickRow + 4, m_SampleGrid.m_ClickColumn].Value = StopModeDialog.AreaMode;
+                        //if(PropGrid[0, 0].Value=="+")
+                        //{
+
+                        //}
+                        PropGrid[0, 0].Value = "-";
+                        PropGrid.Refresh();
+                        PropGrid.Invalidate();
                     }
                 }
             }

+ 1 - 17
OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -1143,7 +1143,7 @@ namespace OTSMeasureApp
                 IDC_EDIT_YEND.SelectAll();
                 return false;
             }
-            if ("" == IDC_EDIT_STOP_TIME.Text)
+            if ("" == tB_StopMode.Text)
             {
                 string message = table["message7"].ToString();
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -1151,22 +1151,6 @@ namespace OTSMeasureApp
                 IDC_EDIT_STOP_TIME.SelectAll();
                 return false;
             }
-            if ("" == IDC_EDIT_STOP_FIELD_NUM.Text)
-            {
-                string message = table["message8"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_EDIT_STOP_FIELD_NUM.Focus();
-                IDC_EDIT_STOP_FIELD_NUM.SelectAll();
-                return false;
-            }
-            if ("" == IDC_EDIT_STOP_INCA_NUM.Text)
-            {
-                string message = table["message9"].ToString();
-                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                IDC_EDIT_STOP_INCA_NUM.Focus();
-                IDC_EDIT_STOP_INCA_NUM.SelectAll();
-                return false;
-            }
             if ("" == IDC_COMBO_FETCHIMGMODE.Text)
             {
                 string message = table["message10"].ToString();