From 7bf89fd93bc487e8445d6d85bb527251b7371a04 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 12 五月 2025 13:14:11 +0800
Subject: [PATCH] 优化项目；
---
Plugin.TestResult/ViewControl.xaml.cs | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index ef1b83e..4ea1f1f 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,17 +1,17 @@
锘縰sing HMI.Base;
+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 log4net;
using NationalInstruments.TestStand.Interop.API;
using NationalInstruments.TestStand.Interop.UI.Ax;
+using Plugin.TestResult;
using Plugin.TestResult_WPF.Model;
using Plugin.TestResult_WPF.Util;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Windows;
@@ -73,14 +73,27 @@
testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
}
+ public TestResultView View
+ {
+ get => testResultView;
+ }
+ public static string SannerIniFile { get; private set; }
+
public override void InitFinish()
{
base.InitFinish();
string path = Path.Combine(BaseFolder, "Count.ini");
testResultView.SetCountIniPath(path);
testResultView.InitMainGrid();
- LoadProduct();
testResultView.InitTestStandEngine();
+
+ path = Path.Combine(BaseFolder, "Scanner.ini");
+ if (!File.Exists(path))
+ {
+ File.Create(path).Close();
+ }
+ SannerIniFile = path;
+ LoadProduct();
}
public override void DoClose(object sender, EventArgs e)
@@ -157,16 +170,27 @@
public void LoadProduct()
{
- List<ProductData> products = ParameterManager.GetProducts<List<ProductData>>()
+ List<ProductData> products = ProductManager.GetProducts<List<ProductData>>()
?? new List<ProductData>();
this.modelSelect.Items.Clear();
+ List<string> productSource = new List<string>();
foreach (var prd in products)
{
this.modelSelect.Items.Add(prd.Name);
+ productSource.Add(prd.Name);
}
- if (products.Count > 0)
+ testResultView.SetProductSource(productSource);
+
+ 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);
}
}
@@ -174,7 +198,8 @@
{
try
{
- List<ParameterData> parameters = ParameterManager.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);
@@ -183,6 +208,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)
{
@@ -312,6 +340,12 @@
testResultView.ClearNumber();
}
-
+ private void ScannerSetting_Click(object sender, RoutedEventArgs e)
+ {
+ ScannerSetting setting = new ScannerSetting() {
+ Owner = Window.GetWindow(this)
+ };
+ setting.Open(false,"Config");
+ }
}
}
--
Gitblit v1.9.1