From e08f18c84c96ca794407f4fcb737b26fa76c0a1f Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 11 六月 2024 09:35:03 +0800
Subject: [PATCH] 改了配置类
---
WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoManuCtrl.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoManuCtrl.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoManuCtrl.cs
index a3dae0a..3d1bc90 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoManuCtrl.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/AnaResult/AnaResultInfoManuCtrl.cs
@@ -172,19 +172,19 @@
double sumPower = 0;
double sumMoney = 0;
- var _realTimeDataList = _current_anaPrj.PointTimes;
- for (int i = 0; i < _realTimeDataList.Count; i++)
+ var allTime = _current_anaPrj.GetAllPointTimeList();
+ for (int i = 0; i < allTime.Count; i++)
{
- var time = _realTimeDataList[i].Time;
+ var time = allTime[i].Time;
series绱娴侀噺.Points.Add(new SeriesPoint(time, new double[] { sumFlow }));
series绱鐢甸噺.Points.Add(new SeriesPoint(time, new double[] { sumPower }));
series绱鐢佃垂.Points.Add(new SeriesPoint(time, new double[] { sumMoney }));
- series鐢ㄦ按閲�.Points.Add(new SeriesPoint(time, new double[] { _realTimeDataList[i].ReservoirDropFlowTotal }));
+ series鐢ㄦ按閲�.Points.Add(new SeriesPoint(time, new double[] { allTime[i].ReservoirDropFlowTotal }));
- sumFlow += _realTimeDataList[i].SumFlow;
- sumPower += _realTimeDataList[i].SumPower;
- sumMoney += _realTimeDataList[i].SumMoney;
+ sumFlow += allTime[i].SumFlow;
+ sumPower += allTime[i].SumPower;
+ sumMoney += allTime[i].SumMoney;
}
@@ -229,9 +229,10 @@
{
IStation.CalcModel.AnaPrjPointTime max_level = null;
IStation.CalcModel.AnaPrjPointTime min_level = null;
- for (int i = 0; i < anaPrj.PointTimes.Count; i++)
+ var allTime = anaPrj.GetAllPointTimeList();
+ for (int i = 0; i < allTime.Count; i++)
{
- var sd = anaPrj.PointTimes[i];
+ var sd = allTime[i];
if (max_level == null || max_level.WaterLevelH < sd.WaterLevelH)
{
max_level = sd;
@@ -286,7 +287,7 @@
- BuildRealTimeDataList(_current_anaPrj.PointTimes);
+ BuildRealTimeDataList(_current_anaPrj.GetAllPointTimeList());
@@ -564,7 +565,7 @@
list_draws.Add(sss_start);
g.DrawString(sss_start, font鏃堕棿, brushText鏃堕棿, new Point(pt1.Point.X - 20, pt1.Point.Y - height - 19));
- var pt = _current_anaPrj.FingPointTime(item.StartTime);
+ var pt = _current_anaPrj.FindPointTime(item.StartTime);
if (pt != null)
{
g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2) ), font姘翠綅, brushText鏃堕棿, new Point(pt1.Point.X - 20, pt1.Point.Y + 5));
@@ -580,7 +581,7 @@
list_draws.Add(sss_end);
g.DrawString(sss_end, font鏃堕棿, brushText鏃堕棿, new Point(pt2.Point.X - 20, pt1.Point.Y - height - 19));
- var pt = _current_anaPrj.FingPointTime(item.EndTime);
+ var pt = _current_anaPrj.FindPointTime(item.EndTime);
if (pt != null)
{
g.DrawString(string.Format("{0}m", Math.Round(pt.WaterLevelH, 2)), font姘翠綅, brushText鏃堕棿, new Point(pt2.Point.X - 20, pt2.Point.Y + 5));
--
Gitblit v1.9.3