Browse Source

初始化失败,修改切换状态

wb_han 4 years ago
parent
commit
81e1fdcb88

+ 2 - 2
HOZProject/FormHOZMain.cs

@@ -138,7 +138,7 @@ namespace HOZProject
             //主界面显示内容
             //主界面显示内容
             this.BeginInvoke((Action)delegate
             this.BeginInvoke((Action)delegate
             {
             {
-                //this.listmsg.Items.Add(e.HoleName.ToString() + e.State);
+                //修改切孔状态
                 ChangeCutHoleState(e.HoleName.ToString(), Convert.ToInt32(e.State));
                 ChangeCutHoleState(e.HoleName.ToString(), Convert.ToInt32(e.State));
             });
             });
         }
         }
@@ -554,7 +554,7 @@ namespace HOZProject
         /// </summary>
         /// </summary>
         /// <param name="cutHoleCode"></param>
         /// <param name="cutHoleCode"></param>
         /// <param name="States"></param>
         /// <param name="States"></param>
-        private void ChangeCutHoleState(string CutHoleName, int States)
+        public void ChangeCutHoleState(string CutHoleName, int States)
         {
         {
             foreach (Control item in plLeftContent.Controls)
             foreach (Control item in plLeftContent.Controls)
             {
             {

+ 8 - 0
HOZProject/MeasureMsgDispose/MeasureMsgManage.cs

@@ -42,6 +42,14 @@ namespace HOZProject
                         }
                         }
                     }
                     }
                     break;
                     break;
+                case "0-1":
+                    //初始化失败
+                    if (formHOZ.m_BackgroundWorker.IsBusy)
+                    {
+                        //修改切孔状态
+                        formHOZ.ChangeCutHoleState(args.HoleName, (int)ThreadState.Failed);
+                    }
+                    break;
             }
             }
             #endregion
             #endregion
             //是否当前编号是流程中有数据的节点
             //是否当前编号是流程中有数据的节点

+ 6 - 6
HOZProject/UserControls/UControl_Init.cs

@@ -64,13 +64,13 @@ namespace HOZProject
             {
             {
                 if (FormHOZMainObject.m_MeasureFile == null)
                 if (FormHOZMainObject.m_MeasureFile == null)
                 {
                 {
-                    MessageBox.Show("请新建一个测量文件!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("请新建一个测量文件", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 }
                 else
                 else
                 {
                 {
                     if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromFile(""))
                     if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromFile(""))
                     {
                     {
-                        MessageBox.Show("导入切孔失败!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        MessageBox.Show("导入切孔失败", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     }
                     }
                     else
                     else
                     {
                     {
@@ -108,13 +108,13 @@ namespace HOZProject
             {
             {
                 if (FormHOZMainObject.m_MeasureFile == null)
                 if (FormHOZMainObject.m_MeasureFile == null)
                 {
                 {
-                    MessageBox.Show("请新建一个测量文件!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("请新建一个测量文件", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 }
                 else
                 else
                 {
                 {
                     if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromFile(""))
                     if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromFile(""))
                     {
                     {
-                        MessageBox.Show("导入切孔失败!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        MessageBox.Show("导入切孔失败", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     }
                     }
                     else
                     else
                     {
                     {
@@ -137,7 +137,7 @@ namespace HOZProject
                                 cutHolePoint = AnalysisPosition(centerX, centerY, firstX, firstY, distance, rag);
                                 cutHolePoint = AnalysisPosition(centerX, centerY, firstX, firstY, distance, rag);
                                 if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromAnalysisPosition(cutHolePoint))
                                 if (!FormHOZMainObject.m_MeasureFile.GetCutHolesFromAnalysisPosition(cutHolePoint))
                                 {
                                 {
-                                    MessageBox.Show("生成切孔失败!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                    MessageBox.Show("生成切孔失败", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                                 }
                                 }
                                 else
                                 else
                                 {
                                 {
@@ -675,7 +675,7 @@ namespace HOZProject
         {
         {
             if (EditConfig())
             if (EditConfig())
             {
             {
-                MessageBox.Show("保存成功!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("保存成功", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
             }
         }
         }
         #endregion
         #endregion