From 7b903bb86375e9df24a725288d1c876b8d2b0e61 Mon Sep 17 00:00:00 2001
From: chr <chr@mailcom>
Date: 星期一, 03 三月 2025 19:47:49 +0800
Subject: [PATCH] 整合TestResult;

---
 Plugin.TestResult/ViewControl.xaml.cs |   55 ++++++++++++++-----------------------------------------
 1 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index fc91920..7f06b2a 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,7 +1,8 @@
-锘縰sing NationalInstruments.TestStand.Interop.API;
+锘縰sing HMI.Base;
+using HMI.ParameterManage.Entity;
+using HMI.ParameterManage.Util;
+using NationalInstruments.TestStand.Interop.API;
 using NationalInstruments.TestStand.Interop.UI.Ax;
-using NationalInstruments.TestStand.Utility;
-using ParameterHelper;
 using Plugin.TestResult_WPF.Model;
 using Plugin.TestResult_WPF.Util;
 using System;
@@ -9,41 +10,17 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Plugin.TestResult_WPF
 {
     /// <summary>
     /// ViewControl.xaml 鐨勪氦浜掗�昏緫
     /// </summary>
-    public partial class ViewControl : UserControl, INotifyPropertyChanged
+    public partial class ViewControl : PluginControl
     {
-        public event PropertyChangedEventHandler PropertyChanged;
-        public void RaisePropertyChanged(string name)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-        }
-        public void RaiseAndSetIfChanged<T>(ref T old, T @new, [CallerMemberName] string propertyName = null)
-        {
-            old = @new;
-            if (propertyName != null)
-            {
-                RaisePropertyChanged(propertyName);
-            }
-        }
 
-        private ParameterManager parameterManager;
         private CommonCodeParser codeParser = new CommonCodeParser();
         private double TestTemperature = 60;
         private int TestTime = 3600;
@@ -65,7 +42,7 @@
         public bool mesStatus
         {
             get => _mesStatus;
-            set => RaiseAndSetIfChanged(ref _mesStatus, value);
+            set => Set(ref _mesStatus, value);
         }
 
         private string _produceStatus = "INIT";
@@ -73,7 +50,7 @@
         public string produceStatus
         {
             get => _produceStatus;
-            set => RaiseAndSetIfChanged(ref _produceStatus, value);
+            set => Set(ref _produceStatus, value);
         }
 
 
@@ -93,7 +70,7 @@
 
         private void axApplicationMgr_ExecutionClosed(object sender, _ApplicationMgrEvents_ExecutionClosedEvent e)
         {
-           
+
         }
 
         private void axApplicationMgr_UIMessageEvent(object sender, _ApplicationMgrEvents_UIMessageEventEvent e)
@@ -143,14 +120,13 @@
 
         public void LoadProduct()
         {
-            ProductManager prdManager = new ProductManager();
-            prdManager.LoadProducts();
+            List<ProductData> products = ParameterManager.GetProducts();
             this.modelSelect.Items.Clear();
-            foreach (Product prd in prdManager.Products)
+            foreach (var prd in products)
             {
                 this.modelSelect.Items.Add(prd.Name);
             }
-            if (prdManager.Products.Count > 0)
+            if (products.Count > 0)
             {
                 this.modelSelect.SelectedIndex = 0;
             }
@@ -160,10 +136,7 @@
         {
             try
             {
-                string ParaFile = @".\Config\ProductionSetting\Parameter\Parameter_" + this.modelSelect.SelectedItem + ".setting";
-
-                this.parameterManager = new ParameterManager(ParaFile);
-                this.parameterManager.LoadParameters();
+                List<ParameterData> parameters = ParameterManager.GetParametersByProductName(this.modelSelect.SelectedItem.ToString());
                 //MessageBox.Show("ParaFile:" + ParaFile + "ParaCount:" + this.parameterManager.Parameters.Count.ToString());
                 //this.TestTemperature = Convert.ToDouble(this.parameterManager.Find("TestTemperature").ParmValue);
                 //this.TestTime = Convert.ToInt32(this.parameterManager.Find("TestTime").ParmValue);
@@ -171,7 +144,7 @@
                 //this.SaftyTemperature = Convert.ToDouble(this.parameterManager.Find("SaftyTemperature").ParmValue);
                 //this.Time_Heating_Low = Convert.ToDouble(this.parameterManager.Find("Time_Heat_Low").ParmValue);
                 //this.Time_Heating_High = Convert.ToDouble(this.parameterManager.Find("Time_Heat_High").ParmValue);
-                testResultView.testSeqFile = this.parameterManager.Find("TestSequence").ParmValue.ToString(); // @"D:\BurnIn\TestDemo.seq"
+                testResultView.testSeqFile = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value;
 
 
             }
@@ -186,7 +159,7 @@
             try
             {
                 testResultView.StartTestSequence();
-                
+
                 this.modelSelect.IsEnabled = false;
                 this.btnStart.IsEnabled = false;
                 this.btnStop.IsEnabled = true;

--
Gitblit v1.9.1