|
@@ -622,17 +622,19 @@ namespace MeasureThread
|
|
|
SendCutHoleMsg(((int)currHole.STATE).ToString(), currHole.HoleName);
|
|
|
//开始测量
|
|
|
if (!HoleMeasure(currHole))
|
|
|
- {
|
|
|
- currHole.STATE = State.Failed;
|
|
|
- currHole.END = DateTime.Now;
|
|
|
- //m_measureFile.Save();
|
|
|
- SendCutHoleMsg(((int)currHole.STATE).ToString(), currHole.HoleName);
|
|
|
- }
|
|
|
+ {
|
|
|
+ currHole.STATE = State.Failed;
|
|
|
+ currHole.END = DateTime.Now;
|
|
|
+
|
|
|
+ SendCutHoleMsg(((int)currHole.STATE).ToString(), currHole.HoleName);
|
|
|
+ Thread.Sleep(3000);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
//保存文件,将测量状态更改
|
|
|
currHole.STATE = State.Success;
|
|
|
currHole.END = DateTime.Now;
|
|
|
- //m_measureFile.Save();
|
|
|
+
|
|
|
SendCutHoleMsg(((int)currHole.STATE).ToString(), currHole.HoleName);
|
|
|
|
|
|
if (key_stop)
|
|
@@ -645,7 +647,7 @@ namespace MeasureThread
|
|
|
Thread.Sleep(3000);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ m_measureFile.Save(); //save all the measure info into Xml file.
|
|
|
|
|
|
}
|
|
|
|
|
@@ -1244,6 +1246,7 @@ namespace MeasureThread
|
|
|
+ currHole.Position.Z.ToString() + ")", true);
|
|
|
Locate lo = new Locate(iSEM);
|
|
|
lo.LocateCutHolePosition(currHole, MParam.Tilt);
|
|
|
+
|
|
|
if (!m_focuse.SetMagnification(MParam.Location_Magnification))
|
|
|
{
|
|
|
|