|
|
@@ -870,7 +870,7 @@ namespace OTSMeasureApp
|
|
|
cmStrip.Items[(int)MenuIndex.DriveSEMToCenterLocation].Enabled = IsTrue;
|
|
|
cmStrip.Items[(int)MenuIndex.DriveSEMToCurrentLocation].Enabled = true;
|
|
|
cmStrip.Items[(int)MenuIndex.ShootBSEPicture].Enabled = true;
|
|
|
- cmStrip.Items[(int)MenuIndex.DeleteBSEPicture].Enabled = IsTrue;
|
|
|
+ cmStrip.Items[(int)MenuIndex.DeleteBSEPicture].Enabled = true;
|
|
|
cmStrip.Items[(int)MenuIndex.SlopFocus].Enabled = true;
|
|
|
|
|
|
|
|
|
@@ -884,7 +884,7 @@ namespace OTSMeasureApp
|
|
|
cmStrip.Items[(int)MenuIndex.DriveSEMToCenterLocation].Enabled = true;
|
|
|
cmStrip.Items[(int)MenuIndex.DriveSEMToCurrentLocation].Enabled = true;
|
|
|
cmStrip.Items[(int)MenuIndex.ShootBSEPicture].Enabled = true;
|
|
|
- cmStrip.Items[(int)MenuIndex.DeleteBSEPicture].Enabled = false;
|
|
|
+ cmStrip.Items[(int)MenuIndex.DeleteBSEPicture].Enabled = true;
|
|
|
cmStrip.Items[(int)MenuIndex.SlopFocus].Enabled = true;
|
|
|
|
|
|
|
|
|
@@ -1088,8 +1088,7 @@ namespace OTSMeasureApp
|
|
|
m_MeasureAppForm.SwitchWSample(m_SampleSelectName);
|
|
|
|
|
|
//-------------------- draw measrue field and save these data to sample
|
|
|
- //m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNMEASURE);
|
|
|
-
|
|
|
+
|
|
|
PrepareMeasureField(sam, MSR_RUN_TYPE.RUNMEASURE);
|
|
|
//--------------------
|
|
|
|
|
|
@@ -1166,13 +1165,9 @@ namespace OTSMeasureApp
|
|
|
m_MeasureAppForm.m_ProjParam.SetWorkSampleHoleAndMeasureArea(para);
|
|
|
|
|
|
m_MeasureAppForm.SetRunType(MSR_RUN_TYPE.RUNMEASURE);
|
|
|
- //CMeasureThreadWrapper.SetDoRunType(MSR_THREAD_RunSTATUS.RUNMEASURE);
|
|
|
|
|
|
m_MeasureAppForm.SwitchWSample(m_SampleSelectName);
|
|
|
Invalidate();
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
//设置手绘标识
|
|
|
m_IsDrawMeasure = false;
|
|
|
this.Cursor = Cursors.Default;
|
|
|
@@ -1552,9 +1547,6 @@ namespace OTSMeasureApp
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
}
|
|
|
}
|
|
|
@@ -1738,7 +1730,7 @@ namespace OTSMeasureApp
|
|
|
var sam = GetWorkingVisualSample();
|
|
|
if (sam == null) return;
|
|
|
var curMeasureGdi = sam.GetMeasureGDIObject();
|
|
|
- if (curMeasureGdi.IsAltering)//click on the edge or on the polygon point( vertex point of rectangle).
|
|
|
+ if (curMeasureGdi.IsAltering)//click on the edge or on the polygon point(or vertex point of rectangle).
|
|
|
{
|
|
|
|
|
|
if (curMeasureGdi.CreateType == CreateRectangleType.Polygon)
|
