优化流量计、压力表小数位数

lixiaojun

2024-10-28 393c5a292f0d76545734928ffda9e8aed4223afc

优化流量计、压力表小数位数

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs

@@ -27,8 +27,8 @@
        [Category("数据")]
        [DisplayName("初始水质")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public double Quality { get; set; }
        [Browsable(false)]
        public virtual double Quality { get; set; }

        /// <summary>
        /// 自由压力
@@ -40,7 +40,7 @@
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuPress { get; set; }
        public virtual double? CalcuPress { get; set; }

        /// <summary>
        /// 绝对压力
@@ -52,7 +52,7 @@
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuHead { get; set; }
        public virtual double? CalcuHead { get; set; }

        /// <summary>
        /// 需水量
@@ -64,7 +64,7 @@
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuDemand { get; set; }
        public virtual double? CalcuDemand { get; set; }

        /// <summary>
        /// 更新属性

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/00-core/HydroJunctionPropertyViewModel.cs

@@ -36,36 +36,36 @@
        [PropertyOrder(101)]
        [DisplayUnit("m")]
        [Browsable(true)]
        public double Elev { get; set; }
        public virtual double Elev { get; set; }

        /// <summary>
        /// 损失系数
        /// </summary>
        [Category("数据")]
        [DisplayName("损失系数")]
        [PropertyOrder(33)]
        [PropertyOrder(102)]
        [Browsable(true)]
        public double? MinorLoss { get; set; }
        public virtual double? MinorLoss { get; set; }

        /// <summary>
        /// 需水量
        /// </summary>
        [Category("数据")]
        [DisplayName("需水量")]
        [PropertyOrder(102)]
        [PropertyOrder(103)]
        [DisplayUnit("m³/h")]
        [Browsable(true)]
        public double? Demand { get; set; }
        [Browsable(false)]
        public virtual double? Demand { get; set; }

        /// <summary>
        /// 需水模式
        /// </summary>
        [Category("数据")]
        [DisplayName("需水模式")]
        [PropertyOrder(103)]
        [PropertyOrder(104)]
        [IsHydroPatternPro(HydroPattern.Demand)]
        [Browsable(true)]
        public string DemandPattern { get; set; }
        [Browsable(false)]
        public virtual string DemandPattern { get; set; }

        /// <summary>
        /// 更新属性

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/02-flowmeter/HydroFlowmeterPropertyViewModel.cs

@@ -17,7 +17,7 @@
        /// </summary>
        public HydroFlowmeterPropertyViewModel(Yw.Model.HydroFlowmeterInfo rhs) : base(rhs)
        {
            this.CurrentFlow = rhs.CurrentFlow;
            this.CurrentFlow = rhs.CurrentFlow.HasValue ? Math.Round(rhs.CurrentFlow.Value, 1) : null;
            this.UpdatePropStatus(nameof(this.CurrentFlow), rhs, nameof(rhs.CurrentFlow));
        }

@@ -27,11 +27,48 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("流量")]
        [DisplayUnit("m³/h")]
        [PropertyOrder(1001)]
        [Browsable(true)]
        public double? CurrentFlow { get; set; }

        /// <summary>
        /// 自由压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(10001)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuPress { get; set; }

        /// <summary>
        /// 绝对压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(10002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuHead { get; set; }

        /// <summary>
        /// 需水量
        /// </summary>
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(10003)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuDemand { get; set; }

        /// <summary>
        /// 流量
        /// </summary>
        [Category("计算结果")]

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/03-other/03-pressmeter/HydroPressmeterPropertyViewModel.cs

@@ -17,7 +17,7 @@
        /// </summary>
        public HydroPressmeterPropertyViewModel(Yw.Model.HydroPressmeterInfo rhs) : base(rhs)
        {
            this.CurrentPress = rhs.CurrentPress;
            this.CurrentPress = rhs.CurrentPress.HasValue ? Math.Round(rhs.CurrentPress.Value, 2) : null;
            this.UpdatePropStatus(nameof(this.CurrentPress), rhs, nameof(rhs.CurrentPress));
        }

@@ -26,11 +26,48 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("压力")]
        [DisplayUnit("m")]
        [PropertyOrder(1001)]
        [Browsable(true)]
        public double? CurrentPress { get; set; }

        /// <summary>
        /// 自由压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(10001)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuPress { get; set; }

        /// <summary>
        /// 绝对压力
        /// </summary>
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(10002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuHead { get; set; }

        /// <summary>
        /// 需水量
        /// </summary>
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(10003)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(false)]
        public override double? CalcuDemand { get; set; }

        /// <summary>
        /// 压力
        /// </summary>
        [Category("计算结果")]

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/00-core/HydroJunctionViewModel.cs

@@ -15,7 +15,7 @@
        /// </summary>
        public HydroJunctionViewModel(Yw.Model.HydroJunctionInfo rhs) : base(rhs)
        {
            this.Elev = Math.Round(rhs.Elev, 4);
            this.Elev = Math.Round(rhs.Elev, 2);
            this.MinorLoss = rhs.MinorLoss;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;
@@ -28,7 +28,7 @@
        /// </summary>
        public HydroJunctionViewModel(Yw.Model.HydroJunctionInfo rhs, Yw.WinFrmUI.HydroCalcuNodeResult calcuResult) : base(rhs, calcuResult)
        {
            this.Elev = Math.Round(rhs.Elev, 4);
            this.Elev = Math.Round(rhs.Elev, 2);
            this.MinorLoss = rhs.MinorLoss;
            this.Demand = rhs.Demand;
            this.DemandPattern = rhs.DemandPattern;

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/02-flowmeter/HydroFlowmeterListCtrl.Designer.cs

@@ -36,17 +36,13 @@
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlagsString = new DevExpress.XtraGrid.Columns.GridColumn();
            colQuality = new DevExpress.XtraGrid.Columns.GridColumn();
            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemandPattern = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colCurrentFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuQ = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlagsString = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroFlowmeterViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -59,7 +55,7 @@
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(1464, 594);
            gridControl1.Size = new Size(1061, 538);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -69,7 +65,7 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colQuality, colElev, colMinorLoss, colDemand, colDemandPattern, colCalcuPress, colCalcuHead, colCalcuDemand, colFlagsString, colDescription });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colElev, colMinorLoss, colCurrentFlow, colCalcuQ, colFlagsString, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsFind.AlwaysVisible = true;
@@ -92,7 +88,7 @@
            colCode.MinWidth = 100;
            colCode.Name = "colCode";
            colCode.Visible = true;
            colCode.VisibleIndex = 1;
            colCode.VisibleIndex = 2;
            colCode.Width = 100;
            // 
            // colName
@@ -102,7 +98,7 @@
            colName.MinWidth = 100;
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 2;
            colName.VisibleIndex = 1;
            colName.Width = 100;
            // 
            // colModelType
@@ -115,25 +111,15 @@
            colModelType.VisibleIndex = 3;
            colModelType.Width = 100;
            // 
            // colFlagsString
            // colHasDb
            // 
            colFlagsString.FieldName = "FlagsString";
            colFlagsString.MaxWidth = 200;
            colFlagsString.MinWidth = 100;
            colFlagsString.Name = "colFlagsString";
            colFlagsString.Visible = true;
            colFlagsString.VisibleIndex = 13;
            colFlagsString.Width = 100;
            // 
            // colQuality
            // 
            colQuality.FieldName = "Quality";
            colQuality.MaxWidth = 100;
            colQuality.MinWidth = 100;
            colQuality.Name = "colQuality";
            colQuality.Visible = true;
            colQuality.VisibleIndex = 5;
            colQuality.Width = 100;
            colHasDb.FieldName = "HasDb";
            colHasDb.MaxWidth = 60;
            colHasDb.MinWidth = 60;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 8;
            colHasDb.Width = 60;
            // 
            // colElev
            // 
@@ -142,77 +128,8 @@
            colElev.MinWidth = 100;
            colElev.Name = "colElev";
            colElev.Visible = true;
            colElev.VisibleIndex = 6;
            colElev.VisibleIndex = 4;
            colElev.Width = 100;
            // 
            // colDemand
            // 
            colDemand.FieldName = "Demand";
            colDemand.MaxWidth = 100;
            colDemand.MinWidth = 100;
            colDemand.Name = "colDemand";
            colDemand.Visible = true;
            colDemand.VisibleIndex = 8;
            colDemand.Width = 100;
            // 
            // colDemandPattern
            // 
            colDemandPattern.FieldName = "DemandPattern";
            colDemandPattern.MaxWidth = 100;
            colDemandPattern.MinWidth = 100;
            colDemandPattern.Name = "colDemandPattern";
            colDemandPattern.Visible = true;
            colDemandPattern.VisibleIndex = 9;
            colDemandPattern.Width = 100;
            // 
            // colCalcuPress
            // 
            colCalcuPress.FieldName = "CalcuPress";
            colCalcuPress.MaxWidth = 100;
            colCalcuPress.MinWidth = 100;
            colCalcuPress.Name = "colCalcuPress";
            colCalcuPress.Visible = true;
            colCalcuPress.VisibleIndex = 10;
            colCalcuPress.Width = 100;
            // 
            // colCalcuHead
            // 
            colCalcuHead.FieldName = "CalcuHead";
            colCalcuHead.MaxWidth = 100;
            colCalcuHead.MinWidth = 100;
            colCalcuHead.Name = "colCalcuHead";
            colCalcuHead.Visible = true;
            colCalcuHead.VisibleIndex = 11;
            colCalcuHead.Width = 100;
            // 
            // colCalcuDemand
            // 
            colCalcuDemand.FieldName = "CalcuDemand";
            colCalcuDemand.MaxWidth = 100;
            colCalcuDemand.MinWidth = 100;
            colCalcuDemand.Name = "colCalcuDemand";
            colCalcuDemand.Visible = true;
            colCalcuDemand.VisibleIndex = 12;
            colCalcuDemand.Width = 100;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 14;
            colDescription.Width = 100;
            // 
            // colHasDb
            // 
            colHasDb.FieldName = "HasDb";
            colHasDb.MaxWidth = 60;
            colHasDb.MinWidth = 60;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 4;
            colHasDb.Width = 60;
            // 
            // colMinorLoss
            // 
@@ -221,8 +138,47 @@
            colMinorLoss.MinWidth = 100;
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 7;
            colMinorLoss.VisibleIndex = 5;
            colMinorLoss.Width = 100;
            // 
            // colCurrentFlow
            // 
            colCurrentFlow.FieldName = "CurrentFlow";
            colCurrentFlow.MaxWidth = 100;
            colCurrentFlow.MinWidth = 100;
            colCurrentFlow.Name = "colCurrentFlow";
            colCurrentFlow.Visible = true;
            colCurrentFlow.VisibleIndex = 6;
            colCurrentFlow.Width = 100;
            // 
            // colCalcuQ
            // 
            colCalcuQ.FieldName = "CalcuQ";
            colCalcuQ.MaxWidth = 100;
            colCalcuQ.MinWidth = 100;
            colCalcuQ.Name = "colCalcuQ";
            colCalcuQ.Visible = true;
            colCalcuQ.VisibleIndex = 7;
            colCalcuQ.Width = 100;
            // 
            // colFlagsString
            // 
            colFlagsString.FieldName = "FlagsString";
            colFlagsString.MaxWidth = 200;
            colFlagsString.MinWidth = 100;
            colFlagsString.Name = "colFlagsString";
            colFlagsString.Visible = true;
            colFlagsString.VisibleIndex = 9;
            colFlagsString.Width = 100;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 10;
            colDescription.Width = 100;
            // 
            // HydroFlowmeterListCtrl
            // 
@@ -230,7 +186,7 @@
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Name = "HydroFlowmeterListCtrl";
            Size = new Size(1464, 594);
            Size = new Size(1061, 538);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)hydroFlowmeterViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
@@ -244,18 +200,14 @@
        private DevExpress.XtraGrid.Columns.GridColumn colCode;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colFlagsString;
        private DevExpress.XtraGrid.Columns.GridColumn colQuality;
        private DevExpress.XtraGrid.Columns.GridColumn colElev;
        private DevExpress.XtraGrid.Columns.GridColumn colDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colDemandPattern;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private BindingSource hydroFlowmeterViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colModelType;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPress;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuHead;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuQ;
        private DevExpress.XtraGrid.Columns.GridColumn colCurrentFlow;
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/02-flowmeter/HydroFlowmeterListCtrl.cs

@@ -41,7 +41,6 @@
        /// <summary>
        /// 绑定数据
        /// </summary>
        /// <param name="allFlowmeterList"></param>
        public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuResult> allCalcuResultList)
        {
            _allBindingList = new List<HydroFlowmeterViewModel>();
@@ -49,8 +48,8 @@
            {
                foreach (var flowmeter in hydroInfo.Flowmeters)
                {
                    var calcuNodeResult = allCalcuResultList?.Find(x => x.Code == flowmeter.Code) as HydroCalcuNodeResult;
                    var vm = new HydroFlowmeterViewModel(flowmeter, calcuNodeResult);
                    var calcuResult = allCalcuResultList?.Find(x => x.Code == flowmeter.Code) as HydroCalcuFlowmeterResult;
                    var vm = new HydroFlowmeterViewModel(flowmeter, calcuResult);
                    _allBindingList.Add(vm);
                }
            }
@@ -72,18 +71,14 @@
        public void SetSimpleView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = false;
            this.colMinorLoss.Visible = false;
            this.colDemand.Visible = false;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = false;
            this.colCalcuHead.Visible = false;
            this.colCalcuDemand.Visible = false;
            this.colCurrentFlow.Visible = true;
            this.colCalcuQ.Visible = false;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }
@@ -94,18 +89,14 @@
        public void SetNormalView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = true;
            this.colMinorLoss.Visible = true;
            this.colDemand.Visible = true;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = false;
            this.colCalcuHead.Visible = false;
            this.colCalcuDemand.Visible = false;
            this.colCurrentFlow.Visible = true;
            this.colCalcuQ.Visible = false;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }
@@ -116,18 +107,14 @@
        public void SetCalcuView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = true;
            this.colMinorLoss.Visible = true;
            this.colDemand.Visible = true;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = true;
            this.colCalcuHead.Visible = true;
            this.colCalcuDemand.Visible = true;
            this.colCurrentFlow.Visible = true;
            this.colCalcuQ.Visible = true;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }
@@ -142,5 +129,7 @@
            }
            this.HydroClickEvent?.Invoke(row.Vmo);
        }


    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/02-flowmeter/HydroFlowmeterViewModel.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// 
    /// </summary>
    public class HydroFlowmeterViewModel : HydroJunctionViewModel
    public class HydroFlowmeterViewModel : HydroJunctionViewModel, IHydroCalcuFlowmeterResult
    {
        /// <summary>
        /// 
@@ -15,17 +15,35 @@
        /// </summary>
        public HydroFlowmeterViewModel(Yw.Model.HydroFlowmeterInfo rhs) : base(rhs)
        {
            this.CurrentFlow = rhs.CurrentFlow.HasValue ? Math.Round(rhs.CurrentFlow.Value, 1) : null;
            this.Vmo = rhs;
        }

        /// <summary>
        /// 
        /// </summary>
        public HydroFlowmeterViewModel(Yw.Model.HydroFlowmeterInfo rhs, HydroCalcuNodeResult calcuResult) : base(rhs, calcuResult)
        public HydroFlowmeterViewModel(Yw.Model.HydroFlowmeterInfo rhs, HydroCalcuFlowmeterResult calcuResult) : base(rhs, calcuResult)
        {
            this.CurrentFlow = rhs.CurrentFlow.HasValue ? Math.Round(rhs.CurrentFlow.Value, 1) : null;
            if (calcuResult != null)
            {
                this.CalcuQ = calcuResult.CalcuQ.HasValue ? Math.Round(calcuResult.CalcuQ.Value, 1) : null;
            }

            this.Vmo = rhs;
        }

        /// <summary>
        /// 流量
        /// </summary>
        [DisplayName("流量(m³/h)")]
        public double? CurrentFlow { get; set; }

        /// <summary>
        /// 计算流量
        /// </summary>
        [DisplayName("计算流量(m³/h)")]
        public double? CalcuQ { get; set; }

        /// <summary>
        /// 

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterListCtrl.Designer.cs

@@ -36,17 +36,13 @@
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlagsString = new DevExpress.XtraGrid.Columns.GridColumn();
            colQuality = new DevExpress.XtraGrid.Columns.GridColumn();
            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colDemandPattern = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
            colElev = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colCalcuPr = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlagsString = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colCurrentPress = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroPressmeterViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -59,7 +55,7 @@
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(1386, 597);
            gridControl1.Size = new Size(1088, 547);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -69,7 +65,7 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colQuality, colElev, colMinorLoss, colDemand, colDemandPattern, colCalcuPress, colCalcuHead, colCalcuDemand, colFlagsString, colDescription });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colHasDb, colElev, colMinorLoss, colCurrentPress, colCalcuPr, colFlagsString, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsFind.AlwaysVisible = true;
@@ -92,7 +88,7 @@
            colCode.MinWidth = 100;
            colCode.Name = "colCode";
            colCode.Visible = true;
            colCode.VisibleIndex = 1;
            colCode.VisibleIndex = 2;
            colCode.Width = 100;
            // 
            // colName
@@ -102,7 +98,7 @@
            colName.MinWidth = 100;
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 2;
            colName.VisibleIndex = 1;
            colName.Width = 100;
            // 
            // colModelType
@@ -115,25 +111,15 @@
            colModelType.VisibleIndex = 3;
            colModelType.Width = 100;
            // 
            // colFlagsString
            // colHasDb
            // 
            colFlagsString.FieldName = "FlagsString";
            colFlagsString.MaxWidth = 200;
            colFlagsString.MinWidth = 100;
            colFlagsString.Name = "colFlagsString";
            colFlagsString.Visible = true;
            colFlagsString.VisibleIndex = 13;
            colFlagsString.Width = 100;
            // 
            // colQuality
            // 
            colQuality.FieldName = "Quality";
            colQuality.MaxWidth = 100;
            colQuality.MinWidth = 100;
            colQuality.Name = "colQuality";
            colQuality.Visible = true;
            colQuality.VisibleIndex = 5;
            colQuality.Width = 100;
            colHasDb.FieldName = "HasDb";
            colHasDb.MaxWidth = 60;
            colHasDb.MinWidth = 60;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 8;
            colHasDb.Width = 60;
            // 
            // colElev
            // 
@@ -142,58 +128,38 @@
            colElev.MinWidth = 100;
            colElev.Name = "colElev";
            colElev.Visible = true;
            colElev.VisibleIndex = 6;
            colElev.VisibleIndex = 4;
            colElev.Width = 100;
            // 
            // colDemand
            // colMinorLoss
            // 
            colDemand.FieldName = "Demand";
            colDemand.MaxWidth = 100;
            colDemand.MinWidth = 100;
            colDemand.Name = "colDemand";
            colDemand.Visible = true;
            colDemand.VisibleIndex = 8;
            colDemand.Width = 100;
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.MaxWidth = 100;
            colMinorLoss.MinWidth = 100;
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 5;
            colMinorLoss.Width = 100;
            // 
            // colDemandPattern
            // colCalcuPr
            // 
            colDemandPattern.FieldName = "DemandPattern";
            colDemandPattern.MaxWidth = 100;
            colDemandPattern.MinWidth = 100;
            colDemandPattern.Name = "colDemandPattern";
            colDemandPattern.Visible = true;
            colDemandPattern.VisibleIndex = 9;
            colDemandPattern.Width = 100;
            colCalcuPr.FieldName = "CalcuPr";
            colCalcuPr.MaxWidth = 100;
            colCalcuPr.MinWidth = 100;
            colCalcuPr.Name = "colCalcuPr";
            colCalcuPr.Visible = true;
            colCalcuPr.VisibleIndex = 7;
            colCalcuPr.Width = 100;
            // 
            // colCalcuPress
            // colFlagsString
            // 
            colCalcuPress.FieldName = "CalcuPress";
            colCalcuPress.MaxWidth = 100;
            colCalcuPress.MinWidth = 100;
            colCalcuPress.Name = "colCalcuPress";
            colCalcuPress.Visible = true;
            colCalcuPress.VisibleIndex = 10;
            colCalcuPress.Width = 100;
            // 
            // colCalcuHead
            // 
            colCalcuHead.FieldName = "CalcuHead";
            colCalcuHead.MaxWidth = 100;
            colCalcuHead.MinWidth = 100;
            colCalcuHead.Name = "colCalcuHead";
            colCalcuHead.Visible = true;
            colCalcuHead.VisibleIndex = 11;
            colCalcuHead.Width = 100;
            // 
            // colCalcuDemand
            // 
            colCalcuDemand.FieldName = "CalcuDemand";
            colCalcuDemand.MaxWidth = 100;
            colCalcuDemand.MinWidth = 100;
            colCalcuDemand.Name = "colCalcuDemand";
            colCalcuDemand.Visible = true;
            colCalcuDemand.VisibleIndex = 12;
            colCalcuDemand.Width = 100;
            colFlagsString.FieldName = "FlagsString";
            colFlagsString.MaxWidth = 200;
            colFlagsString.MinWidth = 100;
            colFlagsString.Name = "colFlagsString";
            colFlagsString.Visible = true;
            colFlagsString.VisibleIndex = 9;
            colFlagsString.Width = 100;
            // 
            // colDescription
            // 
@@ -201,25 +167,18 @@
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 14;
            colDescription.VisibleIndex = 10;
            colDescription.Width = 100;
            // 
            // colHasDb
            // colCurrentPress
            // 
            colHasDb.FieldName = "HasDb";
            colHasDb.MaxWidth = 60;
            colHasDb.MinWidth = 60;
            colHasDb.Name = "colHasDb";
            colHasDb.Visible = true;
            colHasDb.VisibleIndex = 4;
            colHasDb.Width = 60;
            // 
            // colMinorLoss
            // 
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 7;
            colCurrentPress.FieldName = "CurrentPress";
            colCurrentPress.MaxWidth = 100;
            colCurrentPress.MinWidth = 100;
            colCurrentPress.Name = "colCurrentPress";
            colCurrentPress.Visible = true;
            colCurrentPress.VisibleIndex = 6;
            colCurrentPress.Width = 100;
            // 
            // HydroPressmeterListCtrl
            // 
@@ -227,7 +186,7 @@
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Name = "HydroPressmeterListCtrl";
            Size = new Size(1386, 597);
            Size = new Size(1088, 547);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)hydroPressmeterViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
@@ -241,18 +200,14 @@
        private DevExpress.XtraGrid.Columns.GridColumn colCode;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colFlagsString;
        private DevExpress.XtraGrid.Columns.GridColumn colQuality;
        private DevExpress.XtraGrid.Columns.GridColumn colElev;
        private DevExpress.XtraGrid.Columns.GridColumn colDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colDemandPattern;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private BindingSource hydroPressmeterViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colModelType;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPress;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuHead;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
        private DevExpress.XtraGrid.Columns.GridColumn colHasDb;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPr;
        private DevExpress.XtraGrid.Columns.GridColumn colCurrentPress;
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterListCtrl.cs

@@ -49,8 +49,8 @@
            {
                foreach (var pressmeter in hydroInfo.Pressmeters)
                {
                    var calcuNodeResult = allCalcuResultList?.Find(x => x.Code == pressmeter.Code) as HydroCalcuNodeResult;
                    var vm = new HydroPressmeterViewModel(pressmeter, calcuNodeResult);
                    var calcuResult = allCalcuResultList?.Find(x => x.Code == pressmeter.Code) as HydroCalcuPressmeterResult;
                    var vm = new HydroPressmeterViewModel(pressmeter, calcuResult);
                    _allBindingList.Add(vm);
                }
            }
@@ -72,18 +72,13 @@
        public void SetSimpleView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = false;
            this.colMinorLoss.Visible = false;
            this.colDemand.Visible = false;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = false;
            this.colCalcuHead.Visible = false;
            this.colCalcuDemand.Visible = false;
            this.colCalcuPr.Visible = false;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }
@@ -94,18 +89,13 @@
        public void SetNormalView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = true;
            this.colMinorLoss.Visible = true;
            this.colDemand.Visible = true;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = false;
            this.colCalcuHead.Visible = false;
            this.colCalcuDemand.Visible = false;
            this.colCalcuPr.Visible = false;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }
@@ -116,18 +106,13 @@
        public void SetCalcuView()
        {
            this.colDbLocked.Visible = true;
            this.colCode.Visible = true;
            this.colName.Visible = true;
            this.colCode.Visible = true;
            this.colModelType.Visible = true;
            this.colHasDb.Visible = true;
            this.colQuality.Visible = false;
            this.colElev.Visible = true;
            this.colMinorLoss.Visible = true;
            this.colDemand.Visible = true;
            this.colDemandPattern.Visible = false;
            this.colCalcuPress.Visible = true;
            this.colCalcuHead.Visible = true;
            this.colCalcuDemand.Visible = true;
            this.colCalcuPr.Visible = true;
            this.colHasDb.Visible = true;
            this.colFlagsString.Visible = true;
            this.colDescription.Visible = true;
        }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterListCtrl.resx

@@ -120,4 +120,7 @@
  <metadata name="hydroPressmeterViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>113</value>
  </metadata>
</root>

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-parter/02-node/02-junction/03-other/03-pressmeter/HydroPressmeterViewModel.cs

@@ -3,7 +3,7 @@
    /// <summary>
    /// 
    /// </summary>
    public class HydroPressmeterViewModel : HydroJunctionViewModel
    public class HydroPressmeterViewModel : HydroJunctionViewModel, IHydroCalcuPressmeterResult
    {
        /// <summary>
        /// 
@@ -15,17 +15,35 @@
        /// </summary>
        public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs) : base(rhs)
        {
            this.CurrentPress = rhs.CurrentPress.HasValue ? Math.Round(rhs.CurrentPress.Value, 2) : null;
            this.Vmo = rhs;
        }

        /// <summary>
        /// 
        /// </summary>
        public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs, HydroCalcuNodeResult calcuResult) : base(rhs, calcuResult)
        public HydroPressmeterViewModel(Yw.Model.HydroPressmeterInfo rhs, HydroCalcuPressmeterResult calcuResult) : base(rhs, calcuResult)
        {
            this.CurrentPress = rhs.CurrentPress.HasValue ? Math.Round(rhs.CurrentPress.Value, 2) : null;
            if (calcuResult != null)
            {
                this.CalcuPr = calcuResult.CalcuPr.HasValue ? Math.Round(calcuResult.CalcuPr.Value, 2) : null;
            }

            this.Vmo = rhs;
        }

        /// <summary>
        /// 压力
        /// </summary>
        [DisplayName("压力(m)")]
        public double? CurrentPress { get; set; }

        /// <summary>
        /// 计算压力
        /// </summary>
        [DisplayName("计算压力(m)")]
        public double? CalcuPr { get; set; }

        /// <summary>
        ///