From c4a3f8db90530a727ffab77c3bb5bb7d782792bf Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 25 八月 2025 15:50:27 +0800
Subject: [PATCH] 上传代码;

---
 Plugin.TestResult/TestResultView.xaml.cs |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Plugin.TestResult/TestResultView.xaml.cs b/Plugin.TestResult/TestResultView.xaml.cs
index b8bb7d4..f2f148d 100644
--- a/Plugin.TestResult/TestResultView.xaml.cs
+++ b/Plugin.TestResult/TestResultView.xaml.cs
@@ -5,6 +5,7 @@
 using NationalInstruments.TestStand.Utility;
 using Plugin.TestResult_WPF.Constant;
 using Plugin.TestResult_WPF.Model;
+using Plugin.TsSupport;
 using System;
 using System.Collections.Generic;
 using System.Windows;
@@ -46,6 +47,8 @@
 
         }
 
+        public bool IsRunning { get; set; } = false;
+
         public TestResultView(BaseConfig config)
         {
             this.rowCount = config.Row;
@@ -63,10 +66,10 @@
 
 
             InitializeComponent();
-            testApp = new AxApplicationMgr();
-            testApp.ExitApplication += new EventHandler(this.axApplicationMgr_ExitApplication);
-            testApp.UIMessageEvent += new _ApplicationMgrEvents_UIMessageEventEventHandler(this.axApplicationMgr_UIMessageEvent);
-            testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
+            testApp = TestAppManager.GetAxApplicationMgr();
+            testApp.ExitApplication += this.axApplicationMgr_ExitApplication;
+            testApp.UIMessageEvent += this.axApplicationMgr_UIMessageEvent;
+            testApp.ExecutionClosed += this.axApplicationMgr_ExecutionClosed;
 
 
             ((System.ComponentModel.ISupportInitialize)(this.testApp)).BeginInit();//myClient涓虹涓夋柟鎺т欢鍚�
@@ -172,7 +175,6 @@
                 this.testApp.LoginOnStart = false;
                 this.testApp.Start();
                 this.modeSeq = this.engine.GetSequenceFileEx(@"C:\Program Files\National Instruments\TestStand 2020\Components\Models\TestStandModels\ParallelModel.seq");
-
             }
             catch (Exception ex)
             {
@@ -386,7 +388,6 @@
                 if (MethodCode == 12)
                 {
                     /// 淇濆瓨娓╁害鏂囦欢
-                    /// 
                     strData = e.uiMsg.StringData;
                     string[] datas = strData.Split(';');
                     int ovenIndex = int.Parse(datas[0]);
@@ -434,16 +435,19 @@
         public void SetStartFlag(int index, bool data)
         {
             if (this.SequenceContext == null) return;
-            char name = (char)(index + 65);
+            string name = tables[index].title;
             string key = $"StationState.Start_{name}";
-            this.engine.Globals.SetValBoolean(key, 0, data);
-            bool val = this.engine.Globals.GetValBoolean(key, 0);
+            this.engine.Globals.SetValBoolean(key, 1, data);
+            //bool val = this.engine.Globals.GetValBoolean(key, 0);
             //this.SequenceContext.StationGlobals.SetValBoolean(key, 0, data);
             //bool val = this.SequenceContext.StationGlobals.GetValBoolean(key, 0);
         }
 
         public void ReleaseResource()
         {
+            testApp.ExitApplication -= this.axApplicationMgr_ExitApplication;
+            testApp.UIMessageEvent -= this.axApplicationMgr_UIMessageEvent;
+            testApp.ExecutionClosed -= this.axApplicationMgr_ExecutionClosed;
             foreach (var table in tables)
             {
                 table.RelaseResource();
@@ -479,7 +483,8 @@
 
         public void SetOvenProduct(int index, string product)
         {
-
+            string LookupStr = $"StationState.ProductModel_{tables[index].title}";
+            engine?.Globals?.SetValString(LookupStr, 1, product);
         }
     }
 }

--
Gitblit v1.9.1