This commit is contained in:
wxt
2026-02-03 17:06:03 +08:00
parent 228f976b16
commit ef8591bd68
3 changed files with 3 additions and 39 deletions

View File

@@ -1,23 +1,12 @@
using DevExpress.ClipboardSource.SpreadsheetML; using NModbus;
using NModbus;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using System.Windows.Threading; using System.Windows.Threading;
using .Data; // 这是关键
namespace namespace
{ {

View File

@@ -1,9 +1,7 @@
using DevExpress.Xpf.Charts; using jiancaiburanxing;
using jiancaiburanxing;
using jiancaiburanxing.data; using jiancaiburanxing.data;
using Microsoft.Win32; using Microsoft.Win32;
using NModbus; using NModbus;
using NModbus.Device;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@@ -12,14 +10,11 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Timers; using System.Timers;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Threading; using System.Windows.Threading;
using .Data; // 这是关键
namespace namespace
{ {
@@ -1421,17 +1416,10 @@ namespace 建材不燃性试验炉
balanceStatusBorder.Background = new SolidColorBrush(Colors.Gray); balanceStatusBorder.Background = new SolidColorBrush(Colors.Gray);
txtBalanceResult.Text = "判断中"; txtBalanceResult.Text = "判断中";
// 更新目标温度显示(如果存在)
//if (txtTestTemp != null)
//{
// txtTestTemp.Text = "750"; // 标准目标温度
//}
} }
private void StartBalanceCheck() private void StartBalanceCheck()
{ {
// 停止现有定时器
//_balanceTimer?.Stop();
// 创建新的平衡判断定时器(每秒检查一次) // 创建新的平衡判断定时器(每秒检查一次)
_balanceTimer = new DispatcherTimer(); _balanceTimer = new DispatcherTimer();
@@ -2432,12 +2420,6 @@ namespace 建材不燃性试验炉
Debug.WriteLine($"日志: {message}"); Debug.WriteLine($"日志: {message}");
} }
// 按钮点击事件
//private void btnStartExperiment_Click(object sender, RoutedEventArgs e)
//{
// _calculator.StartExperiment();
//}
private void btnPauseExperiment_Click(object sender, RoutedEventArgs e) private void btnPauseExperiment_Click(object sender, RoutedEventArgs e)
{ {
_calculator.PauseExperiment(); _calculator.PauseExperiment();
@@ -2825,6 +2807,7 @@ namespace 建材不燃性试验炉
} }
#region #region
// 温度数据结构 // 温度数据结构
public class TemperatureDataPoint public class TemperatureDataPoint
{ {

View File

@@ -8,16 +8,8 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using ;
using Path = System.IO.Path; using Path = System.IO.Path;
namespace jiancaiburanxing namespace jiancaiburanxing