From 725f20b576bdd40d57d9a1e806ce3f6f39181a84 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 09 十二月 2024 17:54:57 +0800
Subject: [PATCH] 文件梳理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs
index a489040..0e9d62c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs
@@ -58,7 +58,7 @@
var vm = CreateViewModel();
if (vm != null)
{
- this.pumpVariableSpeedViewChart1.SetBindingData(vm);
+ this.pumpRunViewChart1.SetBindingData(vm);
}
}
@@ -69,12 +69,12 @@
var vm = CreateViewModel();
if (vm != null)
{
- this.pumpVariableSpeedViewChart1.SetBindingData(vm);
+ this.pumpRunViewChart1.SetBindingData(vm);
}
}
//鍒涘缓
- private PumpVariableSpeedViewViewModel CreateViewModel()
+ private PumpRunViewViewModel CreateViewModel()
{
if (_hydroInfo == null)
{
@@ -84,7 +84,7 @@
{
return default;
}
- var vm = new PumpVariableSpeedViewViewModel();
+ var vm = new PumpRunViewViewModel();
vm.Id = _pumpInfo.Code;
vm.Name = _pumpInfo.Name;
vm.CurveName = $"棰濆畾鏇茬嚎({_pumpInfo.RatedHz}hz)";
@@ -93,6 +93,7 @@
vm.RatedP = _pumpInfo.RatedP;
vm.RatedN = _pumpInfo.RatedN.HasValue ? _pumpInfo.RatedN.Value : 0;
vm.RatedHz = _pumpInfo.RatedHz;
+ vm.Color = Color.LightGray;
var curveqh = _hydroInfo.Curves?.Find(x => x.Code == _pumpInfo.CurveQH);
if (curveqh != null)
@@ -126,7 +127,7 @@
if (_workingList != null && _workingList.Count > 0)
{
- vm.Items = new List<PumpVariableSpeedViewItemViewModel>();
+ vm.Items = new List<PumpRunViewItemViewModel>();
foreach (var working in _workingList)
{
var workingInfo = JsonHelper.Json2Object<HydroWorkingInfoViewModel>(working.WorkingInfo);
@@ -135,11 +136,12 @@
var workingPumpInfo = workingInfo.Pumps.Find(x => x.Code == _pumpInfo.Code);
if (workingPumpInfo != null)
{
- var vmItem = new PumpVariableSpeedViewItemViewModel();
+ var vmItem = new PumpRunViewItemViewModel();
vm.Items.Add(vmItem);
vmItem.Id = working.ID.ToString();
vmItem.Name = working.Name;
vmItem.Hz = workingPumpInfo.CurrentHz;
+ vmItem.Color = HydroPumpCurveColorHelper.GetRandomColor(_workingList.IndexOf(working));
if (_pumpInfo.RatedN.HasValue)
{
var speedRatio = workingPumpInfo.CurrentHz / _pumpInfo.RatedHz;
--
Gitblit v1.9.3