From 0940f31b7eba1cf6b6a8c1fca72d97cf686e79f2 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 04 七月 2025 10:43:00 +0800
Subject: [PATCH] 优化插件，完善TreeListView
---
Plugin.TsExecution/SingleControl.xaml.cs | 194 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 162 insertions(+), 32 deletions(-)
diff --git a/Plugin.TsExecution/SingleControl.xaml.cs b/Plugin.TsExecution/SingleControl.xaml.cs
index 8d2e1e0..33afb58 100644
--- a/Plugin.TsExecution/SingleControl.xaml.cs
+++ b/Plugin.TsExecution/SingleControl.xaml.cs
@@ -1,4 +1,7 @@
-锘縰sing HMI.Core.Util;
+锘縰sing HMI.Core.Manager;
+using HMI.Core.Util;
+using HMI.UI;
+using HMI.UI.Util;
using HMI.Util;
using NationalInstruments.TestStand.Interop.API;
using Plugin.TsExecution.Entity;
@@ -7,6 +10,7 @@
using System.ComponentModel;
using System.IO;
using System.Runtime.CompilerServices;
+using System.Threading;
using System.Timers;
using System.Windows;
using System.Windows.Controls;
@@ -58,15 +62,15 @@
}
}
- private double passNum;
- public double PassNum
+ private int passNum;
+ public int PassNum
{
get => passNum;
private set { Set(ref passNum, value); }
}
- private double failNum;
- public double FailNum
+ private int failNum;
+ public int FailNum
{
get => failNum;
private set { Set(ref failNum, value); }
@@ -135,7 +139,7 @@
private DateTime TimeNow = new DateTime();
private TimeSpan TimeCount = new TimeSpan();
- private Timer refreshTimer;
+ private System.Timers.Timer refreshTimer;
private string currentStep = "绛夊緟鎵爜";
public string CurrentStep
@@ -157,7 +161,56 @@
}
}
+ /// <summary>
+ /// 杩涘害鍊�
+ /// </summary>
+ private int _processValue;
+ public int ProcessValue
+ {
+ get => _processValue;
+ set
+ {
+ Set(ref _processValue, value);
+ }
+ }
+
+ public string ProcessValueLabel
+ {
+ get
+ {
+ if (ProcessValue > 0) return $"{ProcessValue}%";
+ return "";
+ }
+ set
+ {
+ }
+ }
+
+ public void SetSimpleUI(bool flag)
+ {
+ if (flag)
+ {
+ simplePanel.Visibility = Visibility.Visible;
+ detailPanel.Visibility = Visibility.Collapsed;
+ }
+ else
+ {
+ simplePanel.Visibility = Visibility.Collapsed;
+ detailPanel.Visibility = Visibility.Visible;
+ }
+ }
+
public int ProbeWarn { get; private set; }
+
+ private bool isAutoMode;
+ public bool IsAutoMode
+ {
+ get => isAutoMode;
+ set
+ {
+ Set(ref isAutoMode, value);
+ }
+ }
public SingleControl(int Index, string CountIniPath, int probeWarn)
{
@@ -166,7 +219,7 @@
this.index = Index;
ProbeWarn = probeWarn;
- refreshTimer = new Timer()
+ refreshTimer = new System.Timers.Timer()
{
Interval = 100
};
@@ -174,6 +227,15 @@
ReadProbeCount();
ReadCounter();
InitializeComponent();
+ try
+ {
+ var value = ParameterManager.GetCommonParameterByName("AutoTestMode");
+ IsAutoMode = bool.Parse(value.Value);
+ }
+ catch
+ {
+ IsAutoMode = true;
+ }
//if (ProbeWarn > 0)
//{
// probeWarnPanel.Visibility = Visibility.Visible;
@@ -275,8 +337,8 @@
/// <param name="ProcessVal"></param>
public void SetTestProcess(int ProcessVal)
{
- this.testProcess.Value = ProcessVal;
- this.testProcessLabel.Content = ProcessVal.ToString() + "%";
+ ProcessValue = ProcessVal;
+ Set("ProcessValueLabel");
}
private void UserControl_Loaded(object sender, RoutedEventArgs e)
@@ -289,16 +351,20 @@
if (result == true)
{
PassNum += 1;
+ //Interlocked.Increment(ref passNum);
+ //Set("PassNum");
}
else if (result == false)
{
FailNum += 1;
+ //Interlocked.Increment(ref failNum);
+ //Set("FailNum");
}
TotalNum = PassNum + FailNum;
if (TotalNum != 0)
{
- PassRate = (PassNum / TotalNum);
+ PassRate = ((double)PassNum / TotalNum);
}
else
{
@@ -362,41 +428,49 @@
public void ResetCounter()
{
- this.passNum = 0;
- this.failNum = 0;
+ this.PassNum = 0;
+ this.FailNum = 0;
this.UpdateTestCounter(null);
}
public void WriteToCSV(string path)
{
- try
+ Dispatcher.BeginInvoke(new Action(() =>
{
-
- FileInfo fi = new FileInfo(path);
- if (!fi.Directory.Exists)
+ try
{
- fi.Directory.Create(); //鏂囦欢涓嶅瓨鍦紝鍒涘缓鏂囦欢
- }
- using (FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write))
- using (StreamWriter sw = new StreamWriter(fs, System.Text.Encoding.UTF8))
- {
- string title = "椤圭洰鍚嶇О,娴嬭瘯鍙傛暟,娴嬭瘯鍊�,涓婇檺,涓嬮檺,鍗曚綅,缁撴灉";
- sw.WriteLine(title);
-
- if (Datasource != null && Datasource.Count > 0)
+ FileInfo fi = new FileInfo(path);
+ if (!fi.Directory.Exists)
{
- foreach (var data in Datasource)
+ fi.Directory.Create(); //鏂囦欢涓嶅瓨鍦紝鍒涘缓鏂囦欢
+ }
+
+ using (FileStream fs = new FileStream(path, FileMode.Create, FileAccess.Write))
+ using (StreamWriter sw = new StreamWriter(fs, System.Text.Encoding.UTF8))
+ {
+ string title = "椤圭洰鍚嶇О,娴嬭瘯鍙傛暟,娴嬭瘯鍊�,涓婇檺,涓嬮檺,鍗曚綅,缁撴灉";
+ sw.WriteLine(title);
+
+ if (Datasource != null && Datasource.Count > 0)
{
- sw.WriteLine($"{data.Name},{data.Step},{data.Value},{data.LimitUp},{data.LimitDown},{data.Unit},{data.Result}");
+ foreach (var data in Datasource)
+ {
+ sw.WriteLine($"{data.Name},{data.Step},{data.Value},{data.LimitUp},{data.LimitDown},{data.Unit},{data.Result}");
+ }
}
}
}
- }
- catch (Exception ex)
- {
- TsExecution.logger.Error("Write CSV File Failed.", ex);
- }
+ catch (Exception ex)
+ {
+ TsExecution.logger.Error("Write CSV File Failed.", ex);
+ }
+ }));
+ }
+
+ public void ShowPausePanel()
+ {
+ pausePanel.Visibility = Visibility.Visible;
}
private void Button_Click(object sender, RoutedEventArgs e)
@@ -407,9 +481,65 @@
case "clear":
UpdateProbeCount(0);
break;
+ case "cancelPauseBtn":
+ SequenceFileContext?.StationGlobals.SetValBoolean($"StationState.IsContinue_{index}", 1, false);
+ pausePanel.Visibility = Visibility.Collapsed;
+ break;
+ case "continuePauseBtn":
+ SequenceFileContext?.StationGlobals.SetValBoolean($"StationState.IsContinue_{index}", 1, true);
+ pausePanel.Visibility = Visibility.Collapsed;
+ break;
+ case "scannerSetting":
+ //ScannerSetting setting = new ScannerSetting()
+ //{
+ // Owner = Window.GetWindow(this)
+ //};
+ //setting.Open(true, $"Socket{index}", CountIniPath);
+ ShowScannerPanel();
+ break;
+ case "scannerOkBtn":
+ SendSnr2Ts();
+ break;
default:
break;
}
}
+ public void ShowScannerPanel()
+ {
+ scannerPanel.Visibility = Visibility.Visible;
+ }
+
+ private void SendSnr2Ts()
+ {
+ try
+ {
+ string snr = TbManualSnr.Text;
+ SequenceFileContext?.StationGlobals.SetValString($"StationState.SN[{index}]", 1, snr);
+ scannerPanel.Visibility = Visibility.Collapsed;
+ TbManualSnr.Text = string.Empty;
+ }
+ catch (Exception ex)
+ {
+ ToastHelper.Error(ex.Message);
+ }
+ }
+
+ private void pausePanel_Loaded(object sender, RoutedEventArgs e)
+ {
+ if (sender == pausePanel)
+ {
+ var can = pausePanel;
+ var modal = visualModal;
+ Canvas.SetLeft(modal, (pausePanel.ActualWidth - visualModal.ActualWidth) / 2);
+ Canvas.SetTop(modal, (pausePanel.ActualHeight - visualModal.ActualHeight) / 2);
+ }
+ else
+ {
+ var can = scannerPanel;
+ var modal = scannerVisualModal;
+ Canvas.SetLeft(modal, (scannerPanel.ActualWidth - scannerVisualModal.ActualWidth) / 2);
+ Canvas.SetTop(modal, (scannerPanel.ActualHeight - scannerVisualModal.ActualHeight) / 2);
+ }
+ }
}
}
--
Gitblit v1.9.1