From 12e606635c42ea20f4b7c2bdda5204237a4b4c96 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 02 三月 2026 16:14:49 +0800
Subject: [PATCH] 优化
---
Plugin.TestResult/ViewControl.xaml.cs | 151 +++++++++++++++++++++++++------------------------
1 files changed, 77 insertions(+), 74 deletions(-)
diff --git a/Plugin.TestResult/ViewControl.xaml.cs b/Plugin.TestResult/ViewControl.xaml.cs
index 1d140ef..47d1fe5 100644
--- a/Plugin.TestResult/ViewControl.xaml.cs
+++ b/Plugin.TestResult/ViewControl.xaml.cs
@@ -1,20 +1,20 @@
锘縰sing HMI.Base;
+using HMI.Core.Api;
using HMI.Core.Entity;
using HMI.Core.Manager;
+using HMI.Core.Setting;
using HMI.Core.Util;
using HMI.StdControl;
-using HMI.UI;
using HMI.UI.Util;
using log4net;
using NationalInstruments.TestStand.Interop.API;
using NationalInstruments.TestStand.Interop.UI.Ax;
-using Plugin.TestResult_WPF.Model;
-using Plugin.TestResult_WPF.Util;
+using PLCHelper;
+using Plugin.TestResult.Util;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.IO;
-using System.Linq;
-using System.Threading;
using System.Windows;
using System.Windows.Controls;
@@ -23,21 +23,14 @@
/// <summary>
/// ViewControl.xaml 鐨勪氦浜掗�昏緫
/// </summary>
- public partial class ViewControl : PluginMaskControl
+ public partial class ViewControl : PluginMaskControl, IAlarmHandler
{
- private CommonCodeParser codeParser = new CommonCodeParser();
- private double TestTemperature = 60;
- private int TestTime = 3600;
- private double SaftyTemperature = 40;
- private double TestVoltage = 12;
- private double Time_Heating_Low = 300;
- private double Time_Heating_High = 2400;
- private Scanner scannerWindow1;
- private Scanner scannerWindow2;
/// <summary>
/// 娴嬭瘯搴忓垪鎿嶄綔鍙ユ焺
/// </summary>
private SequenceContext SequenceContext = null;
+
+ private System.Timers.Timer timer;
public static ILog Logger { get; private set; }
@@ -83,6 +76,7 @@
this.modelSelect.IsEnabled = !value;
this.btnStart.IsEnabled = !value;
this.btnStop.IsEnabled = value;
+ stdEnableMes.CbEnabled = !value;
}
}
@@ -90,11 +84,20 @@
public ViewControl()
{
+ S7Context.Init(SystemSetting.Instance.PlcIp, SystemSetting.Instance.PlcPort);
DataContext = this;
+ timer = new System.Timers.Timer();
+ timer.Interval = 1000;
+ timer.Elapsed += Timer_Elapsed;
InitializeComponent();
testResultView.testApp.ExitApplication += new EventHandler(this.axApplicationMgr_ExitApplication);
testResultView.testApp.UIMessageEvent += new _ApplicationMgrEvents_UIMessageEventEventHandler(this.axApplicationMgr_UIMessageEvent);
testResultView.testApp.ExecutionClosed += new _ApplicationMgrEvents_ExecutionClosedEventHandler(this.axApplicationMgr_ExecutionClosed);
+ }
+
+ private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+ {
+ testResultView.RefreshCooler();
}
public TestResultView View
@@ -118,7 +121,8 @@
}
SannerIniFile = path;
LoadProduct();
-
+ var api = S7Context.Get(RunTimeVariablePool.DEFAULT_PLC_NAME);
+ log.Debug($"PLC {api.IpAddress}:{api.Port}");
try
{
var value = ParameterManager.GetCommonParameterByName("AutoExecuteSeq");
@@ -146,10 +150,20 @@
{
try
{
+ timer?.Stop();
testResultView.ReleaseResource();
}
catch
{
+ }
+ }
+
+ public override void OnClose(object sender, CancelEventArgs e)
+ {
+ if (IsRunning)
+ {
+ MsgBoxHelper2.Warn("璇峰厛鍋滄鑰佸寲娴嬭瘯锛�");
+ e.Cancel = true;
}
}
@@ -217,6 +231,7 @@
private bool isLoaded;
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
+ AlarmShowHelper.AddHandler(this);
if (AutoExecuteSeq)
{
ShowMask(() =>
@@ -236,43 +251,6 @@
IsRunning = false;
}
Loaded -= UserControl_Loaded;
-
-
- //new MaskWindow(Window.GetWindow(this), (win) =>
- //{
- // try
- // {
- // Dispatcher.BeginInvoke(new Action(() =>
- // {
- // Start_Click(null, null);
- // Loaded -= UserControl_Loaded;
- // }));
- // }
- // finally
- // {
- // Dispatcher.Invoke(() =>
- // {
- // win.Close();
- // });
- // }
- //}).Info(LangUtil.Get("Ts.SequenceIsStarting"), 100);
-
- //ShowMask(() =>
- //{
- // Dispatcher.BeginInvoke(new Action(() =>
- // {
- // System.Threading.Thread.Sleep(100);
- // Start_Click(null, null);
- // Loaded -= UserControl_Loaded;
- // }));
- //}, (ex) =>
- //{
- // log.Error("Loaded Error.", ex);
- // Dispatcher.BeginInvoke(new Action(() =>
- // {
- // MsgBoxHelper.Error(Window.GetWindow(this), ex.Message);
- // }));
- //}, "璇风◢鍚�", LangUtil.Get("Ts.SequenceIsStarting"));
}
public void LoadProduct()
@@ -307,15 +285,6 @@
{
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);
- //this.TestVoltage = Convert.ToDouble(this.parameterManager.Find("TestVoltage").ParmValue);
- //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 = parameters.FirstOrDefault(p => p.Name == "TestSequence")?.Value;
-
testResultView.engine.Globals.SetValString("ProductModel", 0, currentModel);
testResultView.engine.CommitGlobalsToDisk(promptOnSaveConflicts: false);
}
@@ -335,8 +304,21 @@
IsRunning = false;
return;
}
- testResultView.StartTestSequence();
- IsRunning = true;
+ ShowMask(() =>
+ {
+ testResultView.StartTestSequence();
+ Dispatcher.Invoke(() =>
+ {
+ IsRunning = true;
+ });
+ }, (ex) =>
+ {
+ log.Error("StartTestSequence Error.", ex);
+ Dispatcher.Invoke(() =>
+ {
+ MsgBoxHelper.Error(Window.GetWindow(this), $"{this.lang("Ts.StartTestSequenceFailed")}: {ex.Message}");
+ });
+ }, null, "璇风◢鍚�...");
}
catch (Exception ex)
{
@@ -359,16 +341,6 @@
MsgBoxHelper.Error(Window.GetWindow(this),
$"{this.lang("Ts.StopTestSequenceFailed")}: {ex.Message}");
}
- }
-
- private void ScannerWindow1_Closed(object sender, EventArgs e)
- {
- scannerWindow1 = null;
- }
-
- private void ScannerWindow2_Closed(object sender, EventArgs e)
- {
- scannerWindow2 = null;
}
private void testResultView_Loaded(object sender, RoutedEventArgs e)
@@ -398,5 +370,36 @@
{
testResultView.SequenceContext?.StationGlobals.SetValBoolean($"SystemSetting.{e.StringValue}", 1, e.BoolValue);
}
+
+ public void HandleAlarm(AlarmText alarm)
+ {
+ if (alarm.Level >= 4 && TestResultView.tables != null)
+ {
+ foreach (var oven in TestResultView.tables)
+ {
+ testResultView.SetStartFlag(oven.index, false);
+ }
+ return;
+ }
+
+ DataTable targetOven = null;
+ foreach (var oven in TestResultView.tables)
+ {
+ if (alarm.AlarmInfo?.StartsWith(oven.title) == true)
+ {
+ targetOven = oven;
+ break;
+ }
+ }
+ if (targetOven == null)
+ {
+ return;
+ }
+ if (alarm.Level >= 3)
+ {
+ /// 3绾т互涓婄殑鎶ヨ浼氬仠姝㈡祴璇�
+ testResultView.SetStartFlag(targetOven.index, false);
+ }
+ }
}
}
--
Gitblit v1.9.1