节点
This commit is contained in:
parent
465d76d0db
commit
4b5ac96b7c
|
|
@ -93,7 +93,6 @@ public partial class MainWindow : Window
|
|||
// 清空之前图表数据
|
||||
chartManager.ClearAllCharts();
|
||||
sensorManager.Start();
|
||||
//chartManager.Start(); // 启动图表刷新
|
||||
BtnSensorControl.Content = "检测确定";
|
||||
isDetecting = true;
|
||||
}
|
||||
|
|
@ -101,7 +100,6 @@ public partial class MainWindow : Window
|
|||
{
|
||||
// 停止检测
|
||||
sensorManager.Stop();
|
||||
//chartManager.Stop(); // 停止图表刷新
|
||||
BtnSensorControl.Content = "检测开始";
|
||||
isDetecting = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,199 +1,195 @@
|
|||
using guoke;
|
||||
using LiveCharts;
|
||||
using LiveCharts.Wpf;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Windows.Threading;
|
||||
using WpfApp.src.config;
|
||||
|
||||
namespace WpfApp.Services
|
||||
namespace WpfApp.Services;
|
||||
|
||||
public class ChartManager
|
||||
{
|
||||
public class ChartManager
|
||||
private readonly Dispatcher dispatcher;
|
||||
private readonly LogService log;
|
||||
private readonly DatabaseService db;
|
||||
private readonly EventService<GeneralEventArgs> even;
|
||||
|
||||
private const string SENSOR_DATA_EVENT = "SensorDataUpdate";
|
||||
|
||||
// 最大保留点数
|
||||
private const int MAX_POINTS = 20;
|
||||
|
||||
// 每个图表的数据封装
|
||||
private class ChartData
|
||||
{
|
||||
private readonly Dispatcher dispatcher;
|
||||
private readonly LogService log;
|
||||
private readonly DatabaseService db;
|
||||
private readonly EventService<GeneralEventArgs> even;
|
||||
public ColumnSeries ColumnSeries;
|
||||
public ChartValues<double> StandardMin = new ChartValues<double>();
|
||||
public ChartValues<double> StandardAvg = new ChartValues<double>();
|
||||
public ChartValues<double> StandardMax = new ChartValues<double>();
|
||||
public List<string> Labels = new List<string>();
|
||||
}
|
||||
|
||||
private const string SENSOR_DATA_EVENT = "SensorDataUpdate";
|
||||
// 管理多个图表
|
||||
private Dictionary<CartesianChart, ChartData> charts = new Dictionary<CartesianChart, ChartData>();
|
||||
|
||||
// 最大保留点数
|
||||
private const int MAX_POINTS = 20;
|
||||
public ChartManager(Dispatcher uiDispatcher,
|
||||
LogService logService,
|
||||
DatabaseService databaseService,
|
||||
EventService<GeneralEventArgs> eventService)
|
||||
{
|
||||
dispatcher = uiDispatcher;
|
||||
log = logService;
|
||||
db = databaseService;
|
||||
even = eventService;
|
||||
|
||||
// 每个图表的数据封装
|
||||
private class ChartData
|
||||
SubscribeToSensorDataEvents();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化图表（一次性设置标准线和柱状图）
|
||||
/// </summary>
|
||||
public void InitChart(CartesianChart chart)
|
||||
{
|
||||
dispatcher.Invoke(() =>
|
||||
{
|
||||
public ColumnSeries ColumnSeries;
|
||||
public ChartValues<double> StandardMin = new ChartValues<double>();
|
||||
public ChartValues<double> StandardAvg = new ChartValues<double>();
|
||||
public ChartValues<double> StandardMax = new ChartValues<double>();
|
||||
public List<string> Labels = new List<string>();
|
||||
}
|
||||
if (chart == null) return;
|
||||
|
||||
// 管理多个图表
|
||||
private Dictionary<CartesianChart, ChartData> charts = new Dictionary<CartesianChart, ChartData>();
|
||||
|
||||
public ChartManager(Dispatcher uiDispatcher,
|
||||
LogService logService,
|
||||
DatabaseService databaseService,
|
||||
EventService<GeneralEventArgs> eventService)
|
||||
{
|
||||
dispatcher = uiDispatcher;
|
||||
log = logService;
|
||||
db = databaseService;
|
||||
even = eventService;
|
||||
|
||||
SubscribeToSensorDataEvents();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 初始化图表（一次性设置标准线和柱状图）
|
||||
/// </summary>
|
||||
public void InitChart(CartesianChart chart)
|
||||
{
|
||||
dispatcher.Invoke(() =>
|
||||
// 如果已经初始化过，先清除
|
||||
if (charts.ContainsKey(chart))
|
||||
{
|
||||
if (chart == null) return;
|
||||
|
||||
// 如果已经初始化过，先清除
|
||||
if (charts.ContainsKey(chart))
|
||||
{
|
||||
charts.Remove(chart);
|
||||
}
|
||||
|
||||
var data = new ChartData();
|
||||
data.ColumnSeries = new ColumnSeries
|
||||
{
|
||||
Title = "实时值",
|
||||
Values = new ChartValues<double>()
|
||||
};
|
||||
|
||||
var line1 = new LineSeries { Title = "标准下限", Values = data.StandardMin };
|
||||
var line2 = new LineSeries { Title = "标准均值", Values = data.StandardAvg };
|
||||
var line3 = new LineSeries { Title = "标准上限", Values = data.StandardMax };
|
||||
|
||||
chart.Series = new SeriesCollection { data.ColumnSeries, line1, line2, line3 };
|
||||
|
||||
chart.AxisX.Clear();
|
||||
chart.AxisY.Clear();
|
||||
|
||||
chart.AxisX.Add(new Axis
|
||||
{
|
||||
Title = "时间",
|
||||
Labels = data.Labels
|
||||
});
|
||||
|
||||
chart.AxisY.Add(new Axis
|
||||
{
|
||||
Title = "数值"
|
||||
});
|
||||
|
||||
charts[chart] = data;
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 接收到传感器实时数据（单点更新）
|
||||
/// </summary>
|
||||
private void OnSensorDataReceived(object sender, GeneralEventArgs e)
|
||||
{
|
||||
if (e is SensorDataEventArgs sensorArgs)
|
||||
{
|
||||
string chartTitle = sensorArgs.ChartTitle; // 例如 "myChart1"
|
||||
double value = sensorArgs.SensorValue;
|
||||
string timeLabel = DateTime.Now.ToString("HH:mm:ss");
|
||||
|
||||
// 找到对应图表并更新
|
||||
foreach (var chart in charts.Keys)
|
||||
{
|
||||
if (chart.Name == chartTitle)
|
||||
{
|
||||
UpdateChartPoint(chart, timeLabel, value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
charts.Remove(chart);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 更新单个图表的数据点（柱状图 + 标准线 + X轴标签）
|
||||
/// </summary>
|
||||
public void UpdateChartPoint(CartesianChart chart, string label, double value)
|
||||
{
|
||||
if (chart == null || !charts.TryGetValue(chart, out var data))
|
||||
return;
|
||||
|
||||
dispatcher.Invoke(() =>
|
||||
var data = new ChartData();
|
||||
data.ColumnSeries = new ColumnSeries
|
||||
{
|
||||
// 保留四位小数
|
||||
double roundedValue = Math.Round(value, 4);
|
||||
data.ColumnSeries.Values.Add(roundedValue);
|
||||
// 对标准线固定值，强制 double
|
||||
data.StandardMin.Add(Math.Round((double)5, 4));
|
||||
data.StandardAvg.Add(Math.Round((double)10, 4));
|
||||
data.StandardMax.Add(Math.Round((double)30, 4));
|
||||
data.Labels.Add(label);
|
||||
Title = "实时值",
|
||||
Values = new ChartValues<double>()
|
||||
};
|
||||
|
||||
// 超过最大点数时，移除最旧的数据
|
||||
if (data.ColumnSeries.Values.Count > MAX_POINTS)
|
||||
{
|
||||
data.ColumnSeries.Values.RemoveAt(0);
|
||||
data.StandardMin.RemoveAt(0);
|
||||
data.StandardAvg.RemoveAt(0);
|
||||
data.StandardMax.RemoveAt(0);
|
||||
data.Labels.RemoveAt(0);
|
||||
}
|
||||
var line1 = new LineSeries { Title = "标准下限", Values = data.StandardMin };
|
||||
var line2 = new LineSeries { Title = "标准均值", Values = data.StandardAvg };
|
||||
var line3 = new LineSeries { Title = "标准上限", Values = data.StandardMax };
|
||||
|
||||
// 刷新 X 轴标签
|
||||
chart.AxisX[0].Labels = new List<string>(data.Labels);
|
||||
});
|
||||
}
|
||||
chart.Series = new SeriesCollection { data.ColumnSeries, line1, line2, line3 };
|
||||
|
||||
/// <summary>
|
||||
/// 手动添加数据到指定图表
|
||||
/// </summary>
|
||||
public void AddData(CartesianChart chart, double value, string label)
|
||||
{
|
||||
UpdateChartPoint(chart, label, value);
|
||||
}
|
||||
chart.AxisX.Clear();
|
||||
chart.AxisY.Clear();
|
||||
|
||||
/// <summary>
|
||||
/// 手动清除指定图表的数据
|
||||
/// </summary>
|
||||
public void ClearChart(CartesianChart chart)
|
||||
{
|
||||
if (chart == null || !charts.TryGetValue(chart, out var data))
|
||||
return;
|
||||
|
||||
dispatcher.Invoke(() =>
|
||||
chart.AxisX.Add(new Axis
|
||||
{
|
||||
data.ColumnSeries.Values.Clear();
|
||||
data.StandardMin.Clear();
|
||||
data.StandardAvg.Clear();
|
||||
data.StandardMax.Clear();
|
||||
data.Labels.Clear();
|
||||
chart.AxisX[0].Labels.Clear();
|
||||
Title = "时间",
|
||||
Labels = data.Labels
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 清除所有图表
|
||||
/// </summary>
|
||||
public void ClearAllCharts()
|
||||
chart.AxisY.Add(new Axis
|
||||
{
|
||||
Title = "数值"
|
||||
});
|
||||
|
||||
charts[chart] = data;
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 接收到传感器实时数据（单点更新）
|
||||
/// </summary>
|
||||
private void OnSensorDataReceived(object sender, GeneralEventArgs e)
|
||||
{
|
||||
if (e is SensorDataEventArgs sensorArgs)
|
||||
{
|
||||
string chartTitle = sensorArgs.ChartTitle; // 例如 "myChart1"
|
||||
double value = sensorArgs.SensorValue;
|
||||
string timeLabel = DateTime.Now.ToString("HH:mm:ss");
|
||||
|
||||
// 找到对应图表并更新
|
||||
foreach (var chart in charts.Keys)
|
||||
{
|
||||
ClearChart(chart);
|
||||
if (chart.Name == chartTitle)
|
||||
{
|
||||
UpdateChartPoint(chart, timeLabel, value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订阅传感器数据事件
|
||||
/// </summary>
|
||||
private void SubscribeToSensorDataEvents()
|
||||
|
||||
/// <summary>
|
||||
/// 更新单个图表的数据点（柱状图 + 标准线 + X轴标签）
|
||||
/// </summary>
|
||||
public void UpdateChartPoint(CartesianChart chart, string label, double value)
|
||||
{
|
||||
if (chart == null || !charts.TryGetValue(chart, out var data))
|
||||
return;
|
||||
|
||||
dispatcher.Invoke(() =>
|
||||
{
|
||||
even?.AddEventHandler(SENSOR_DATA_EVENT, OnSensorDataReceived);
|
||||
// 保留四位小数
|
||||
double roundedValue = Math.Round(value, 4);
|
||||
data.ColumnSeries.Values.Add(roundedValue);
|
||||
// 对标准线固定值，强制 double
|
||||
data.StandardMin.Add(Math.Round((double)5, 4));
|
||||
data.StandardAvg.Add(Math.Round((double)10, 4));
|
||||
data.StandardMax.Add(Math.Round((double)30, 4));
|
||||
data.Labels.Add(label);
|
||||
|
||||
// 超过最大点数时，移除最旧的数据
|
||||
if (data.ColumnSeries.Values.Count > MAX_POINTS)
|
||||
{
|
||||
data.ColumnSeries.Values.RemoveAt(0);
|
||||
data.StandardMin.RemoveAt(0);
|
||||
data.StandardAvg.RemoveAt(0);
|
||||
data.StandardMax.RemoveAt(0);
|
||||
data.Labels.RemoveAt(0);
|
||||
}
|
||||
|
||||
// 刷新 X 轴标签
|
||||
chart.AxisX[0].Labels = new List<string>(data.Labels);
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 手动添加数据到指定图表
|
||||
/// </summary>
|
||||
public void AddData(CartesianChart chart, double value, string label)
|
||||
{
|
||||
UpdateChartPoint(chart, label, value);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 手动清除指定图表的数据
|
||||
/// </summary>
|
||||
public void ClearChart(CartesianChart chart)
|
||||
{
|
||||
if (chart == null || !charts.TryGetValue(chart, out var data))
|
||||
return;
|
||||
|
||||
dispatcher.Invoke(() =>
|
||||
{
|
||||
data.ColumnSeries.Values.Clear();
|
||||
data.StandardMin.Clear();
|
||||
data.StandardAvg.Clear();
|
||||
data.StandardMax.Clear();
|
||||
data.Labels.Clear();
|
||||
chart.AxisX[0].Labels.Clear();
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 清除所有图表
|
||||
/// </summary>
|
||||
public void ClearAllCharts()
|
||||
{
|
||||
foreach (var chart in charts.Keys)
|
||||
{
|
||||
ClearChart(chart);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 订阅传感器数据事件
|
||||
/// </summary>
|
||||
private void SubscribeToSensorDataEvents()
|
||||
{
|
||||
even?.AddEventHandler(SENSOR_DATA_EVENT, OnSensorDataReceived);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,95 +2,94 @@
|
|||
using System.Windows;
|
||||
using WpfApp.src.components;
|
||||
|
||||
namespace WpfApp.Services
|
||||
namespace WpfApp.Services;
|
||||
|
||||
/// <summary>
|
||||
/// SensorChart 管理器 - 负责传感器数据采集和更新
|
||||
/// </summary>
|
||||
public class SensorChartManager
|
||||
{
|
||||
/// <summary>
|
||||
/// SensorChart 管理器 - 负责传感器数据采集和更新
|
||||
/// </summary>
|
||||
public class SensorChartManager
|
||||
private readonly Window dispatcherOwner;
|
||||
private CancellationTokenSource cts;
|
||||
private readonly Random rand = new Random();
|
||||
private readonly LogService log;
|
||||
private readonly DatabaseService db;
|
||||
private readonly EventService<GeneralEventArgs> even;
|
||||
|
||||
// 事件名称常量
|
||||
private const string SENSOR_DATA_EVENT = "SensorDataUpdate";
|
||||
|
||||
|
||||
// 绑定的传感器控件
|
||||
public SensorChart Sensor1 { get; set; }
|
||||
public SensorChart Sensor2 { get; set; }
|
||||
public SensorChart Sensor3 { get; set; }
|
||||
|
||||
public SensorChartManager(Window owner, LogService logService, DatabaseService databaseService, EventService<GeneralEventArgs> eventService)
|
||||
{
|
||||
private readonly Window dispatcherOwner;
|
||||
private CancellationTokenSource cts;
|
||||
private readonly Random rand = new Random();
|
||||
private readonly LogService log;
|
||||
private readonly DatabaseService db;
|
||||
private readonly EventService<GeneralEventArgs> even;
|
||||
dispatcherOwner = owner;
|
||||
log = logService;
|
||||
db = databaseService;
|
||||
even = eventService;
|
||||
}
|
||||
|
||||
// 事件名称常量
|
||||
private const string SENSOR_DATA_EVENT = "SensorDataUpdate";
|
||||
/// <summary>
|
||||
/// 启动模拟数据采集
|
||||
/// </summary>
|
||||
public void Start()
|
||||
{
|
||||
if (Sensor1 == null || Sensor2 == null || Sensor3 == null)
|
||||
throw new InvalidOperationException("请先绑定传感器控件");
|
||||
|
||||
cts = new CancellationTokenSource();
|
||||
|
||||
// 绑定的传感器控件
|
||||
public SensorChart Sensor1 { get; set; }
|
||||
public SensorChart Sensor2 { get; set; }
|
||||
public SensorChart Sensor3 { get; set; }
|
||||
|
||||
public SensorChartManager(Window owner, LogService logService, DatabaseService databaseService, EventService<GeneralEventArgs> eventService)
|
||||
Task.Run(async () =>
|
||||
{
|
||||
dispatcherOwner = owner;
|
||||
log = logService;
|
||||
db = databaseService;
|
||||
even = eventService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 启动模拟数据采集
|
||||
/// </summary>
|
||||
public void Start()
|
||||
{
|
||||
if (Sensor1 == null || Sensor2 == null || Sensor3 == null)
|
||||
throw new InvalidOperationException("请先绑定传感器控件");
|
||||
|
||||
cts = new CancellationTokenSource();
|
||||
|
||||
Task.Run(async () =>
|
||||
while (!cts.Token.IsCancellationRequested)
|
||||
{
|
||||
while (!cts.Token.IsCancellationRequested)
|
||||
// 模拟数据
|
||||
double s1 = rand.NextDouble() * 100 - 50;
|
||||
double s2 = rand.NextDouble() * 100 - 50;
|
||||
double s3 = rand.NextDouble() * 100 - 50;
|
||||
|
||||
// 更新 UI
|
||||
dispatcherOwner.Dispatcher.Invoke(() =>
|
||||
{
|
||||
// 模拟数据
|
||||
double s1 = rand.NextDouble() * 100 - 50;
|
||||
double s2 = rand.NextDouble() * 100 - 50;
|
||||
double s3 = rand.NextDouble() * 100 - 50;
|
||||
Sensor1.SetSensorData("传感器1", s1);
|
||||
Sensor2.SetSensorData("传感器2", s2);
|
||||
Sensor3.SetSensorData("传感器3", s3);
|
||||
|
||||
// 更新 UI
|
||||
dispatcherOwner.Dispatcher.Invoke(() =>
|
||||
{
|
||||
Sensor1.SetSensorData("传感器1", s1);
|
||||
Sensor2.SetSensorData("传感器2", s2);
|
||||
Sensor3.SetSensorData("传感器3", s3);
|
||||
// 通过事件将传感器数据传递到ChartManager
|
||||
PublishSensorData("传感器1", s1, "myChart1");
|
||||
PublishSensorData("传感器2", s2, "myChart2");
|
||||
PublishSensorData("传感器3", s3, "myChart3");
|
||||
});
|
||||
|
||||
// 通过事件将传感器数据传递到ChartManager
|
||||
PublishSensorData("传感器1", s1, "myChart1");
|
||||
PublishSensorData("传感器2", s2, "myChart2");
|
||||
PublishSensorData("传感器3", s3, "myChart3");
|
||||
});
|
||||
|
||||
await Task.Delay(1000); // 每1000毫秒采集一次
|
||||
}
|
||||
}, cts.Token);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 停止采集
|
||||
/// </summary>
|
||||
public void Stop()
|
||||
{
|
||||
cts?.Cancel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 发布传感器数据事件
|
||||
/// </summary>
|
||||
/// <param name="sensorTitle">传感器标题</param>
|
||||
/// <param name="sensorValue">传感器值</param>
|
||||
/// <param name="chartTitle">图表标题</param>
|
||||
private void PublishSensorData(string sensorTitle, double sensorValue, string chartTitle)
|
||||
{
|
||||
if (even != null)
|
||||
{
|
||||
var eventArgs = new SensorDataEventArgs(sensorTitle, sensorValue, chartTitle);
|
||||
even.TriggerEvent(SENSOR_DATA_EVENT, this, eventArgs);
|
||||
await Task.Delay(1000); // 每1000毫秒采集一次
|
||||
}
|
||||
}, cts.Token);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 停止采集
|
||||
/// </summary>
|
||||
public void Stop()
|
||||
{
|
||||
cts?.Cancel();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 发布传感器数据事件
|
||||
/// </summary>
|
||||
/// <param name="sensorTitle">传感器标题</param>
|
||||
/// <param name="sensorValue">传感器值</param>
|
||||
/// <param name="chartTitle">图表标题</param>
|
||||
private void PublishSensorData(string sensorTitle, double sensorValue, string chartTitle)
|
||||
{
|
||||
if (even != null)
|
||||
{
|
||||
var eventArgs = new SensorDataEventArgs(sensorTitle, sensorValue, chartTitle);
|
||||
even.TriggerEvent(SENSOR_DATA_EVENT, this, eventArgs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue
Block a user