Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-12-24 dd025bb6193f9f81e1235c300eff140e705e9715

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/01-pump/01-view/PumpChartViewCtrl.cs

@@ -77,7 +77,6 @@
                        }
                    }
                }

            }

            //vm.VariableSpeedList = new List<Yw.WinFrmUI.Phart.PumpChartVariableSpeedViewModel>(); 

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/01-operation/PumpOperationChart.cs

@@ -2,6 +2,7 @@
using DevExpress.Utils.Drawing;
using DevExpress.XtraCharts;
using System.Text;
using Yw.Geometry;

namespace Yw.WinFrmUI.Phart
{
@@ -286,9 +287,9 @@
        /// <summary>
        /// 设置设计点
        /// </summary> 
        public void SetDesignPoint(double x, double y, double? start_head = null)
        public void SetDesignPoint(double pipe_flow, double pipe_head, double? start_head = null)
        {
            _equip_pt = new Geometry.Point2d(x, y);
            _equip_pt = new Geometry.Point2d(pipe_flow, pipe_head);
            _equip_line = null;
            _equip_sect_pt = null;
            _current_equip_sect_pt = null;
@@ -1216,6 +1217,7 @@
        {
            _qp_visible = this.barCekCurveQPVisible.Checked;
            _bottom_pane.Visibility = _qp_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden;
            UpdateChart();
        }

        private void barCekCurveEQVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/01-operation/PumpOperationViewModel.cs

@@ -16,7 +16,11 @@
            this.RatedN = rhs.RatedN;
            this.RatedHz = rhs.RatedHz;
            this.CurrentN = rhs.CurrentN;
            this.CurrentHz = rhs.CurrentHz; 
            this.CurrentHz = rhs.CurrentHz;

            //this.StartH = rhs.StartH;
            //this.PipeQ = rhs.PipeQ;
            //this.PipeH = rhs.PipeH;

            this.CurveQH = rhs.CurveQH;
            this.CurveQE = rhs.CurveQE;
@@ -73,7 +77,22 @@
        /// 当前频率
        /// </summary>
        public double CurrentHz { get; set; }
         

        ///// <summary>
        ///// 起始点扬程
        ///// </summary>
        //public double StartH { get; set; }

        ///// <summary>
        ///// 管道流量
        ///// </summary>
        //public double PipeQ { get; set; }

        ///// <summary>
        ///// 管道扬程
        ///// </summary>
        //public double PipeH { get; set; } 

        /// <summary>
        /// 流量扬程线
        /// </summary>

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/02-working-view/PumpWorkingViewChart.cs

@@ -43,8 +43,7 @@
        private PumpWorkingViewViewModel _vm = null;

        #endregion


         
        #region Public Variable 

        /// <summary>

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/02-working-view/PumpWorkingViewViewModel.cs

@@ -12,10 +12,10 @@
            this.Name = rhs.Name;
            this.CurveName = rhs.CurveName;
            this.Color = rhs.Color;



            this.Items = rhs.Items;
            this.StartH = rhs.StartH;
            this.PipeQ = rhs.PipeQ;
            this.PipeH = rhs.PipeH;  
            this.Items = rhs.Items; 
        }

         

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/03-run-view/PumpRunViewChart.cs

@@ -40,8 +40,7 @@
        private PumpRunViewViewModel _vm = null;

        #endregion


          
        #region Public Variable 

        /// <summary>

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/04-parallel/PumpParallelChart.Designer.cs

@@ -58,14 +58,14 @@
            barCekLegendVisible = new DevExpress.XtraBars.BarCheckItem();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barMenu = new DevExpress.XtraBars.Bar();
            barSubMenuVisible = new DevExpress.XtraBars.BarSubItem();
            barSubMenuQuery = new DevExpress.XtraBars.BarSubItem();
            barBtnSetAxisQValue = new DevExpress.XtraBars.BarButtonItem();
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            barBtnSetAxisQValue = new DevExpress.XtraBars.BarButtonItem();
            barSubMenuVisible = new DevExpress.XtraBars.BarSubItem();
            barSubMenuEdit = new DevExpress.XtraBars.BarSubItem();
            barSubMenuQuery = new DevExpress.XtraBars.BarSubItem();
            bar1 = new DevExpress.XtraBars.Bar();
            ((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textAnnotation1).BeginInit();
@@ -207,7 +207,7 @@
            barCekCurveQEVisible.Id = 18;
            barCekCurveQEVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekCurveQEVisible.ImageOptions.SvgImage");
            barCekCurveQEVisible.Name = "barCekCurveQEVisible";
            barCekCurveQEVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            barCekCurveQEVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barCekCurveQEVisible.CheckedChanged += barCekCurveQEVisible_CheckedChanged;
            // 
            // barCekCurveQPVisible
@@ -219,7 +219,7 @@
            barCekCurveQPVisible.Id = 19;
            barCekCurveQPVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekCurveQPVisible.ImageOptions.SvgImage");
            barCekCurveQPVisible.Name = "barCekCurveQPVisible";
            barCekCurveQPVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            barCekCurveQPVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barCekCurveQPVisible.CheckedChanged += barCekCurveQPVisible_CheckedChanged;
            // 
            // barCekCurveEQVisible
@@ -231,7 +231,7 @@
            barCekCurveEQVisible.Id = 22;
            barCekCurveEQVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekCurveEQVisible.ImageOptions.SvgImage");
            barCekCurveEQVisible.Name = "barCekCurveEQVisible";
            barCekCurveEQVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            barCekCurveEQVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.Caption;
            barCekCurveEQVisible.CheckedChanged += barCekCurveEQVisible_CheckedChanged;
            // 
            // barCekLineVisible
@@ -300,30 +300,6 @@
            barMenu.OptionsBar.UseWholeRow = true;
            barMenu.Text = "菜单";
            // 
            // barSubMenuVisible
            // 
            barSubMenuVisible.Caption = "显示";
            barSubMenuVisible.Id = 23;
            barSubMenuVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubMenuVisible.ImageOptions.SvgImage");
            barSubMenuVisible.Name = "barSubMenuVisible";
            barSubMenuVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barSubMenuQuery
            // 
            barSubMenuQuery.Caption = "查询";
            barSubMenuQuery.Id = 25;
            barSubMenuQuery.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubMenuQuery.ImageOptions.SvgImage");
            barSubMenuQuery.Name = "barSubMenuQuery";
            barSubMenuQuery.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barBtnSetAxisQValue
            // 
            barBtnSetAxisQValue.Caption = "定位流量点";
            barBtnSetAxisQValue.Id = 13;
            barBtnSetAxisQValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetAxisQValue.ImageOptions.SvgImage");
            barBtnSetAxisQValue.Name = "barBtnSetAxisQValue";
            barBtnSetAxisQValue.ItemClick += barBtnSetAxisQValue_ItemClick;
            // 
            // barDockControlTop
            // 
            barDockControlTop.CausesValidation = false;
@@ -356,6 +332,22 @@
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 823);
            // 
            // barBtnSetAxisQValue
            // 
            barBtnSetAxisQValue.Caption = "定位流量点";
            barBtnSetAxisQValue.Id = 13;
            barBtnSetAxisQValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetAxisQValue.ImageOptions.SvgImage");
            barBtnSetAxisQValue.Name = "barBtnSetAxisQValue";
            barBtnSetAxisQValue.ItemClick += barBtnSetAxisQValue_ItemClick;
            // 
            // barSubMenuVisible
            // 
            barSubMenuVisible.Caption = "显示";
            barSubMenuVisible.Id = 23;
            barSubMenuVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubMenuVisible.ImageOptions.SvgImage");
            barSubMenuVisible.Name = "barSubMenuVisible";
            barSubMenuVisible.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barSubMenuEdit
            // 
            barSubMenuEdit.Caption = "编辑";
@@ -364,6 +356,14 @@
            barSubMenuEdit.Name = "barSubMenuEdit";
            barSubMenuEdit.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // barSubMenuQuery
            // 
            barSubMenuQuery.Caption = "查询";
            barSubMenuQuery.Id = 25;
            barSubMenuQuery.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubMenuQuery.ImageOptions.SvgImage");
            barSubMenuQuery.Name = "barSubMenuQuery";
            barSubMenuQuery.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            // 
            // bar1
            // 
            bar1.BarName = "Custom 2";

 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/04-parallel/PumpParallelChart.cs

@@ -301,9 +301,9 @@
        /// <summary>
        /// 设置设计点
        /// </summary> 
        public void SetDesignPoint(double x, double y, double? start_head = null)
        public void SetDesignPoint(double pipe_flow, double pipe_head, double? start_head = null)
        {
            _equip_pt = new Geometry.Point2d(x, y);
            _equip_pt = new Geometry.Point2d(pipe_flow, pipe_head);
            _equip_line = null;
            _equip_sect_pt = null;
            if (_vm == null || (_vm_list == null || !_vm_list.Any()))
@@ -1113,9 +1113,9 @@

        private void barCekCurveQPVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            _bottom_pane.Visibility = _bottom_pane.Visibility == ChartElementVisibility.Visible ? ChartElementVisibility.Hidden : ChartElementVisibility.Visible;
            _qp_visible = _bottom_pane.Visibility == ChartElementVisibility.Visible ? true : false;

            _qp_visible = this.barCekCurveQPVisible.Checked;
            _bottom_pane.Visibility = _qp_visible ? ChartElementVisibility.Visible : ChartElementVisibility.Hidden;
            UpdateChart();
        }

        private void barCekCurveEQVisible_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -1153,6 +1153,7 @@
        public void SetQeVisible(bool visible)
        {
            this.barCekCurveQEVisible.Checked = visible;
            UpdateChart(true);
        }



 WinFrmUI/Yw.WinFrmUI.Phart.Core/02-pump/04-special/04-parallel/PumpParallelViewModel.cs

@@ -19,6 +19,10 @@
            this.CurrentHz = rhs.CurrentHz;
            this.CurrentColor = rhs.CurrentColor;

            //this.StartH = rhs.StartH;
            //this.PipeQ = rhs.PipeQ;
            //this.PipeH = rhs.PipeH;

            this.CurveQH = rhs.CurveQH;
            this.CurveQE = rhs.CurveQE;
            this.CurveQP = rhs.CurveQP;
@@ -79,6 +83,21 @@
        /// </summary>
        public Color CurrentColor { get; set; }

        ///// <summary>
        ///// 起始点扬程
        ///// </summary>
        //public double StartH { get; set; }

        ///// <summary>
        ///// 管道流量
        ///// </summary>
        //public double PipeQ { get; set; }

        ///// <summary>
        ///// 管道扬程
        ///// </summary>
        //public double PipeH { get; set; }  

        /// <summary>
        /// 流量扬程线
        /// </summary>