|
@@ -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>();
|