From 771a0e7b6b1276087515bbe94de28358cb92963b Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 04 六月 2026 10:32:27 +0800
Subject: [PATCH] 优化老化；
---
Plugin.TsExecution/SingleControl.xaml.cs | 538 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 486 insertions(+), 52 deletions(-)
diff --git a/Plugin.TsExecution/SingleControl.xaml.cs b/Plugin.TsExecution/SingleControl.xaml.cs
index 2dc2d8e..373fcd4 100644
--- a/Plugin.TsExecution/SingleControl.xaml.cs
+++ b/Plugin.TsExecution/SingleControl.xaml.cs
@@ -1,9 +1,17 @@
-锘縰sing HMI.Core.Util;
+锘縰sing HMI.Core.Entity;
+using HMI.Core.Manager;
+using HMI.Core.Setting;
+using HMI.Core.Util;
using HMI.Util;
using NationalInstruments.TestStand.Interop.API;
+using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
+using Plugin.TsExecution.Entity;
using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.ComponentModel;
-using System.Data;
+using System.IO;
using System.Runtime.CompilerServices;
using System.Timers;
using System.Windows;
@@ -21,7 +29,6 @@
protected void Set([CallerMemberName] string name = null)
{
-
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
@@ -34,11 +41,13 @@
}
}
#endregion
- private bool isLoadOK = false;
private int index;
private string CountIniPath;
private string status = "Ready";
+
+ private ScreenTouch[] screens;
+ private ScreenGrid screenGrid;
public string Status
{
@@ -46,8 +55,8 @@
set { Set(ref status, value); }
}
- private int totalNum;
- public int TotalNum
+ private double totalNum;
+ public double TotalNum
{
get => totalNum;
private set
@@ -97,6 +106,13 @@
set { Set(ref barcode, value); }
}
+ private string model = string.Empty;
+ public string Model
+ {
+ get { return model; }
+ set { Set(ref model, value); }
+ }
+
private string elapseTime = "00:00:00";
public string ElapseTime
{
@@ -106,7 +122,8 @@
if (value == "Start Timing")
{
this.refreshTimer.Enabled = true;
- TimeNow = DateTime.Now;
+ TestStartTime = DateTime.Now;
+ StepStartTime = DateTime.Now;
}
else
{
@@ -120,14 +137,33 @@
}
}
- private DateTime TimeNow = new DateTime();
+ private string socketName = string.Empty;
+ public string SocketName
+ {
+ get { return socketName; }
+ set
+ {
+ Set(ref socketName, value);
+ }
+ }
+
+ private ObservableCollection<TestStep> _datasource = new ObservableCollection<TestStep>();
+ public ObservableCollection<TestStep> Datasource
+ {
+ get => _datasource;
+ set
+ {
+ Set(ref _datasource, value);
+ }
+ }
+
+ private DateTime TestStartTime = new DateTime();
+ private DateTime StepStartTime = new DateTime();
private TimeSpan TimeCount = new TimeSpan();
- private Timer refreshTimer;
+ private System.Timers.Timer refreshTimer;
- private DataTable dt;
-
- private string currentStep = "绛夊緟鎵爜";
+ private string currentStep = "";
public string CurrentStep
{
get => currentStep;
@@ -137,33 +173,122 @@
}
}
- public SingleControl(int Index, string CountIniPath)
+ private int _probeCount;
+ public int ProbeCount
{
- this.CountIniPath = CountIniPath;
- DataContext = this;
- this.index = Index;
- PassNum = passNum;
- FailNum = failNum;
- dt = new DataTable();
- dt.Columns.Add(new DataColumn("Name", typeof(string)));
- dt.Columns.Add(new DataColumn("Unit", typeof(string)));
- dt.Columns.Add(new DataColumn("Value", typeof(string)));
- dt.Columns.Add(new DataColumn("LimitDown", typeof(string)));
- dt.Columns.Add(new DataColumn("LimitUp", typeof(string)));
- dt.Columns.Add(new DataColumn("Result", typeof(string)));
-
- refreshTimer = new Timer()
+ get => _probeCount;
+ set
{
- Interval = 1000
+ Set(ref _probeCount, value);
+ }
+ }
+
+ /// <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)
+ {
+ DataContext = this;
+ this.CountIniPath = CountIniPath;
+ this.index = Index;
+ ProbeWarn = probeWarn;
+
+ refreshTimer = new System.Timers.Timer()
+ {
+ Interval = 100
};
refreshTimer.Elapsed += RefreshTimer_Elapsed;
-
+ RefreshProbeCount(null);
+ ReadCounter();
InitializeComponent();
+ try
+ {
+ var value = ParameterManager.GetCommonParameterByName("AutoTestMode");
+ IsAutoMode = bool.Parse(value.Value);
+ }
+ catch
+ {
+ IsAutoMode = true;
+ }
+ //if (ProbeWarn > 0)
+ //{
+ // probeWarnPanel.Visibility = Visibility.Visible;
+ //}
+ //else
+ //{
+ // probeWarnPanel.Visibility = Visibility.Collapsed;
+ //}
}
private void RefreshTimer_Elapsed(object sender, ElapsedEventArgs e)
{
- TimeCount = DateTime.Now - TimeNow;
+ //Dispatcher.Invoke(() =>
+ //{
+ // var data = PluginLoader.Instance.Plugins.FirstOrDefault(p => p.Name == "TS");
+ // if (data?.Content is TsExecution ts)
+ // {
+ // if (Status == "Testing")
+ // {
+ // ts.UpdatePositionStatus(index, "Passed");
+ // }
+ // else
+ // {
+ // ts.UpdatePositionStatus(index, "Testing");
+ // }
+ // }
+ //});
+
+ //AddTestData("1", "1", "1", "1", "1", "1", "1");
+
+ TimeCount = DateTime.Now - TestStartTime;
elapseTime = string.Format("{0:00}:{1:00}:{2:00}", TimeCount.Hours, TimeCount.Minutes, TimeCount.Seconds);
Set("ElapseTime");
Set("TestInfo");
@@ -177,23 +302,34 @@
/// <summary>
/// 鑾峰彇TS鐨勬瘡姝ユ祴璇曠殑鏁版嵁娣诲姞鍒拌〃鏍�
+ /// 椤圭洰鍚嶇О锛屾祴璇曞弬鏁帮紝娴嬭瘯鍊硷紝涓婇檺锛屼笅闄愶紝鍗曚綅锛岀粨鏋�
/// </summary>
/// <param name="TS_Data"></param>
- public void AddTestData(string step_name, string unit, string TestValue, string LowLimit, string HightLimit, string Status)
+ public void AddTestData(string name, string step_name, string value, string HightLimit, string LowLimit, string unit, string Status)
{
try
{
- var dr = dt.NewRow();
- dr[0] = step_name;
- dr[1] = unit;
- dr[2] = TestValue;
- dr[3] = LowLimit;
- dr[4] = HightLimit;
- dr[5] = Status;
- dt.Rows.Add(dr);
- table.ItemsSource = dt.DefaultView;
+ var data = new TestStep
+ {
+ Name = name,
+ Step = step_name,
+ Value = value,
+ LimitUp = HightLimit,
+ LimitDown = LowLimit,
+ Unit = unit,
+ Result = Status
+ };
+ table.Dispatcher.Invoke(new Action(() =>
+ {
+ var now = DateTime.Now;
+ var span = now - StepStartTime;
+ StepStartTime = now;
+ data.ConsumeTime = $"{(span.TotalMilliseconds / 1000d).ToString("F2")}s";
+ Datasource.Add(data);
+ table.ScrollIntoView(data);
+ }));
}
- catch
+ catch (Exception ex)
{
//灞忚斀閿欒
}
@@ -201,7 +337,6 @@
public void UpdateStatus(string status)
{
- Status = status;
if (status == "Passed")
{
UpdateTestCounter(true);
@@ -210,12 +345,16 @@
{
UpdateTestCounter(false);
}
+ else if (Status != "Testing" && status == "Testing")
+ {
+ UpdateProbeCount(ProbeCount + 1);
+ }
+ Status = status;
}
public void IniTestData()
{
- dt.Clear();
- table.ItemsSource = dt.DefaultView;
+ Datasource.Clear();
}
/// <summary>
@@ -224,13 +363,12 @@
/// <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)
{
- ReadCounter();
this.UpdateTestCounter(null);
}
@@ -239,16 +377,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
{
@@ -270,8 +412,8 @@
{
try
{
- this.passNum = Convert.ToInt32(IniFileHelper.ReadIniData("Socket" + this.index.ToString(), "Pass", "", CountIniPath));
- this.failNum = Convert.ToInt32(IniFileHelper.ReadIniData("Socket" + this.index.ToString(), "Fail", "", CountIniPath));
+ this.PassNum = Convert.ToInt32(IniFileHelper.ReadIniData("Socket" + this.index.ToString(), "Pass", "", CountIniPath));
+ this.FailNum = Convert.ToInt32(IniFileHelper.ReadIniData("Socket" + this.index.ToString(), "Fail", "", CountIniPath));
}
catch (Exception ex)
{
@@ -281,10 +423,302 @@
public void ResetCounter()
{
- this.passNum = 0;
- this.failNum = 0;
+ this.PassNum = 0;
+ this.FailNum = 0;
this.UpdateTestCounter(null);
}
+ public void WriteToExcel(string path)
+ {
+ Dispatcher.Invoke(() =>
+ {
+ try
+ {
+ string suffix = Path.GetExtension(path);
+ if (!string.Equals(".xlsx", suffix, StringComparison.OrdinalIgnoreCase) &&
+ !string.Equals(".xls", suffix, StringComparison.OrdinalIgnoreCase))
+ {
+ path = path.Replace(suffix, ".xls");
+ }
+
+ FileInfo fi = new FileInfo(path);
+ if (!fi.Directory.Exists)
+ {
+ fi.Directory.Create(); //鏂囦欢涓嶅瓨鍦紝鍒涘缓鏂囦欢
+ }
+ List<string[]> rows = new List<string[]>();
+ rows.Add(new string[] { "娴嬭瘯鏃堕棿", "娴嬭瘯浜�", "娴嬭瘯璁惧", "鏉″舰鐮�", "娴嬭瘯缁撴灉" });
+ rows.Add(new string[] { DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), UserInfo.User.Name, ParamSetting.StationName, Barcode, Status });
+ rows.Add(new string[] { "椤圭洰鍚嶇О", "娴嬭瘯鍙傛暟", "娴嬭瘯鍊�", "涓婇檺", "涓嬮檺", "鍗曚綅", "缁撴灉" });
+ if (Datasource != null && Datasource.Count > 0)
+ {
+ foreach (var data in Datasource)
+ {
+ rows.Add(new string[] { data.Name, data.Step, data.Value, data.LimitUp, data.LimitDown, data.Unit, data.Result });
+ }
+ }
+ ExcelHelper.ExportExcel(path, rows);
+ }
+ catch (Exception ex)
+ {
+ TsExecution.logger.Error("Write CSV File Failed.", ex);
+ }
+ });
+ }
+
+
+ public void WriteToCSV(string path)
+ {
+ Dispatcher.Invoke(() =>
+ {
+ try
+ {
+
+ FileInfo fi = new FileInfo(path);
+ if (!fi.Directory.Exists)
+ {
+ 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)
+ {
+ 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);
+ }
+ });
+ }
+
+ public void ShowPausePanel()
+ {
+ pausePanel.Visibility = Visibility.Visible;
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ Button btn = sender as Button;
+ switch (btn.Name)
+ {
+ 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()
+ {
+
+ }
+
+ 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);
+ }
+ }
+
+ public void RefreshScreen(int[][] configs)
+ {
+ //foreach (UIElement item in canvas.Children)
+ //{
+ // if (item is ScreenTouch)
+ // {
+ // canvas.Children.Remove(item);
+ // }
+ //}
+ screenContainer.Child = null;
+
+
+ screenGrid = new ScreenGrid(1, configs.Length);
+
+ screens = new ScreenTouch[configs.Length];
+
+ int space = 2 * (screens.Length + 1);
+ for (int i = 0; i < configs.Length; i++)
+ {
+ var screen = new ScreenTouch(configs[i][0], configs[i][1])
+ {
+ Width = Math.Max((tableHeader.ActualHeight / 9 * 16 - space) / screens.Length, 0),
+ Height = Math.Max((tableHeader.ActualHeight / 9 * 16 - space) / screens.Length / 16 * 9, 0)
+ };
+ screens[i] = screen;
+ screenGrid.AddScreen(screen, 0, i);
+ }
+ screenContainer.Child = screenGrid;
+
+ //canvas.Children.Add(screens[0]);
+ //Canvas.SetBottom(screens[0], 0);
+ //Canvas.SetRight(screens[0], 0);
+ //Panel.SetZIndex(screens[0], 999);
+ }
+
+ public void DrawScreenPoint(int index, int x, int y)
+ {
+ screens[index].DrawPoint(x, y);
+ }
+
+ /// <summary>
+ /// 缁樺浘涔嬪墠娓呯┖宸叉湁鐨�
+ /// </summary>
+ /// <param name="index"></param>
+ /// <param name="points"></param>
+ public void DrawScreenPoints(int index, int[][] points)
+ {
+ screens[index].DrawPoints(points);
+ }
+
+ /// <summary>
+ /// 缁樺浘涔嬪墠涓嶆竻绌哄凡鏈夌殑
+ /// </summary>
+ /// <param name="index"></param>
+ /// <param name="points"></param>
+ public void DrawNewScreenPoints(int index, int[][] points)
+ {
+ screens[index].DrawNewPoints(points);
+ }
+
+ public void ClearScreenPoint(int index)
+ {
+ screens[index].Clear();
+ }
+
+ public void RefreshProbeCount(ProductData product)
+ {
+ try
+ {
+ var num = IniFileHelper.ReadIniData($"Socket{this.index.ToString()}", "ProbeCount", "0", this.CountIniPath);
+ this.ProbeCount = int.Parse(num);
+ }
+ catch (Exception ex)
+ {
+ this.ProbeCount = 0;
+ }
+ }
+
+ /// <summary>
+ /// 鏇存柊鎺㈤拡浣跨敤娆℃暟
+ /// </summary>
+ /// <param name="count"></param>
+ private void UpdateProbeCount(int count)
+ {
+ /// 鍐欏埌閰嶇疆鏂囦欢
+ IniFileHelper.WriteIniData("Socket" + this.index.ToString(), "ProbeCount", count.ToString(), this.CountIniPath);
+ ProbeCount = count;
+
+ //if (ProbeWarn <= 0) probeCountAlarm.Visibility = Visibility.Collapsed;
+ //else if (count >= ProbeWarn) probeCountAlarm.Visibility = Visibility.Visible;
+ //else probeCountAlarm.Visibility = Visibility.Collapsed;
+ }
+
+ public void RefreshProduct(ProductData product)
+ {
+ if (product == null)
+ {
+ screenContainer.Child = null;
+ return;
+ }
+ try
+ {
+ string screenSize = ProductManager.GetParameterByProductAndName(product.Name, "ScreenTouch")?.Value;
+ if (string.IsNullOrEmpty(screenSize))
+ {
+ screenContainer.Child = null;
+ return;
+ }
+ string[] arr = screenSize.Split(';');
+ int[][] configs = new int[arr.Length][];
+
+ for (int i = 0; i < arr.Length; i++)
+ {
+ string[] size = arr[i].Split(',');
+ configs[i] = new int[2] { int.Parse(size[0]), int.Parse(size[1]) };
+ }
+ RefreshScreen(configs);
+ }
+ catch (Exception ex)
+ {
+ TsExecution.logger.Error("RefreshProduct Failed.", ex);
+ screenContainer.Child = null;
+ }
+ }
+
+ private void control_SizeChanged(object sender, SizeChangedEventArgs e)
+ {
+ if (screenGrid == null)
+ {
+ return;
+ }
+ //screenGrid.Height = tableHeader.ActualHeight - 2;
+ //screenGrid.Width = tableHeader.ActualHeight / 9 * 16 - 2;
+
+ int space = 2 * (screens.Length + 1);
+
+ for (int i = 0; i < screens.Length; i++)
+ {
+ var screen = screens[i];
+ screen.Width = Math.Max(Math.Floor((tableHeader.ActualHeight / 9 * 16 - space) / screens.Length), 0);
+ screen.Height = Math.Max(Math.Floor(screen.Width / 16 * 9), 0);
+ }
+ }
+
+ private void screenContainer_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+ {
+ if (e.ClickCount == 2)
+ {
+ new ScreenTouchWin(screens)
+ {
+ Owner = Window.GetWindow(this)
+ }.ShowDialog();
+ }
+ }
}
}
--
Gitblit v1.9.1