Kaynağa Gözat

修改一些label名称

CXS 3 yıl önce
ebeveyn
işleme
1c6be9abfd

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -43,7 +43,7 @@
     </Member>
     <Member strName="Axra75">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,75000,0" shape="0" />
-      <Member RegName="std" PolygonPoint="" rectDomian="0,41000,10,0" shape="0" />
+      <Member RegName="std" PolygonPoint="" rectDomian="0,31000,10,0" shape="0" />
       <Collection RegName="Holes">
         <Member HoleName="1" rectDomian="0,0,47000,0" shape="0" />
       </Collection>

+ 15 - 15
OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -156,7 +156,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             label8.Enabled = false;
             tBoundaryHeight.Enabled = false;
             tBoundaryHeight.Text = "0";
-            label7.Text = "径:";
+            label7.Text = "径:";
         }
 
         private void radioButton_BoundarySquare_Click(object sender, EventArgs e)
@@ -171,7 +171,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             label9.Enabled = false;
             tStandardsampleHeight.Enabled = false;
             tStandardsampleHeight.Text = "0";
-            label10.Text = "径:";
+            label10.Text = "径:";
         }
 
         private void radioButton__StandardsampleSqare_Click(object sender, EventArgs e)
@@ -309,19 +309,19 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 // boundary is invalid
                 return ;
             }
-            //if (pSTD != null)
-            //{
-            //    // STD has to be inside of the boundary
-            //    if (!pBoundary.DomainInDomain(pSTD))
-            //    {
-            //        MessageBox.Show("STD is over the boundary!");
-            //        return ;
-            //    }
-            //}
-            //else
-            //{
-            //    return ;
-            //}
+            if (pSTD != null)
+            {
+                // STD has to be inside of the boundary
+                if (!pBoundary.DomainInDomain(pSTD))
+                {
+                    MessageBox.Show("STD is over the boundary!");
+                    return;
+                }
+            }
+            else
+            {
+                return;
+            }
 
             // hole has to be inside of the boundary and can't have common part with STD and each other
             List<CHole> listStageHoles = new List<CHole>();