From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/ViewControl.xaml.cs | 175 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 56 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index fc91920..f072a88 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,49 +1,29 @@
-锘縰sing NationalInstruments.TestStand.Interop.API;
+锘縰sing HMI.Base;
+using HMI.Core.Entity;
+using HMI.Core.Manager;
+using HMI.Core.Util;
+using HMI.UI;
+using HMI.UI.Util;
+using log4net;
+using NationalInstruments.TestStand.Interop.API;
using NationalInstruments.TestStand.Interop.UI.Ax;
-using NationalInstruments.TestStand.Utility;
-using ParameterHelper;
+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.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;
@@ -59,13 +39,15 @@
/// </summary>
private SequenceContext SequenceContext = null;
+ public static ILog Logger { get; private set; }
+
private bool _mesStatus;
public bool mesStatus
{
get => _mesStatus;
- set => RaiseAndSetIfChanged(ref _mesStatus, value);
+ set => Set(ref _mesStatus, value);
}
private string _produceStatus = "INIT";
@@ -73,10 +55,14 @@
public string produceStatus
{
get => _produceStatus;
- set => RaiseAndSetIfChanged(ref _produceStatus, value);
+ set => Set(ref _produceStatus, value);
}
-
+ public override void SetLogger(ILog logger)
+ {
+ base.SetLogger(logger);
+ Logger = logger;
+ }
public ViewControl()
{
@@ -87,13 +73,40 @@
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();
+ 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)
+ {
+ testResultView.ReleaseResource();
+ }
+
private void axApplicationMgr_ExitApplication(object sender, EventArgs e)
{
}
private void axApplicationMgr_ExecutionClosed(object sender, _ApplicationMgrEvents_ExecutionClosedEvent e)
{
-
}
private void axApplicationMgr_UIMessageEvent(object sender, _ApplicationMgrEvents_UIMessageEventEvent e)
@@ -134,25 +147,50 @@
{ }
}
+ private bool isLoaded;
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
- LoadProduct();
- testResultView.InitTestStandEngine();
- Start_Click(null, null);
+ new MaskWindow(Window.GetWindow(this),
+ (win) =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ try
+ {
+ Start_Click(null, null);
+ Loaded -= UserControl_Loaded;
+ }
+ finally
+ {
+ win.Close();
+ }
+ });
+ }).Info(LangUtil.Get("Ts.SequenceIsStarting"));
}
public void LoadProduct()
{
- ProductManager prdManager = new ProductManager();
- prdManager.LoadProducts();
+ List<ProductData> products = ProductManager.GetProducts<List<ProductData>>()
+ ?? new List<ProductData>();
this.modelSelect.Items.Clear();
- foreach (Product prd in prdManager.Products)
+ List<string> productSource = new List<string>();
+ foreach (var prd in products)
{
this.modelSelect.Items.Add(prd.Name);
+ productSource.Add(prd.Name);
}
- if (prdManager.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);
}
}
@@ -160,10 +198,8 @@
{
try
{
- string ParaFile = @".\Config\ProductionSetting\Parameter\Parameter_" + this.modelSelect.SelectedItem + ".setting";
-
- this.parameterManager = new ParameterManager(ParaFile);
- this.parameterManager.LoadParameters();
+ 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);
@@ -171,9 +207,10 @@
//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;
-
+ testResultView.engine.Globals.SetValString("ProductModel", 0, currentModel);
+ testResultView.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
}
catch (Exception ex)
{
@@ -186,14 +223,15 @@
try
{
testResultView.StartTestSequence();
-
this.modelSelect.IsEnabled = false;
this.btnStart.IsEnabled = false;
this.btnStop.IsEnabled = true;
}
catch (Exception ex)
{
- MessageBox.Show("鍚姩娴嬭瘯澶辫触锛�" + ex.Message);
+ log.Error("Start_Click Failed.", ex);
+ MsgBoxHelper.Error(Window.GetWindow(this),
+ $"{this.lang("Ts.StartTestSequenceFailed")}: {ex.Message}");
}
}
@@ -208,7 +246,9 @@
}
catch (Exception ex)
{
- MessageBox.Show("鍋滄娴嬭瘯澶辫触!" + ex.Message);
+ log.Error("Stop_Click Failed.", ex);
+ MsgBoxHelper.Error(Window.GetWindow(this),
+ $"{this.lang("Ts.StopTestSequenceFailed")}: {ex.Message}");
}
}
@@ -216,9 +256,12 @@
{
if (scannerWindow1 == null)
{
- scannerWindow1 = new Scanner("涓�鍖烘壂鐮�");
+ scannerWindow1 = new Scanner(this.lang("Tr.Zone1Scan"))
+ {
+ Tag = "Zone1"
+ };
scannerWindow1.FinishBarcode += ScannerWindow_FinishBarcode;
- scannerWindow1.Owner = Window.GetWindow(this);
+ //scannerWindow1.Owner = Window.GetWindow(this);
scannerWindow1.Closed += ScannerWindow1_Closed;
scannerWindow1.Show();
}
@@ -232,7 +275,10 @@
{
if (scannerWindow2 == null)
{
- scannerWindow2 = new Scanner("浜屽尯鎵爜");
+ scannerWindow2 = new Scanner(this.lang("Tr.Zone2Scan"))
+ {
+ Tag = "Zone2"
+ };
scannerWindow2.FinishBarcode += ScannerWindow_FinishBarcode;
scannerWindow2.Owner = Window.GetWindow(this);
scannerWindow2.Closed += ScannerWindow2_Closed;
@@ -254,14 +300,14 @@
if (this.SequenceContext == null) return;
CellInfo cellInfo = codeParser.GetCellInfoByCode(e.positionCode);
- string paramName = e.name == "涓�鍖烘壂鐮�" ? "StationState.StartScanner_A" : "StationState.StartScanner_B";
+ string paramName = e.name == "Zone1" ? "StationState.StartScanner_A" : "StationState.StartScanner_B";
testResultView.engine.Globals.SetValBoolean(paramName, 0, true);
string positionCode = e.positionCode, snrCode = e.snrCode;
//闇�瑕佸鍔犳潯鐮佹牎楠屽姛鑳�
//灏嗚鍒扮殑鏉＄爜鍐欏叆鍒癝N涓�
int dutNo = Convert.ToInt16(positionCode.Split('-')[2]) - 1;
- string LookupStr = e.name == "涓�鍖烘壂鐮�" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
+ string LookupStr = e.name == "Zone1" ? $"StationState.SN[{dutNo}]" : $"StationState.SN[{(dutNo + 54)}]";
//this.SequenceContext.StationGlobals.SetValString(LookupStr, 0, snrCode);
//string code = this.SequenceContext.StationGlobals.GetValString(LookupStr, 0);
@@ -282,7 +328,24 @@
private void testResultView_Loaded(object sender, RoutedEventArgs e)
{
+ }
+ /// <summary>
+ /// 璁℃暟娓呴浂鎸夐挳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void BtnClear_Click(object sender, RoutedEventArgs e)
+ {
+ testResultView.ClearNumber();
+ }
+
+ private void ScannerSetting_Click(object sender, RoutedEventArgs e)
+ {
+ Plugin.TestResult.ScannerSetting setting = new Plugin.TestResult.ScannerSetting() {
+ Owner = Window.GetWindow(this)
+ };
+ setting.Open(false,"Config");
}
}
}
--
Gitblit v1.9.1