From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化

---
 Plugin.TsExecution/TsExecution.xaml.cs |  797 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 576 insertions(+), 221 deletions(-)

diff --git a/Plugin.TsExecution/TsExecution.xaml.cs b/Plugin.TsExecution/TsExecution.xaml.cs
index df139b3..fb1f427 100644
--- a/Plugin.TsExecution/TsExecution.xaml.cs
+++ b/Plugin.TsExecution/TsExecution.xaml.cs
@@ -1,26 +1,29 @@
 锘縰sing HMI.Base;
 using HMI.Core;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
 using HMI.Core.Util;
-using HMI.ParameterManage.Entity;
-using HMI.ParameterManage.Util;
 using HMI.UI;
 using HMI.UI.Util;
+using HMI.Util;
+using log4net;
 using NationalInstruments.TestStand.Interop.API;
 using NationalInstruments.TestStand.Interop.UI.Ax;
 using Panuon.WPF.UI;
 using ScottPlot;
-using ScottPlot.AxisLimitManagers;
 using ScottPlot.Plottables;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Drawing;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms.DataVisualization.Charting;
+using System.Xml.Linq;
 
 namespace Plugin.TsExecution
 {
@@ -29,7 +32,6 @@
     /// </summary>
     public partial class TsExecution : PluginControl
     {
-        //private OpcInterface.OpcInterface OpcHandle = new OpcInterface.OpcInterface();
         #region TestStand浜嬩欢
         /// <summary>
         /// TS 寮曟搸
@@ -52,6 +54,7 @@
         private Chart chart;
         #endregion
 
+        public static ILog logger { get; private set; }
         private List<SingleControl> tsSockets = new List<SingleControl>();
         /// <summary>
         /// 鏍蜂欢妯″紡鐘舵��
@@ -66,6 +69,15 @@
                 SampleTest(value);
             }
         }
+
+        private string _currentUserCode;
+
+        public string CurrentUserCode
+        {
+            get { return _currentUserCode; }
+            set { Set(ref _currentUserCode, value); }
+        }
+
 
         private bool isLoadOK = false;
         private Timer GCTimer;
@@ -90,6 +102,12 @@
             }
         }
 
+        public override void SetLogger(ILog logger)
+        {
+            base.SetLogger(logger);
+            TsExecution.logger = logger;
+        }
+
         private ObservableCollection<ProductData> products;
 
         public ObservableCollection<ProductData> Products
@@ -98,6 +116,99 @@
             set
             {
                 Set(ref products, value);
+            }
+        }
+
+        private Pie pie;
+        private string CountIniPath;
+
+        private bool alarmVisiable;
+        public bool AlarmVisiable
+        {
+            get => alarmVisiable;
+            set
+            {
+                Set(ref alarmVisiable, value);
+            }
+        }
+
+        private bool _enableMes;
+        public bool EnableMes
+        {
+            get => _enableMes;
+            set
+            {
+                if (WriteConfig("EnableMes", value))
+                {
+                    Set(ref _enableMes, value);
+                }
+            }
+        }
+
+        private bool _enableCanLog;
+        public bool EnableCanLog
+        {
+            get => _enableCanLog;
+            set
+            {
+                if (WriteConfig("EnableCanLog", value))
+                {
+                    Set(ref _enableCanLog, value);
+                }
+            }
+        }
+
+        private bool _enableDebugMode;
+        public bool EnableDebugMode
+        {
+            get => _enableDebugMode;
+            set
+            {
+                if (WriteConfig("EnableDebugMode", value))
+                {
+                    Set(ref _enableDebugMode, value);
+                }
+            }
+        }
+
+        private bool _enableNGPause;
+        public bool EnableNGPause
+        {
+            get => _enableNGPause;
+            set
+            {
+                if (WriteConfig("EnableNGPause", value))
+                {
+                    Set(ref _enableNGPause, value);
+                }
+            }
+        }
+
+        private bool _enableSimpleMode;
+        public bool EnableSimpleMode
+        {
+            get => _enableSimpleMode;
+            set
+            {
+                if (WriteConfig("EnableSimpleMode", value))
+                {
+                    Set(ref _enableSimpleMode, value);
+                    foreach (var cell in tsSockets) cell.SetSimpleUI(value);
+                }
+            }
+        }
+
+        private bool _ui_showInfoDock;
+        public bool UI_ShowInfoDock
+        {
+            get => _ui_showInfoDock;
+            set
+            {
+                if (WriteConfig("UI_ShowInfoDock", value))
+                {
+                    Set(ref _ui_showInfoDock, value);
+                    detailPanel.Visibility = value ? Visibility.Visible : Visibility.Collapsed;
+                }
             }
         }
 
@@ -111,63 +222,27 @@
             InitTsEngine();
             //鍒濆鍖朤estStand寮曟搸
             this.InitTestStandEngine();
-            this.ReadCount(out int pass, out int fail);
-            this.DisplayCount(pass, fail);
-            UpdateChart(pass, fail);
-            InitProducts();
         }
 
-        private Pie pie;
+        public override void SetBaseFolder(string folder)
+        {
+            CountIniPath = Path.Combine(folder, "Count.ini");
+            base.SetBaseFolder(folder);
+        }
+
+        public override void InitFinish()
+        {
+            this.ReadCount(out int pass, out int fail);
+            this.DisplayCount(pass, fail);
+            InitProducts();
+            base.InitFinish();
+        }
+
         /// <summary>
         /// 鍒濆鍖朩inform鍥捐〃
         /// </summary>
         private void InitChart()
         {
-            //ChartArea chartArea1 = new ChartArea();
-            //Legend legend1 = new Legend();
-            //Series series1 = new Series();
-            //DataPoint dataPoint1 = new DataPoint(0D, 10D);
-            //DataPoint dataPoint2 = new DataPoint(0D, 10D);
-
-            //chart = new Chart();
-            //// 
-            //// chart
-            //// 
-            //this.chart.BackColor = System.Drawing.SystemColors.Control;
-            //chartArea1.BackColor = System.Drawing.SystemColors.Control;
-            //chartArea1.Name = "ChartArea1";
-            //this.chart.ChartAreas.Add(chartArea1);
-            //this.chart.Dock = System.Windows.Forms.DockStyle.Fill;
-            //legend1.BackColor = System.Drawing.SystemColors.Control;
-            //legend1.Name = "Legend1";
-            //this.chart.Legends.Add(legend1);
-            //this.chart.Location = new System.Drawing.Point(0, 0);
-            //this.chart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            //this.chart.Name = "chart";
-            //this.chart.Palette = ChartColorPalette.None;
-            //series1.BorderColor = System.Drawing.SystemColors.Control;
-            //series1.ChartArea = "ChartArea1";
-            //series1.ChartType = SeriesChartType.Pie;
-            //series1.Color = System.Drawing.SystemColors.Control;
-            //series1.LabelBackColor = System.Drawing.Color.White;
-            //series1.Legend = "Legend1";
-            //series1.Name = "Series1";
-            //dataPoint1.AxisLabel = "OK";
-            //dataPoint1.Color = Color.Green;
-            //dataPoint1.IsVisibleInLegend = true;
-            //dataPoint1.Label = "";
-            //dataPoint2.AxisLabel = "NG";
-            //dataPoint2.Color = Color.FromArgb(230, 0, 18);
-            //series1.Points.Add(dataPoint1);
-            //series1.Points.Add(dataPoint2);
-            //this.chart.Series.Add(series1);
-            //this.chart.Size = new System.Drawing.Size(215, 191);
-            //this.chart.TabIndex = 0;
-            //this.chart.Text = "chart1";
-            //((System.ComponentModel.ISupportInitialize)(chart)).BeginInit();
-            //chartHost.Child = chart;
-            //((System.ComponentModel.ISupportInitialize)(chart)).EndInit();
-
             pieChart.Plot.Axes.Frameless();
             pieChart.Plot.HideGrid();
             pieChart.Plot.DataBackground.Color = Colors.Transparent;
@@ -175,16 +250,16 @@
             var legend = pieChart.Plot.ShowLegend(Alignment.UpperRight);
             legend.Alignment = Alignment.UpperRight;
             legend.Padding = new PixelPadding(0);
-            legend.FontSize = (float)CustomFontSizeConverter.CountFontSize(20, 300, 300);
+            legend.FontSize = (float)WidthSizeConverter.CountFontSize(20, 300, 300);
             pieChart.UserInputProcessor.Disable();
             pieChart.Plot.Font.Automatic();
 
             List<PieSlice> slices = new List<PieSlice> {
     new PieSlice() { Value = 5, FillColor = Colors.Green,
-        LabelFontSize = (float)CustomFontSizeConverter.CountFontSize(20,300,300),
+        LabelFontSize = (float)WidthSizeConverter.CountFontSize(20,300,300),
         Label = "Pass",LegendText="Pass" },
     new PieSlice() { Value = 2, FillColor = Colors.Red,
-        LabelFontSize = (float)CustomFontSizeConverter.CountFontSize(20,300,300),
+        LabelFontSize = (float)WidthSizeConverter.CountFontSize(20,300,300),
         Label = "Fail",LegendText="Fail" } };
 
 
@@ -193,7 +268,7 @@
 
         private void InitProducts()
         {
-            Products = ParameterManager.GetProducts<ObservableCollection<ProductData>>();
+            Products = ProductManager.GetProducts<ObservableCollection<ProductData>>();
             if (Products != null && Products.Count > 0)
             {
                 List<ParameterData> parameters =
@@ -203,10 +278,39 @@
                 {
                     this.socketNum = Convert.ToInt32(tmpNum);
                 }
+                string lastModel = engine?.Globals.GetValString("StationState.ProductModel", 1);
+
+                if (!string.IsNullOrEmpty(lastModel))
+                {
+                    var product = Products.FirstOrDefault(p => p.Name == lastModel);
+                    if (product != null) SelectedProduct = product;
+                    goto Write;
+                }
+                goto Write;
+
+            Write:
                 SelectedProduct = Products[0];
+                engine?.Globals.SetValString("StationState.ProductModel", 1, Products[0].Name);
+
                 RefershUI();
             }
             SampleStatus = false;
+        }
+
+        private bool _isTesting = false;
+        public bool IsTesting
+        {
+            get { return _isTesting; }
+            set
+            {
+                Set(ref _isTesting, value);
+                Dispatcher.Invoke(() =>
+                {
+                    BtnStartSeq.IsEnabled = !value;
+                    BtnStopSeq.IsEnabled = value;
+                    CbProduct.IsEnabled = !value;
+                });
+            }
         }
 
         /// <summary>
@@ -230,54 +334,99 @@
             new MaskWindow((WindowX)Window.GetWindow(this),
                 (win) =>
                 {
+                    try
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            try
+                            {
+                                UserInfo user = UserInfo.User;
+                                CurrentUserCode = user?.Code;
+                            }
+                            catch (Exception ex)
+                            {
+                                log.Warn("Get Login User Failed.", ex);
+                            }
+                            ReadConfig();
+                        });
+                        isLoadOK = true;
+                        StartSequence();
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("TsExecution Loaded Failed.", ex);
+                        MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.UserControlLoadFailed")}: {ex.Message}");
+                    }
+
+                    try
+                    {
+                        if (Environment.Version.ToString() != this.AxApplicationMgr.GetEngine().DotNetCLRVersion)
+                            this.GCTimer.Enabled = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error("TsExecution GCTimer Start Failed", ex);
+                        MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.LoadFailed")}: {ex.Message}");
+                    }
+
                     Dispatcher.Invoke(() =>
                     {
-                        try
-                        {
-                            //杩炴帴OPChandle
-                            //this.OpcHandle.Connect2("127.0.0.1", 6543, 18081, out string ErrMsg, null);
-                            //鍚姩娴嬭瘯杩涚▼
-                            StartSequence();
-                            isLoadOK = true;
-                        }
-                        catch (Exception ex)
-                        {
-                            log.Error("TsExecution Loaded Failed.", ex);
-                            MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.UserControlLoadFailed")}: {ex.Message}");
-                        }
-
-                        try
-                        {
-                            if (Environment.Version.ToString() != this.AxApplicationMgr.GetEngine().DotNetCLRVersion)
-                                this.GCTimer.Enabled = true;
-                        }
-                        catch (Exception ex)
-                        {
-                            log.Error("TsExecution GCTimer Start Failed", ex);
-                            MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.LoadFailed")}: {ex.Message}");
-                        }
-                        finally
-                        {
-                            win.Close();
-                        }
                         if (isLoadOK) Loaded -= PluginControl_Loaded;
                     });
+
+                    //Dispatcher.Invoke(() =>
+                    //{
+                    //    try
+                    //    {
+                    //        ReadConfig();
+                    //        //杩炴帴OPChandle
+                    //        //this.OpcHandle.Connect2("127.0.0.1", 6543, 18081, out string ErrMsg, null);
+                    //        isLoadOK = true;
+                    //        //鍚姩娴嬭瘯杩涚▼
+                    //        StartSequence();
+                    //    }
+                    //    catch (Exception ex)
+                    //    {
+                    //        log.Error("TsExecution Loaded Failed.", ex);
+                    //        MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.UserControlLoadFailed")}: {ex.Message}");
+                    //    }
+
+                    //});
                 }
                 ).Info(LangUtil.Get("App.UsercontrolIsLoading"));
         }
 
         private void RefershUI()
         {
-            if (this.tsSockets.Count == 0)
+            ParameterData p = ParameterManager.GetCommonParameterByName("ProbeWarn");
+            int ProbeWarn = 0;
+            if (p != null)
             {
-                panel.Children.Clear();
-                //閲嶆柊鐢熸垚瀛愰潰鏉�
-                for (int i = 0; i < this.socketNum; i++)
+                try
                 {
-                    SingleControl control = new SingleControl(i, 0, 0);
-                    panel.Children.Add(control);
-                    tsSockets.Add(control);
+                    ProbeWarn = Convert.ToInt32(p.Value);
                 }
+                catch
+                {
+                    ProbeWarn = 0;
+                }
+            }
+
+            panel.Children.Clear();
+            //閲嶆柊鐢熸垚瀛愰潰鏉�
+            for (int i = 0; i < this.socketNum; i++)
+            {
+                SingleControl control = new SingleControl(i, CountIniPath, ProbeWarn);
+                panel.Children.Add(control);
+                tsSockets.Add(control);
+            }
+            if (tsSockets.Count == 1)
+            {
+                panel.Columns = 1;
+            }
+            else
+            {
+                panel.Columns = 2;
             }
         }
 
@@ -308,14 +457,131 @@
         /// <param name="fail">涓嶅悎鏍兼暟</param>
         private void ReadCount(out int pass, out int fail)
         {
-            pass = 0; //Convert.ToInt32(OperateIniFile.ReadIniData("Count", "Pass", "", CountiniPath));
-            fail = 0; //Convert.ToInt32(OperateIniFile.ReadIniData("Count", "Fail", "", CountiniPath));
+            pass = Convert.ToInt32(IniFileHelper.ReadIniData("Count", "Pass", "0", CountIniPath));
+            fail = Convert.ToInt32(IniFileHelper.ReadIniData("Count", "Fail", "0", CountIniPath));
         }
 
-        private void WriteCount(int pass, int fail)
+        /// <summary>
+        /// 璇诲彇閰嶇疆鏂囦欢閲岀殑鍑犱釜灞炴��
+        /// </summary>
+        /// <param name="pass"></param>
+        /// <param name="fail"></param>
+        private void ReadConfig()
         {
-            //OperateIniFile.WriteIniData("Count", "Pass", pass.ToString(), CountiniPath);
-            //OperateIniFile.WriteIniData("Count", "Fail", fail.ToString(), CountiniPath);
+            ParameterData value;
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("EnableMes");
+                _enableMes = bool.Parse(value.Value);
+                Set("EnableMes");
+            }
+            catch
+            {
+                _enableMes = false;
+                Set("EnableMes");
+            }
+
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("EnableNGPause");
+                _enableNGPause = bool.Parse(value.Value);
+                Set("EnableNGPause");
+            }
+            catch
+            {
+                _enableNGPause = false;
+                Set("EnableNGPause");
+            }
+
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("EnableCanLog");
+                _enableCanLog = bool.Parse(value.Value);
+                Set("EnableCanLog");
+            }
+            catch
+            {
+                _enableCanLog = false;
+                Set("EnableCanLog");
+            }
+
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("EnableDebugMode");
+                _enableDebugMode = bool.Parse(value.Value);
+                Set("EnableDebugMode");
+            }
+            catch
+            {
+                _enableDebugMode = false;
+                Set("EnableDebugMode");
+            }
+
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("EnableSimpleMode");
+                EnableSimpleMode = bool.Parse(value.Value);
+            }
+            catch
+            {
+                EnableSimpleMode = false;
+            }
+
+            try
+            {
+                value = ParameterManager.GetCommonParameterByName("UI_ShowInfoDock");
+                UI_ShowInfoDock = bool.Parse(value.Value);
+            }
+            catch
+            {
+                UI_ShowInfoDock = false;
+            }
+
+            //Convert.ToBoolean(IniFileHelper.ReadIniData("Config", "EnableMes", "true", CountIniPath));
+            //EnableCanLog = Convert.ToBoolean(IniFileHelper.ReadIniData("Config", "EnableCanLog", "true", CountIniPath));
+            //EnableDebugMode = Convert.ToBoolean(IniFileHelper.ReadIniData("Config", "EnableDebugMode", "true", CountIniPath));
+        }
+
+        //private void WriteToTsWhenInit()
+        //{
+        //    foreach (var ts in tsSockets)
+        //    {
+        //        ts?.SequenceFileContext?.StationGlobals.SetValBoolean($"SystemSetting.EnableMes", 1, EnableMes);
+        //        ts?.SequenceFileContext?.StationGlobals.SetValBoolean($"SystemSetting.EnableNGPause", 1, EnableNGPause);
+        //        ts?.SequenceFileContext?.StationGlobals.SetValBoolean($"SystemSetting.EnableCanLog", 1, EnableCanLog);
+        //        ts?.SequenceFileContext?.StationGlobals.SetValBoolean($"SystemSetting.EnableDebugMode", 1, EnableDebugMode);
+        //    }
+        //}
+
+        private bool WriteConfig(string name, bool value)
+        {
+            //IniFileHelper.WriteIniData("Config", name, value.ToString(), CountIniPath);
+            try
+            {
+                if (ParameterManager.UpdateCommonParameter(name, value, out string errMsg))
+                {
+                    foreach (var ts in tsSockets)
+                    {
+                        ts?.SequenceFileContext?.StationGlobals.SetValBoolean($"SystemSetting.{name}", 1, value);
+                    }
+                    return true;
+                }
+                else
+                {
+                    throw new Exception(errMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgBoxHelper2.Error(ex.Message);
+                return false;
+            }
+        }
+
+        private void WriteCount(double pass, double fail)
+        {
+            IniFileHelper.WriteIniData("Count", "Pass", pass.ToString(), CountIniPath);
+            IniFileHelper.WriteIniData("Count", "Fail", fail.ToString(), CountIniPath);
         }
 
         /// <summary>
@@ -323,9 +589,9 @@
         /// </summary>
         /// <param name="pass">鍚堟牸鏁�</param>
         /// <param name="fail">涓嶅悎鏍兼暟</param>
-        private void DisplayCount(int pass, int fail)
+        private void DisplayCount(double pass, double fail)
         {
-            int total = pass + fail;
+            double total = pass + fail;
             double passRate;
             if (total == 0)
             {
@@ -339,6 +605,11 @@
             this.TbFail.Text = fail.ToString();
             this.TbTotal.Text = total.ToString();
             this.TbPassRate.Text = string.Format("{0:0.00}", passRate) + "%";
+
+            pie.Slices[0].Value = pass;
+            pie.Slices[1].Value = fail;
+            pieChart.Refresh();
+
             WriteCount(pass, fail);
         }
 
@@ -372,19 +643,14 @@
         /// </summary>
         private void StartSequence()
         {
+            if (!isLoadOK) return;
             //MaskWindow mask = new MaskWindow();
             try
             {
                 this.modeSeq = this.engine.GetSequenceFileEx(@"C:\Program Files\National Instruments\TestStand 2020\Components\Models\TestStandModels\ParallelModel.seq");
                 this.testSeq = this.engine.GetSequenceFileEx(this.testSeqFile, 0, TypeConflictHandlerTypes.ConflictHandler_UseGlobalType);
                 this.execution = this.engine.NewExecution(this.testSeq, "Test UUTs", this.modeSeq, false, 0, null, null, null);
-
-                Dispatcher.Invoke(() =>
-                {
-                    this.CbProduct.IsEnabled = false;
-                    this.BtnStartSeq.IsEnabled = false;
-                    this.BtnStopSeq.IsEnabled = true;
-                });
+                IsTesting = true;
             }
             catch (Exception ex)
             {
@@ -400,31 +666,64 @@
             }
         }
 
+        public void StopSequenceClick()
+        {
+            new MaskWindow((WindowX)Window.GetWindow(this),
+                    (win) =>
+                    {
+                        try
+                        {
+                            bool stoped = StopSequence();
+                            if (stoped)
+                            {
+                                IsTesting = false;
+                            }
+                        }
+                        finally
+                        {
+                            Dispatcher.Invoke(() =>
+                            {
+
+                                win.Close();
+                            });
+                        }
+                        //Dispatcher.Invoke(() =>
+                        //{
+
+                        //});
+                    }
+                    ).Info(LangUtil.Get("App.SequenceIsStopping"));
+        }
+
         /// <summary>
         /// 鍋滄娴嬭瘯搴忓垪
         /// </summary>
-        private void StopSequence()
+        private bool StopSequence()
         {
             try
             {
-                if (this.tsSockets.Count == 0)
-                    return;
-                if (this.tsSockets[0].SequenceFileContext == null)
-                    return;
-                bool val = this.tsSockets[0].SequenceFileContext.StationGlobals.Exists("StationState.StopTest", 0);
-                if (val)
+                if (this.tsSockets.Count > 0)
                 {
-                    tsSockets[0].SequenceFileContext.StationGlobals.SetValBoolean("StationState.StopTest", 0, true);
-                    bool isStop = this.execution.WaitForEndEx(2000, true, null, null);
+                    for (int i = 0; i < tsSockets.Count; i++)
+                    {
+                        var context = this.tsSockets[i].SequenceFileContext;
+                        //bool val = context.StationGlobals.Exists("StationState.StopTest", 0);
+                        //if (val)
+                        //{
+                        //    context.StationGlobals.SetValBoolean("StationState.StopTest", 0, true);
+                        //    bool isStop = this.execution.WaitForEndEx(2000, true, null, null);
+                        //}
+                        context?.StationGlobals.SetValBoolean("StationState.StopTest", 1, true);
+                    }
                 }
-                this.CbProduct.IsEnabled = true;
-                this.BtnStartSeq.IsEnabled = true;
-                this.BtnStopSeq.IsEnabled = false;
+                if (this.execution == null) return true;
+                return this.execution.WaitForEndEx(2000, true, null, null);
             }
             catch (Exception ex)
             {
                 log.Error("Stop Sequence Failed.", ex);
                 MsgBoxHelper.Error(this, $"{LangUtil.Get("Ts.StopSequenceFail")}: {ex.Message}");
+                return false;
             }
         }
 
@@ -435,10 +734,9 @@
             {
                 case "BtnStartSeq":
                     StartClick();
-
                     break;
                 case "BtnStopSeq":
-                    StopSequence();
+                    StopSequenceClick();
                     break;
                 case "BtnClearNum":
                     ClearNum();
@@ -456,17 +754,17 @@
             new MaskWindow(Window.GetWindow(this),
                 (win) =>
                 {
-                    Dispatcher.Invoke(() =>
+                    try
                     {
-                        try
-                        {
-                            StartSequence();
-                        }
-                        finally
+                        StartSequence();
+                    }
+                    finally
+                    {
+                        win.Dispatcher.Invoke(() =>
                         {
                             win.Close();
-                        }
-                    });
+                        });
+                    }
                 }).Info(LangUtil.Get("Ts.SequenceIsStarting"));
         }
 
@@ -486,7 +784,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void AxApplicationMgr_ExecutionClosed(object sender, NationalInstruments.TestStand.Interop.UI.Ax._ApplicationMgrEvents_ExecutionClosedEvent e)
+        private void AxApplicationMgr_ExecutionClosed(object sender, _ApplicationMgrEvents_ExecutionClosedEvent e)
         {
             try
             {
@@ -505,6 +803,34 @@
             }
         }
 
+        public void UpdatePositionStatus(int index, string status)
+        {
+            this.tsSockets[index].UpdateStatus(status);
+            this.UpdateTestCounter();
+        }
+
+        public void UpdatePositionProcessValue(int index, int value)
+        {
+            this.tsSockets[index].SetTestProcess(value);
+        }
+
+        public void PausePosition(int index)
+        {
+            this.tsSockets[index].ShowPausePanel();
+        }
+
+        public void AddTestData(int index, string data)
+        {
+            string[] TestItems = data.Split(',');
+            tsSockets[index].AddTestData(TestItems[0], TestItems[1], TestItems[2], TestItems[3],
+                TestItems[4], TestItems[5], TestItems[6]);
+        }
+
+        public void SetPositionBarcode(int index, string barcode)
+        {
+            this.tsSockets[index].Barcode = barcode;
+        }
+
         /// <summary>
         /// TestStand鐢ㄦ埛浜や簰浜嬩欢
         /// </summary>
@@ -512,135 +838,145 @@
         /// <param name="e"></param>
         private void AxApplicationMgr_UIMessageEvent(object sender, _ApplicationMgrEvents_UIMessageEventEvent e)
         {
-            int EventCase = Convert.ToInt32(e.uiMsg.Event);
-            int Index = Convert.ToInt16(e.uiMsg.NumericData);//SocketIndex
-
-            switch (EventCase)
+            try
             {
-                case 10001://浼犻�扴ocketContext
-                    tsSockets[Index].SequenceFileContext = (SequenceContext)e.uiMsg.ActiveXData;
-                    break;
+                int EventCase = Convert.ToInt32(e.uiMsg.Event);
+                int Index = Convert.ToInt16(e.uiMsg.NumericData);//SocketIndex
+                string strData = e.uiMsg.StringData;
 
-                case 10002://鏇存柊娴嬭瘯鐘舵��
-                    string status = e.uiMsg.StringData;
-                    this.tsSockets[Index].UpdateStatus(status);
-                    this.UpdateTestCounter();
-                    break;
+                try
+                {
+                    log.Info($"Event: {EventCase}, NumericData: {Index}, StringData: {strData}");
+                }
+                catch
+                {
 
-                case 10003://鍙戦�佹祴璇曟暟鎹�
-                    string[] TestItems = e.uiMsg.StringData.Split('\t');
-                    tsSockets[Index].AddTestData(TestItems[0], TestItems[4], TestItems[1], TestItems[2], TestItems[3], TestItems[5]);
+                }
 
-                    break;
+                switch (EventCase)
+                {
+                    case 10001://浼犻�扴ocketContext
+                        tsSockets[Index].SequenceFileContext = (SequenceContext)e.uiMsg.ActiveXData;
+                        break;
 
-                case 10004://鍙戦�佹祴璇曡繃绋嬩俊鎭�
-                    this.tsSockets[Index].CurrentStep = e.uiMsg.StringData;
-                    break;
+                    case 10002://鏇存柊娴嬭瘯鐘舵��
+                        string status = e.uiMsg.StringData;
+                        UpdatePositionStatus(Index, status);
+                        break;
 
-                case 10005://鍒濆鍖栨祴璇曟暟鎹紝娓呯┖娴嬭瘯鏁版嵁
-                    this.tsSockets[Index].IniTestData();
-                    break;
+                    case 10003://鍙戦�佹祴璇曟暟鎹�
+                        AddTestData(Index, e.uiMsg.StringData);
+                        break;
 
-                case 10006://鍙戦�佷骇鍝佹潯鐮�
-                    this.tsSockets[Index].Barcode = e.uiMsg.StringData;
-                    break;
+                    case 10004://鍙戦�佹祴璇曡繃绋嬩俊鎭�
+                        this.tsSockets[Index].CurrentStep = e.uiMsg.StringData;
+                        break;
 
-                case 10007://寮�濮嬫祴璇曡鏃�
-                    tsSockets[Index].ElapseTime = "Start Timing";
-                    BtnStopSeq.IsEnabled = false;
-                    break;
+                    case 10005://鍒濆鍖栨祴璇曟暟鎹紝娓呯┖娴嬭瘯鏁版嵁
+                        this.tsSockets[Index].IniTestData();
+                        break;
 
-                case 10008://鍋滄娴嬭瘯璁℃椂
-                    tsSockets[Index].ElapseTime = "Stop Timing";
-                    BtnStopSeq.IsEnabled = true;
-                    break;
+                    case 10006://鍙戦�佷骇鍝佹潯鐮�
+                        SetPositionBarcode(Index, e.uiMsg.StringData);
+                        break;
 
-                case 10009:
-                    // reset the value of controls units failed/pass rate
-                    break;
+                    case 10007://寮�濮嬫祴璇曡鏃�
+                        tsSockets[Index].ElapseTime = "Start Timing";
+                        BtnStopSeq.IsEnabled = false;
+                        break;
 
-                case 10010:
+                    case 10008://鍋滄娴嬭瘯璁℃椂
+                        tsSockets[Index].ElapseTime = "Stop Timing";
+                        BtnStopSeq.IsEnabled = true;
+                        break;
 
-                    //PropertyObj.SetValBoolean("Locals.MD5_Used", 0, true);
-                    //PropertyObj.SetValVariant("FileGlobals.MD5_Value", 0, MD5_DATA);
-                    //PropertyObj.SetValVariant("StationGlobals.MD5", 0, MD5_DATA);
-                    break;
+                    case 10009:
+                        // 
+                        break;
 
-                case 10011:
-                    // write model
+                    case 10010:
 
-                    break;
+                        //PropertyObj.SetValBoolean("Locals.MD5_Used", 0, true);
+                        //PropertyObj.SetValVariant("FileGlobals.MD5_Value", 0, MD5_DATA);
+                        //PropertyObj.SetValVariant("StationGlobals.MD5", 0, MD5_DATA);
+                        break;
 
-                case 10012:
-                    // read model
+                    case 10011:
+                        // write model
 
-                    break;
+                        break;
 
-                case 10013:
-                    // read continue
+                    case 10012:
+                        // read model
+
+                        break;
+
+                    case 10013:
+                        // read continue
 
 
-                    break;
+                        break;
 
-                case 10014:
+                    case 10014:
 
-                    break;
+                        break;
 
-                case 10015:
+                    case 10015:
 
-                    break;
-                case 10016://鏄剧ず3D鎷兼帴鍥剧墖
+                        break;
+                    case 10016://鏄剧ず3D鎷兼帴鍥剧墖
 
-                    break;
-                case 10017://鏇存柊娴嬭瘯璁℃椂锛岄拡瀵归儴鍒嗚鏃舵湁PLC瀹屾垚鐨勯」鐩�
-                    this.tsSockets[Index].ElapseTime = e.uiMsg.StringData;
-                    break;
-                case (int)UIMessageCodes.UIMsg_EndExecution://鎵ц缁撴潫
-                    this.BtnStartSeq.IsEnabled = true;
-                    this.BtnStopSeq.IsEnabled = true;
-                    // this.ReleaseSequenceFile();
-                    break;
-                case 10030://鏄剧ず娴嬭瘯杩涘害
-                    int ProcessVal = Convert.ToInt32(e.uiMsg.StringData);
-                    this.tsSockets[Index].SetTestProcess(ProcessVal);
-                    break;
-                default:
-                    break;
+                        break;
+                    case 10017://鏇存柊娴嬭瘯璁℃椂锛岄拡瀵归儴鍒嗚鏃舵湁PLC瀹屾垚鐨勯」鐩�
+                        this.tsSockets[Index].ElapseTime = e.uiMsg.StringData;
+                        break;
+                    case (int)UIMessageCodes.UIMsg_EndExecution://鎵ц缁撴潫
+                        IsTesting = false;
+                        // this.ReleaseSequenceFile();
+                        break;
+                    case 10030://鏄剧ず娴嬭瘯杩涘害
+                        int ProcessVal = Convert.ToInt32(e.uiMsg.StringData);
+                        this.tsSockets[Index].SetTestProcess(ProcessVal);
+                        break;
+                    case 10031://瀵煎嚭CSV
+                        this.tsSockets[Index].WriteToCSV(e.uiMsg.StringData);
+                        break;
+                    case 10032://鎸変笅鏍囨殏鍋滄祴璇�
+                        this.tsSockets[Index].ShowPausePanel();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                log.Warn("Ts Event Error.", ex);
             }
         }
 
         private void UpdateTestCounter()
         {
-            int PassNum = 0;
-            int FailNum = 0;
+            double PassNum = 0;
+            double FailNum = 0;
             foreach (SingleControl socket in this.tsSockets)
             {
                 PassNum += socket.PassNum;
                 FailNum += socket.FailNum;
             }
             this.DisplayCount(PassNum, FailNum);
-            UpdateChart(PassNum, FailNum);
-        }
-
-        private void UpdateChart(int pass, int fail)
-        {
-            pie.Slices[0].Value = pass;
-            pie.Slices[1].Value = fail;
-            pieChart.Refresh();
-
-            //Dispatcher.Invoke(() => {
-            //    ((System.ComponentModel.ISupportInitialize)(chart)).BeginInit();
-            //    chart.Series[0].Points[0].YValues[0] = pass;
-            //    chart.Series[0].Points[1].YValues[0] = fail;
-            //    ((System.ComponentModel.ISupportInitialize)(chart)).EndInit();
-            //});
         }
 
         private void SetTestSeqFile(ProductData product)
         {
+            if (product == null)
+            {
+                testSeqFile = null;
+                return;
+            }
             string name = product.Name;
-            List<ParameterData> parameters = ParameterManager.GetParametersByProductName(name);
+            List<ParameterData> parameters = ProductManager.GetParametersByProductName(name);
             testSeqFile = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value?.ToString();
+            StartSequence();
         }
 
         private void ClearNum()
@@ -649,13 +985,32 @@
             {
                 PassAmount = 0;
                 FailAmount = 0;
-                DisplayCount(PassAmount, FailAmount);
-                UpdateChart(PassAmount, FailAmount);
                 //this.OpcHandle.DoFctWriteSingle("Count_Clear", "1", out string ErrMsg);
                 foreach (SingleControl socket in tsSockets)
                 {
                     socket.ResetCounter();
                 }
+                DisplayCount(PassAmount, FailAmount);
+            }
+        }
+
+        public override void OnClose(object sender, CancelEventArgs e)
+        {
+            try
+            {
+                StopSequence();
+                // this.engine?.TerminateAll();
+                // this.engine?.ReleaseSequenceFileEx(this.testSeq, 0);
+                // this.engine?.ReleaseSequenceFileEx(this.modeSeq, 0);
+                // this.engine?.UnloadAllModules();
+                // this.engine?.ShutDown(true);
+                //this.testSeq = null;
+                //this.modeSeq = null;
+                base.OnClose(sender, e);
+            }
+            catch (Exception ex)
+            {
+                log.Error("OnClose Error.", ex);
             }
         }
 

--
Gitblit v1.9.1