From d321346f204a69b1929cc39098a5d88f44509e7b Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 31 三月 2025 17:29:05 +0800
Subject: [PATCH] .netformwork 升级 .netcore
---
02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/01-DataIntegration/DataIntegrationPage.cs | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/01-DataIntegration/DataIntegrationPage.cs b/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/01-DataIntegration/DataIntegrationPage.cs
index a0d19ab..0a92ff8 100644
--- a/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/01-DataIntegration/DataIntegrationPage.cs
+++ b/02-desktop/WinFrmUI/IStation.WinFrmUI.Monitor/03-WorkingConditionAnalysis/01-DataIntegration/DataIntegrationPage.cs
@@ -14,10 +14,10 @@
public DataIntegrationPage()
{
InitializeComponent();
- this.PageTitle.Caption = "鏁版嵁鏁村悎";
- this.stationListCtrl1.FocusedChangedEvent += StationListCtrl1_FocusedChangedEvent;
- this.monitorDataSourcesTreeList1.FocusedChangedEvent += MonitorDataSourcesListCtrl1_FocusedChangedEvent;
- this.timeValueSwiftPlotChartView1.SetTimeAxisX( DevExpress.XtraCharts.DateTimeMeasureUnit.Minute);
+ PageTitle.Caption = "鏁版嵁鏁村悎";
+ stationListCtrl1.FocusedChangedEvent += StationListCtrl1_FocusedChangedEvent;
+ monitorDataSourcesTreeList1.FocusedChangedEvent += MonitorDataSourcesListCtrl1_FocusedChangedEvent;
+ timeValueSwiftPlotChartView1.SetTimeAxisX(DevExpress.XtraCharts.DateTimeMeasureUnit.Minute);
}
public class CurrentViewModel
@@ -46,13 +46,13 @@
private BLL.StationSignalRecordPacket _bll = new BLL.StationSignalRecordPacket();
private Model.Station _station = null;
- private Model.MonitorDataSources _monitorDataSources = null;
+ private Model.MonitorDataSources _monitorDataSources = null;
/// <summary>
/// 娓呯┖鏁版嵁
/// </summary>
public void Clear()
- {
+ {
}
/// <summary>
@@ -60,8 +60,8 @@
/// </summary>
public override void InitialDataSource()
{
- this.stationListCtrl1.SetBindingData();
- this.monitorDataSourcesTreeList1.SetBindingData();
+ stationListCtrl1.SetBindingData();
+ monitorDataSourcesTreeList1.SetBindingData();
}
//娉电珯鍙樻崲
@@ -82,12 +82,12 @@
/// 缁戝畾鏁版嵁
/// </summary>
public void SetBindingData(Model.MonitorDataSources monitorDataSources, Model.Station station)
- {
+ {
if (monitorDataSources == null || station == null)
{
return;
}
- if (this.barCekLoad.Checked)
+ if (barCekLoad.Checked)
{
return;
}
@@ -100,8 +100,8 @@
/// </summary>
public void SetBindingData(List<Model.StationSignalRecordPacket> packets)
{
- WaitFrmHelper.ShowWaitForm();
- this.timeValueSwiftPlotChartView1.ClearSeries();
+ WaitFrmHelper.ShowWaitForm();
+ timeValueSwiftPlotChartView1.ClearSeries();
if (packets != null && packets.Any())
{
var total_flow_list = new List<TimeValue>();
@@ -114,7 +114,7 @@
if (station_signal_records == null || !station_signal_records.Any())
continue;
foreach (var station in station_signal_records)
- {
+ {
var time = station.Time;
var total_flow = station.TotalFlow;
var total_pressure = station.TotalPressure;
@@ -124,10 +124,10 @@
{
continue;
}
- if (total_flow<=0&& pump_total_flow<=0)
+ if (total_flow <= 0 && pump_total_flow <= 0)
{
continue;
- }
+ }
if (pump_total_flow > 0 && Math.Abs(diff_flow) > 2000)
{
continue;
@@ -135,14 +135,14 @@
total_flow = Math.Round(total_flow, 1);
pump_total_flow = Math.Round(pump_total_flow, 1);
diff_flow = Math.Round(diff_flow, 1);
- total_pressure = Math.Round(total_pressure,2);
+ total_pressure = Math.Round(total_pressure, 2);
- if (station.PumpSignalRecords.Exists(x=>x.Rpm<0))
+ if (station.PumpSignalRecords.Exists(x => x.Rpm < 0))
{
- continue;
+ continue;
}
-
+
total_flow_list.Add(new TimeValue(time, total_flow));
pump_total_flow_list.Add(new TimeValue(time, pump_total_flow));
@@ -189,15 +189,15 @@
//}
#endregion
}
- this.timeValueSwiftPlotChartView1.SetAxisYTitle("娴侀噺");
- this.timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鎬诲帇鍔�", Color.DarkGray, "鎬诲帇鍔�", "鍘嬪姏", total_pressure_list);
- this.timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鎬荤娴侀噺", Color.Red, "鎬荤娴侀噺", "娴侀噺", total_flow_list);
- this.timeValueSwiftPlotChartView1.AddSwiftPlotSeries("娉垫�绘祦閲�", Color.Blue, "娉垫�绘祦閲�", "娴侀噺", pump_total_flow_list);
- this.timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鍋忓樊娴侀噺", Color.Black, "鍋忓樊娴侀噺", "娴侀噺", diff_flow_list);
+ timeValueSwiftPlotChartView1.SetAxisYTitle("娴侀噺");
+ timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鎬诲帇鍔�", Color.DarkGray, "鎬诲帇鍔�", "鍘嬪姏", total_pressure_list);
+ timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鎬荤娴侀噺", Color.Red, "鎬荤娴侀噺", "娴侀噺", total_flow_list);
+ timeValueSwiftPlotChartView1.AddSwiftPlotSeries("娉垫�绘祦閲�", Color.Blue, "娉垫�绘祦閲�", "娴侀噺", pump_total_flow_list);
+ timeValueSwiftPlotChartView1.AddSwiftPlotSeries("鍋忓樊娴侀噺", Color.Black, "鍋忓樊娴侀噺", "娴侀噺", diff_flow_list);
}
-
+
WaitFrmHelper.HideWaitForm();
}
@@ -211,12 +211,12 @@
{
Task.Run(() =>
{
- this.Invoke(new Action(() =>
+ Invoke(new Action(() =>
{
AlertTool.ShowInfo(Application.OpenForms[0], "鎻愮ず", "寮�濮嬫暣鍚堬紒");
}));
var packets = _bll.AnalysisAndSave(_monitorDataSources.ID, _station.ID, timeStep);
- this.Invoke(new Action(() =>
+ Invoke(new Action(() =>
{
SetBindingData(packets);
AlertTool.ShowInfo(Application.OpenForms[0], "鎻愮ず", "鏁村悎瀹屾垚锛�");
@@ -233,7 +233,7 @@
{
SetBindingData(_monitorDataSources, _station);
}
-
+
#region 鑿滃崟
@@ -241,7 +241,7 @@
private void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
InitialDataSource();
- }
+ }
#endregion
--
Gitblit v1.9.3