1.工作界面卡死问题修改。2.选程序后自动调宽修改。

DeviceLibrary/manager/TSAVBean.cs

@@ -575,8 +575,8 @@ namespace TSA_V.DeviceLibrary
             LineStep.EndMove();
 
             IOManager.IOMove(IOManager.Line_FStart, IO_VALUE.LOW);
+            LogUtil.info("StopMove，开始停止所有旋转轴");
 
-            Thread.Sleep(PUSICANControl.SleepMS);
             foreach (Dictionary<int, NodeInfo> map in RotateMap.Values)
             {
                 foreach (NodeInfo nodeid in map.Values)
@@ -584,6 +584,7 @@ namespace TSA_V.DeviceLibrary
                     if (PUSICANControl.IsBusy(nodeid.NodeId))
                     {
                         PUSICANControl.StopMove(nodeid.NodeId);
+                        Thread.Sleep(PUSICANControl.SleepMS);
                     }
                 }
             }

TSA-V/workForm/FrmBoardSelect.cs

@@ -52,13 +52,13 @@ namespace TSA_V
         int preIndex = -1;
         private void cmbBoardList_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (cmbBoardList.Text != "" && cmbBoardList.SelectedIndex >= 0&&(!cmbBoardList.SelectedIndex.Equals(preIndex)))
+            if (cmbBoardList.Text != "" && cmbBoardList.SelectedIndex >= 0 && (!cmbBoardList.SelectedIndex.Equals(preIndex)))
             {
                 preIndex = cmbBoardList.SelectedIndex;
                 BoardInfo board = (BoardInfo)cmbBoardList.SelectedItem;
                 if (board.boardId.Equals(-1))
                 {
-                    lblBoardMsg.Text = ResourceCulture.GetString(ResourceCulture.SelectP,"请选择程序");
+                    lblBoardMsg.Text = ResourceCulture.GetString(ResourceCulture.SelectP, "请选择程序");
                     lblBoardMsg.ForeColor = Color.Red;
                     return;
                 }
@@ -68,14 +68,14 @@ namespace TSA_V
                     this.lblBoardMsg.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
                     BoardManager.CurrBoard = board;
                     LogUtil.info("切换到新板子：" + board.boardName);
-                    FrmProjectorScreen.instance.ShowPoint(false,board.smtList.ToArray());
+                    FrmProjectorScreen.instance.ShowPoint(false, board.smtList.ToArray());
                 }
             }
         }
 
         private void btnBack_Click(object sender, EventArgs e)
         {
-            if (ChangeWidthTask != null&&ChangeWidthTask.IsCompleted.Equals(false))
+            if (ChangeWidthTask != null && ChangeWidthTask.IsCompleted.Equals(false))
             {
                 LWidthManager.StopChangeWidth();
                 LogUtil.info(Name + "返回之前，停止调宽");
@@ -199,7 +199,7 @@ namespace TSA_V
                 LogUtil.info(" 选择程序[" + BoardManager.CurrBoard.boardName + "]后，开始轨道调宽：【" + w + "】【" + p + "】");
 
 
-                 DialogResult result=  MessageBox.Show("当前宽度[],目标宽度[]，是否开始调宽","提示",MessageBoxButtons.OKCancel,MessageBoxIcon.Question);
+                DialogResult result = MessageBox.Show("当前宽度["+LWidthManager.Line_LastWidth+"],目标宽度["+ w + "]，是否开始调宽", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
                 if (!result.Equals(DialogResult.OK))
                 {
                     return;
@@ -211,22 +211,23 @@ namespace TSA_V
                     return;
                 }
 
-                FormEn(false); Task.Factory.StartNew(delegate
+                FormEn(false);
+                Task.Factory.StartNew(delegate
                 {
                     ChangeWidthTask = Task.Factory.StartNew(delegate
                    {
-                   //string result = LWidthManager.StartChangeWidth(w, p);
-                   //LogUtil.info("调宽" + w + "=" + p + "结束：" + result);
-                   //if (String.IsNullOrEmpty(result))
-                   //{
-                   //    MessageBox.Show("调宽" + w + "=" + p + "完成");
-                   //}
-                   //else
-                   //{
-                   //    MessageBox.Show("调宽" + w + "=" + p + "结束：" + result);
-                   //}
+                       string ok = LWidthManager.StartChangeWidth(w, p);
+                       LogUtil.info("调宽" + w + "=" + p + "结束：" + ok);
+                       if (String.IsNullOrEmpty(ok))
+                       {
+                           MessageBox.Show("调宽" + w + "=" + p + "完成");
+                       }
+                       else
+                       {
+                           MessageBox.Show("调宽" + w + "=" + p + "结束：" + ok);
+                       }
 
-                   Thread.Sleep(5000);
+                       //Thread.Sleep(5000);
                    });
                     ChangeWidthTask.Wait();
                     FormEn(true);

TSA-V/workForm/FrmTSAV.Designer.cs

@@ -106,7 +106,7 @@
             // 
             // timer
             // 
-            this.timer.Interval = 250;
+            this.timer.Interval = 1000;
             this.timer.Tick += new System.EventHandler(this.timer_Tick);
             // 
             // timerShowForm

TSA-V/workForm/FrmTSAV.cs

@@ -240,10 +240,10 @@ namespace TSA_V
                 if (TSAVBean.Status.Equals(TSAVStatus.Runing))
                 {
                     //如果没有开始工作，自动开始工作
-                    if (!TSAVBean.Work.IsWorking && btnStart.Enabled)
-                    {
-                        btnStart_Click(null, null);
-                    }
+                    //if (!TSAVBean.Work.IsWorking && btnStartWorking.Enabled)
+                    //{
+                    //    btnStartWorking_Click(null, null);
+                    //}
                     if (!preIndex.Equals(TSAVBean.Work.currIndex) && (TSAVBean.Work.currPoint != null))
                     {
                         ShowTSAVPoint();
@@ -336,13 +336,8 @@ namespace TSA_V
 
             if (TSAVBean.Status.Equals(TSAVStatus.Runing)&&(!TSAVBean.IsInSuddenDown))
             {
-                //如果没有开始工作，自动开始工作
-                if (!TSAVBean.Work.IsWorking && btnStart.Enabled)
-                {
-                    btnStart_Click(null, null);
-                }
 
-                btnStartWorking.Enabled = true;
+                btnStartWorking.Enabled = !(TSAVBean.Work.IsWorking);
                 btnNextPoint.Enabled = true;
                 btnPrePoint.Enabled = true;
             }
@@ -413,6 +408,8 @@ namespace TSA_V
                     StartRun();
                 }
                 FrmProjectorScreen.instance.ClearPoint();
+                timer.Start();
+                LogUtil.info(Name + "  Shown end ");
             }
             catch (Exception ex)
             {
@@ -479,7 +476,6 @@ namespace TSA_V
 
             try
             { 
-                GC.Collect();
                 //GC.WaitForPendingFinalizers();  
                 this.picPoint.Image = bitmap.Clone(rec, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
                 //bitmap.Dispose();