状态显示调整

lixiaojun

2024-10-12 dd4fa076e58b00f46118928bbdaf38f7593544b4

状态显示调整

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/XhsProjectSimulationPropertyCtrl.cs

@@ -1,4 +1,5 @@
using HStation.WinFrmUI.Xhs;
using HStation.WinFrmUI.PhartRelation;
using HStation.WinFrmUI.Xhs;

namespace HStation.WinFrmUI
{
@@ -11,12 +12,15 @@
        {
            InitializeComponent();

            this.hydroParterPropertyCtrl1.ViewCurveEvent += HydroParterPropertyCtrl1_ViewCurveEvent;
            this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
            this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
            this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
            this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
            this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
        }



        //水力信息方法
        private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
@@ -27,6 +31,7 @@
        public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
        {
            _hydroInfoFunc = hydroInfoFunc;
            this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
        }

        /// <summary>
@@ -86,6 +91,41 @@
            this.hydroParterPropertyCtrl1.UpdateRows();
        }

        //查看曲线
        private void HydroParterPropertyCtrl1_ViewCurveEvent(Yw.Model.HydroParterInfo parterInfo, string curveType)
        {
            var hydroInfo = _hydroInfoFunc?.Invoke();
            if (hydroInfo == null)
            {
                return;
            }
            switch (curveType)
            {
                case Yw.WinFrmUI.HydroCurve.Pump:
                    {
                        var pumpInfo = parterInfo as Yw.Model.HydroPumpInfo;
                        var curveqh = hydroInfo.Curves?.Find(x => x.Code == pumpInfo.CurveQH);
                        if (curveqh == null)
                        {
                            return;
                        }
                        var pumpId = string.IsNullOrEmpty(pumpInfo.DbId) ? 0 : Convert.ToInt64(pumpInfo.DbId);
                        var curveId = string.IsNullOrEmpty(curveqh.DbId) ? 0 : Convert.ToInt64(curveqh.DbId);
                        var speedRatio = pumpInfo.SpeedRatio ?? 1;
                        var dlg = new PumpPerform2dViewDlg();
                        dlg.SetBindingData(pumpId, curveId, speedRatio);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.WinFrmUI.HydroCurve.Valve:
                    {

                    }
                    break;
                default: break;
            }
        }

        //选择曲线
        private bool HydroParterPropertyCtrl1_SetCurveEvent(HydroParterPropertyViewModel propViewModel, string curveType)
        {

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterInfoUpdateExtensions.cs

@@ -211,7 +211,7 @@
                    hydroLinkInfo.UpdatePropStatus(nameof(hydroLinkInfo.StartCode), hydroLinkPropertyViewModel, nameof(hydroLinkPropertyViewModel.StartCode));
                    hydroLinkInfo.EndCode = hydroLinkPropertyViewModel.EndCode;
                    hydroLinkInfo.UpdatePropStatus(nameof(hydroLinkInfo.EndCode), hydroLinkPropertyViewModel, nameof(hydroLinkPropertyViewModel.EndCode));
                    hydroLinkInfo.LinkStatus = hydroLinkPropertyViewModel.LinkStatus;
                    hydroLinkInfo.LinkStatus = HydroLinkStatusHelper.GetStatusCode(hydroLinkPropertyViewModel.LinkStatus);
                    hydroLinkInfo.UpdatePropStatus(nameof(hydroLinkInfo.LinkStatus), hydroLinkPropertyViewModel, nameof(hydroLinkPropertyViewModel.LinkStatus));
                }
            }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/00-core/HydroLinkPropertyViewModel.cs

@@ -21,7 +21,7 @@
            this.UpdatePropStatus(nameof(this.StartCode), rhs, nameof(rhs.StartCode));
            this.EndCode = rhs.EndCode;
            this.UpdatePropStatus(nameof(this.EndCode), rhs, nameof(rhs.EndCode));
            this.LinkStatus = rhs.LinkStatus;
            this.LinkStatus = HydroLinkStatusHelper.GetStatusName(rhs.LinkStatus);
            this.UpdatePropStatus(nameof(this.LinkStatus), rhs, nameof(rhs.LinkStatus));
        }

@@ -104,7 +104,7 @@
                this.UpdatePropStatus(nameof(this.StartCode), hydroLinkInfo, nameof(hydroLinkInfo.StartCode));
                this.EndCode = hydroLinkInfo.EndCode;
                this.UpdatePropStatus(nameof(this.EndCode), hydroLinkInfo, nameof(hydroLinkInfo.EndCode));
                this.LinkStatus = hydroLinkInfo.LinkStatus;
                this.LinkStatus = HydroLinkStatusHelper.GetStatusName(hydroLinkInfo.LinkStatus);
                this.UpdatePropStatus(nameof(this.LinkStatus), hydroLinkInfo, nameof(hydroLinkInfo.LinkStatus));
            }
        }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-converter/HydroPipeStatusConverter.cs

@@ -22,9 +22,9 @@
        {
            var list = new List<string>
            {
                PipeStatus.Open,
                PipeStatus.Closed,
                PipeStatus.CV
                HydroLinkStatusHelper.GetStatusName(PipeStatus.Open),
                HydroLinkStatusHelper.GetStatusName(PipeStatus.Closed),
                HydroLinkStatusHelper.GetStatusName(PipeStatus.CV)
            };
            return new StandardValuesCollection(list);
        }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-converter/HydroPumpStatusConverter.cs

@@ -22,8 +22,8 @@
        {
            var list = new List<string>
            {
                PumpStatus.Open,
                PumpStatus.Closed
                HydroLinkStatusHelper.GetStatusName(PumpStatus.Open),
                HydroLinkStatusHelper.GetStatusName(PumpStatus.Closed)
            };
            return new StandardValuesCollection(list);
        }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/03-converter/HydroValveStatusConverter.cs

@@ -22,9 +22,9 @@
        {
            var list = new List<string>
            {
                ValveStatus.None,
                ValveStatus.Open,
                ValveStatus.Closed
                HydroLinkStatusHelper.GetStatusName(ValveStatus.None),
                HydroLinkStatusHelper.GetStatusName(ValveStatus.Open),
                HydroLinkStatusHelper.GetStatusName(ValveStatus.Closed)
            };
            return new StandardValuesCollection(list);
        }