WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.Designer.cs
@@ -32,7 +32,7 @@ hydroWorkingCheckedListHorizCtrl1 = new HydroWorkingCheckedListHorizCtrl(); hydroPumpListViewCtrl1 = new HydroPumpListViewCtrl(); panelControl1 = new PanelControl(); pumpVariableSpeedViewChart1 = new Yw.WinFrmUI.Phart.PumpVariableSpeedViewChart(); pumpVariableSpeedViewChart1 = new Yw.WinFrmUI.Phart.PumpRunViewChart(); Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -198,7 +198,7 @@ private HydroWorkingCheckedListHorizCtrl hydroWorkingCheckedListHorizCtrl1; private HydroPumpListViewCtrl hydroPumpListViewCtrl1; private PanelControl panelControl1; private Yw.WinFrmUI.Phart.PumpVariableSpeedViewChart pumpVariableSpeedViewChart1; private Yw.WinFrmUI.Phart.PumpRunViewChart pumpVariableSpeedViewChart1; private DevExpress.XtraLayout.LayoutControlGroup Root; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationMultiWorkingPumpAnalyCtrl.cs
@@ -74,7 +74,7 @@ } //å建 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)"; @@ -126,7 +126,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,7 +135,7 @@ 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; WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.Designer.cs
@@ -36,7 +36,7 @@ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); hydroPumpListStateViewCtrl1 = new HydroPumpListStateViewCtrl(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); pumpVariableSpeedViewChart1 = new Yw.WinFrmUI.Phart.PumpVariableSpeedViewChart(); pumpVariableSpeedViewChart1 = new Yw.WinFrmUI.Phart.PumpRunViewChart(); ((ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((ISupportInitialize)panelControl1).BeginInit(); @@ -164,6 +164,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private HydroPumpListStateViewCtrl hydroPumpListStateViewCtrl1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private Yw.WinFrmUI.Phart.PumpVariableSpeedViewChart pumpVariableSpeedViewChart1; private Yw.WinFrmUI.Phart.PumpRunViewChart pumpVariableSpeedViewChart1; } } WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/11-pump/03-analy/SimulationSingleWorkingPumpAnalyCtrl.cs
@@ -57,13 +57,13 @@ } //å建 private PumpVariableSpeedViewViewModel CreateViewModel(Yw.Model.HydroPumpInfo pump) private PumpRunViewViewModel CreateViewModel(Yw.Model.HydroPumpInfo pump) { if (_hydroInfo == null) { return default; } var vm = new PumpVariableSpeedViewViewModel(); var vm = new PumpRunViewViewModel(); vm.Id = pump.Code; vm.Name = pump.Name; vm.CurveName = $"é¢å®æ²çº¿({pump.RatedHz}hz)"; @@ -105,8 +105,8 @@ if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open) { vm.Items = new List<PumpVariableSpeedViewItemViewModel>(); var vmItem = new PumpVariableSpeedViewItemViewModel(); vm.Items = new List<PumpRunViewItemViewModel>(); var vmItem = new PumpRunViewItemViewModel(); vm.Items.Add(vmItem); vmItem.Id = string.Empty; vmItem.Name = "è¿è¡"; WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/03-variable-speed/PumpVariableSpeedChart.cs
@@ -1,8 +1,6 @@ using DevExpress.Utils; using DevExpress.Utils.Drawing; using DevExpress.XtraCharts; using System.Text; using Yw.Geometry; namespace Yw.WinFrmUI.Phart { WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-run-view/PumpRunViewChart.Designer.cs
ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-variable-speed-view/PumpVariableSpeedViewChart.Designer.cs ÐÞ¸Ä @@ -1,6 +1,6 @@ namespace Yw.WinFrmUI.Phart { partial class PumpVariableSpeedViewChart partial class PumpRunViewChart { /// <summary> /// Requipuired designer variable. @@ -42,7 +42,7 @@ DevExpress.XtraCharts.SplineSeriesView splineSeriesView2 = new DevExpress.XtraCharts.SplineSeriesView(); DevExpress.XtraCharts.Series series3 = new DevExpress.XtraCharts.Series(); DevExpress.XtraCharts.SplineSeriesView splineSeriesView3 = new DevExpress.XtraCharts.SplineSeriesView(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PumpVariableSpeedViewChart)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PumpRunViewChart)); chartControl1 = new DevExpress.XtraCharts.ChartControl(); barBtnSetChartAxis = new DevExpress.XtraBars.BarButtonItem(); barCekCurveQEVisible = new DevExpress.XtraBars.BarCheckItem(); WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-run-view/PumpRunViewChart.cs
ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-variable-speed-view/PumpVariableSpeedViewChart.cs ÐÞ¸Ä @@ -5,11 +5,11 @@ namespace Yw.WinFrmUI.Phart { /// <summary> /// æ³µåéè§å¾å¾è¡¨ /// æ³µè¿è¡è§å¾å¾è¡¨ /// </summary> public partial class PumpVariableSpeedViewChart : DevExpress.XtraEditors.XtraUserControl public partial class PumpRunViewChart : DevExpress.XtraEditors.XtraUserControl { public PumpVariableSpeedViewChart() public PumpRunViewChart() { InitializeComponent(); InitialChart(); @@ -36,7 +36,7 @@ private bool _initial_data = false; private PumpVariableSpeedViewViewModel _vm = null; private PumpRunViewViewModel _vm = null; #endregion @@ -141,7 +141,7 @@ /// <summary> /// ç»å®æ°æ® /// </summary> public void SetBindingData(PumpVariableSpeedViewViewModel vm) public void SetBindingData(PumpRunViewViewModel vm) { _vm = vm; _initial_data = vm != null; @@ -416,7 +416,7 @@ this.chartControl1.Legend.CustomItems.Clear(); if (_vm != null) { { if (_vm.Items == null || !_vm.Items.Any()) { CreateLineSeries(_vm.Id, _vm.Color, _vm.Name, _vm.CurveQH, _vm.CurveQE, _vm.CurveQP); @@ -429,14 +429,14 @@ CreateLineSeries(_vm.Id, _vm.Color, _vm.Name, _vm.CurveQH, _vm.CurveQE, _vm.CurveQP); for (int i = 0; i < _vm.Items.Count; i++) { var vm = _vm.Items[i]; var vm = _vm.Items[i]; CreateCurrentLineSeries(vm.Id, vm.Color, vm.CurveName, vm.CurveQH, vm.CurveQE, vm.CurveQP); } } } } this.chartControl1.EndInit(); this.chartControl1.EndInit(); }
WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-run-view/PumpRunViewItemViewModel.cs
ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-variable-speed-view/PumpVariableSpeedViewItemViewModel.cs ÐÞ¸Ä @@ -1,12 +1,12 @@ namespace Yw.WinFrmUI.Phart { /// <summary> /// æ³µåé Item ViewModel /// æ³µè¿è¡è§å¾ Item ViewModel /// </summary> public class PumpVariableSpeedViewItemViewModel public class PumpRunViewItemViewModel { public PumpVariableSpeedViewItemViewModel() { } public PumpVariableSpeedViewItemViewModel(PumpVariableSpeedViewItemViewModel rhs) public PumpRunViewItemViewModel() { } public PumpRunViewItemViewModel(PumpRunViewItemViewModel rhs) { this.Id = rhs.Id; this.Name = rhs.Name; WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-run-view/PumpRunViewViewModel.cs
ÎļþÃû´Ó WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/01-single/04-variable-speed-view/PumpVariableSpeedViewViewModel.cs ÐÞ¸Ä @@ -1,12 +1,12 @@ namespace Yw.WinFrmUI.Phart { /// <summary> /// æ³µåéViewModel /// æ³µè¿è¡è§å¾ViewModel /// </summary> public class PumpVariableSpeedViewViewModel public class PumpRunViewViewModel { public PumpVariableSpeedViewViewModel() { } public PumpVariableSpeedViewViewModel(PumpVariableSpeedViewViewModel rhs) public PumpRunViewViewModel() { } public PumpRunViewViewModel(PumpRunViewViewModel rhs) { this.Id = rhs.Id; this.Name = rhs.Name; @@ -89,7 +89,7 @@ /// <summary> /// åé项å表 /// </summary> public List<PumpVariableSpeedViewItemViewModel> Items { get; set; } public List<PumpRunViewItemViewModel> Items { get; set; } } } WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj.user
@@ -44,7 +44,7 @@ <Compile Update="01-pump\01-single\02-operation\PumpOperationChart.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="01-pump\01-single\04-variable-speed-view\PumpVariableSpeedViewChart.cs"> <Compile Update="01-pump\01-single\04-run-view\PumpRunViewChart.cs"> <SubType>UserControl</SubType> </Compile> <Compile Update="01-pump\01-single\09-edit\InputXYDlg.cs">
