From 6bcafc823e836ecd5790f87178a906333699f868 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 10 四月 2025 10:46:47 +0800
Subject: [PATCH] 优化插件结构;

---
 Plugin.TestResult/ViewControl.xaml.cs |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index 3e4794a..548299e 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -72,14 +72,19 @@
             testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
         }
 
+        public TestResultView View
+        {
+            get => testResultView;
+        }
+
         public override void InitFinish()
         {
             base.InitFinish();
             string path = Path.Combine(BaseFolder, "Count.ini");
             testResultView.SetCountIniPath(path);
             testResultView.InitMainGrid();
-            LoadProduct();
             testResultView.InitTestStandEngine();
+            LoadProduct();
         }
 
         public override void DoClose(object sender, EventArgs e)
@@ -167,7 +172,13 @@
             }
             testResultView.SetProductSource(productSource);
 
-            if (products.Count > 0)
+            string model = testResultView.engine.Globals.GetValString("ProductModel", 0);
+            if (!string.IsNullOrEmpty(model))
+            {
+                this.modelSelect.SelectedItem = model;
+                testResultView.SetCurrentProduct(model);
+            }
+            else if (products.Count > 0)
             {
                 this.modelSelect.SelectedIndex = 0;
                 testResultView.SetCurrentProduct(products[0].Name);
@@ -178,7 +189,8 @@
         {
             try
             {
-                List<ParameterData> parameters = ProductManager.GetParametersByProductName(this.modelSelect.SelectedItem.ToString());
+                string currentModel = this.modelSelect.SelectedItem.ToString();
+                List<ParameterData> parameters = ProductManager.GetParametersByProductName(currentModel);
                 //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);
@@ -187,6 +199,9 @@
                 //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 = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value;
+
+                testResultView.engine.Globals.SetValString("ProductModel", 0, currentModel);
+                testResultView.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.1