|
@@ -97,11 +97,6 @@ namespace HOZProject
|
|
|
SetWinControlMeasureState(false);
|
|
|
//自动测量的全过程
|
|
|
m_Ms.DoMeasure();
|
|
|
-
|
|
|
- //定位
|
|
|
- //切割
|
|
|
- //分析位置
|
|
|
- //截面
|
|
|
}
|
|
|
|
|
|
public void displayMessage(object sender, ThreadStatusEventArgs e)
|
|
@@ -543,7 +538,18 @@ namespace HOZProject
|
|
|
if (item.Name == CutHoleName)
|
|
|
{
|
|
|
UControl_ParaInfo uControl_ParaInfo = (UControl_ParaInfo)item;
|
|
|
-
|
|
|
+ //获取切孔列表
|
|
|
+ List<CutHole> aCutHole = m_MeasureFile.ListCutHole;
|
|
|
+ foreach (CutHole cutHoleItem in aCutHole)
|
|
|
+ {
|
|
|
+ if (cutHoleItem.HoleName == CutHoleName)
|
|
|
+ {
|
|
|
+ //设置开始时间与结束时间
|
|
|
+ uControl_ParaInfo.StartTime = cutHoleItem.START.ToString();
|
|
|
+ uControl_ParaInfo.EndTime = cutHoleItem.END.ToString();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
switch (States)
|
|
|
{
|
|
|
//准备
|