冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-pump/00-/PumpChartViewModel.cs

@@ -9,15 +9,17 @@
        public PumpChartViewModel(PumpChartViewModel rhs)
        {
            this.Id = rhs.Id;
            this.CurveName = rhs.CurveName;
            this.Color = rhs.Color;
            this.ColorQH = rhs.ColorQH;
            this.ColorQE = rhs.ColorQE;
            this.ColorQP = rhs.ColorQP;
            this.CurveQHName = rhs.CurveQHName;
            this.CurveQPName = rhs.CurveQPName;
            this.CurveQH = rhs.CurveQH;
            this.CurveQE = rhs.CurveQE;
            this.CurveQP = rhs.CurveQP;
            this.PointListQH = rhs.PointListQH;
            this.PointListQE = rhs.PointListQE;
            this.PointListQP = rhs.PointListQP;
            this.PointRunList = rhs.PointRunList;
            this.Equip = rhs.Equip;
            this.VariableSpeedList = rhs.VariableSpeedList;
            this.EquivEffList = rhs.EquivEffList;
@@ -29,16 +31,31 @@
        /// 标识
        /// </summary>
        public string Id { get; set; }
         
        /// <summary>
        /// 扬程颜色
        /// </summary>
        public Color? ColorQH { get; set; }

        /// <summary>
        /// 标题
        /// 效率颜色
        /// </summary>
        public string CurveName { get; set; }
        public Color? ColorQE { get; set; }

        /// <summary>
        /// 颜色
        /// 功率颜色
        /// </summary>
        public Color? Color { get; set; }
        public Color? ColorQP { get; set; }
         
        /// <summary>
        ///  流量扬程线名称
        /// </summary>
        public string CurveQHName { get; set; }

        /// <summary>
        ///  流量功率线名称
        /// </summary>
        public string CurveQPName { get; set; }

        /// <summary>
        /// 流量扬程线
@@ -49,8 +66,7 @@
        /// 流量效率线
        /// </summary>
        public List<Yw.Geometry.Point2d> CurveQE { get; set; }


         
        /// <summary>
        /// 流量功率线
        /// </summary>
@@ -70,12 +86,7 @@
        /// 流量功率点列表
        /// </summary>
        public List<Yw.Geometry.Point2d> PointListQP { get; set; }

        /// <summary>
        /// 运行点列表
        /// </summary>
        public List<Yw.Geometry.Point2d> PointRunList { get; set; }

  
        /// <summary>
        /// 装置
        /// </summary>