|
@@ -47,7 +47,7 @@ namespace HOZProject
|
|
|
m_Ms = new Measure();
|
|
|
m_Ms.InitMeas(m_MeasureFile);
|
|
|
m_Ms.SendThreadStatus += new ThreadStatusHandler(displayMessage); //注册事件
|
|
|
-
|
|
|
+ m_Ms.SendCutHolesStatus += new CutHolesStatusHandler(displayCutHoleMessage); //注册事件
|
|
|
//自动测量的全过程
|
|
|
m_Ms.DoMeasure();
|
|
|
//定位
|
|
@@ -64,6 +64,14 @@ namespace HOZProject
|
|
|
this.listmsg.Items.Add(e.Time.ToString() + e.State);
|
|
|
});
|
|
|
}
|
|
|
+ public void displayCutHoleMessage(object sender, CutHolesStatusEventArgs e)
|
|
|
+ {
|
|
|
+ //主界面显示内容
|
|
|
+ this.BeginInvoke((Action)delegate
|
|
|
+ {
|
|
|
+ this.listmsg.Items.Add(e.HoleName.ToString() + e.State);
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
void UpdateProgress(object sender, ProgressChangedEventArgs e)
|
|
|
{
|
|
@@ -75,24 +83,25 @@ namespace HOZProject
|
|
|
|
|
|
private void FormHOZMain_Load(object sender, EventArgs e)
|
|
|
{
|
|
|
- //CreateCutHoleList(5);
|
|
|
//加载控件的点击事件
|
|
|
this.Click += new EventHandler(FormHOZMain_Click);
|
|
|
plFill.Click += new EventHandler(FormHOZMain_Click);
|
|
|
plTop.Click += new EventHandler(FormHOZMain_Click);
|
|
|
plLeft.Click += new EventHandler(FormHOZMain_Click);
|
|
|
plLeftContent.Click += new EventHandler(FormHOZMain_Click);
|
|
|
+ //新建
|
|
|
+ NewCreate();
|
|
|
}
|
|
|
|
|
|
- public void CreateCutHoleList(int cutHoleCount)
|
|
|
+ public void CreateCutHoleList(List<CutHole> ListCutHole)
|
|
|
{
|
|
|
//清空左侧Panel中的切孔控件
|
|
|
plLeftContent.Controls.Clear();
|
|
|
- for (int i = 0; i < cutHoleCount; i++)
|
|
|
+ for (int i = ListCutHole.Count-1;i>=0; i--)
|
|
|
{
|
|
|
UControl_CutHole ucCutHole = new UControl_CutHole(this);
|
|
|
ucCutHole.Dock = DockStyle.Top;
|
|
|
- ucCutHole.CutHoleName = "切孔" + (i + 1);
|
|
|
+ ucCutHole.CutHoleName = ListCutHole[i].HoleName;
|
|
|
plLeftContent.Controls.Add(ucCutHole);
|
|
|
}
|
|
|
}
|
|
@@ -104,6 +113,39 @@ namespace HOZProject
|
|
|
plProcess.Visible = false;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 修改切孔状态
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="cutHoleCode"></param>
|
|
|
+ /// <param name="State"></param>
|
|
|
+ private void ChangeCutHoleState(string CutHoleName, int State)
|
|
|
+ {
|
|
|
+ foreach (Control item in plLeftContent.Controls)
|
|
|
+ {
|
|
|
+ if (item is UserControl)
|
|
|
+ {
|
|
|
+ UControl_CutHole cutHole = (UControl_CutHole)item;
|
|
|
+ if (cutHole.CutHoleName == CutHoleName)
|
|
|
+ {
|
|
|
+ Button btnCutHole = (Button)cutHole.Controls.Find("btnCutHole", false)[0];
|
|
|
+ switch (State)
|
|
|
+ {
|
|
|
+ case 1:
|
|
|
+ btnCutHole.BackColor = Color.Red;
|
|
|
+ break;
|
|
|
+ case 2:
|
|
|
+ btnCutHole.BackColor = Color.Green;
|
|
|
+ break;
|
|
|
+ case 3:
|
|
|
+ btnCutHole.BackColor = Color.Yellow;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
#region 窗体 最大化 最小化 关闭 按钮事件
|
|
|
private void pbMin_MouseEnter(object sender, EventArgs e)
|
|
@@ -153,6 +195,11 @@ namespace HOZProject
|
|
|
|
|
|
#region 新建、保存、打开、初始化、查看日志
|
|
|
private void pbNew_Click(object sender, EventArgs e)
|
|
|
+ {
|
|
|
+ NewCreate();
|
|
|
+ }
|
|
|
+
|
|
|
+ private void NewCreate()
|
|
|
{
|
|
|
m_MeasureFile = new MeasureFile();
|
|
|
if (!m_MeasureFile.New())
|
|
@@ -161,7 +208,7 @@ namespace HOZProject
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MessageBox.Show("新建测量文件成功。");
|
|
|
+ //MessageBox.Show("新建测量文件成功。");
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -232,7 +279,8 @@ namespace HOZProject
|
|
|
{
|
|
|
m_BackgroundWorker.CancelAsync();
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
#endregion
|
|
|
+
|
|
|
}
|
|
|
}
|