增加水力标签处理

lixiaojun

2024-10-10 3379b93327c6c7a9f9bc30d4462ffbeb6d4a4470

增加水力标签处理

 Service/HStation.Service.Revit.Core/04-service/01-json/02-helper/RevitJsonParseHelper.cs

@@ -21,7 +21,7 @@
            {
                return false;
            }
            value = jobject[key].ToString();
            value = jobject.ToString();
            return true;
        }


 WinFrmUI/Yw.WinFrmUI.Core/09-common/01-flags/SetFlagsContainerCtrl.cs

@@ -46,5 +46,7 @@
        {
            this.CancelEvent?.Invoke();
        }


    }
}

 WinFrmUI/Yw.WinFrmUI.Core/09-common/01-flags/SetFlagsDlg.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,175 @@
namespace Yw.WinFrmUI
{
    partial class SetFlagsDlg
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            layoutControl1 = new LayoutControl();
            stringListCheckedListBoxCtrl1 = new StringListCheckedListBoxCtrl();
            Root = new LayoutControlGroup();
            layoutControlItem1 = new LayoutControlItem();
            btnOk = new SimpleButton();
            layoutControlItem2 = new LayoutControlItem();
            btnCancel = new SimpleButton();
            layoutControlItem3 = new LayoutControlItem();
            emptySpaceItem1 = new EmptySpaceItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(btnCancel);
            layoutControl1.Controls.Add(btnOk);
            layoutControl1.Controls.Add(stringListCheckedListBoxCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(763, 142, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(497, 323);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
            // stringListCheckedListBoxCtrl1
            // 
            stringListCheckedListBoxCtrl1.Location = new Point(12, 12);
            stringListCheckedListBoxCtrl1.Name = "stringListCheckedListBoxCtrl1";
            stringListCheckedListBoxCtrl1.Size = new Size(473, 273);
            stringListCheckedListBoxCtrl1.TabIndex = 4;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1 });
            Root.Name = "Root";
            Root.Size = new Size(497, 323);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = stringListCheckedListBoxCtrl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(477, 277);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // btnOk
            // 
            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnOk.Appearance.Options.UseBackColor = true;
            btnOk.Location = new Point(289, 289);
            btnOk.Name = "btnOk";
            btnOk.Size = new Size(96, 22);
            btnOk.StyleController = layoutControl1;
            btnOk.TabIndex = 5;
            btnOk.Text = "确定";
            btnOk.Click += btnOk_Click;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = btnOk;
            layoutControlItem2.Location = new Point(277, 277);
            layoutControlItem2.MaxSize = new Size(100, 26);
            layoutControlItem2.MinSize = new Size(100, 26);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(100, 26);
            layoutControlItem2.SizeConstraintsType = SizeConstraintsType.Custom;
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
            // btnCancel
            // 
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.DialogResult = DialogResult.Cancel;
            btnCancel.Location = new Point(389, 289);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(96, 22);
            btnCancel.StyleController = layoutControl1;
            btnCancel.TabIndex = 6;
            btnCancel.Text = "取消";
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = btnCancel;
            layoutControlItem3.Location = new Point(377, 277);
            layoutControlItem3.MaxSize = new Size(100, 26);
            layoutControlItem3.MinSize = new Size(100, 26);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(100, 26);
            layoutControlItem3.SizeConstraintsType = SizeConstraintsType.Custom;
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 277);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(277, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // SetFlagsDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(497, 323);
            Controls.Add(layoutControl1);
            Name = "SetFlagsDlg";
            StartPosition = FormStartPosition.CenterParent;
            Text = "设置标签";
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private LayoutControl layoutControl1;
        private LayoutControlGroup Root;
        private StringListCheckedListBoxCtrl stringListCheckedListBoxCtrl1;
        private LayoutControlItem layoutControlItem1;
        private SimpleButton btnCancel;
        private SimpleButton btnOk;
        private LayoutControlItem layoutControlItem2;
        private LayoutControlItem layoutControlItem3;
        private EmptySpaceItem emptySpaceItem1;
    }
}

 WinFrmUI/Yw.WinFrmUI.Core/09-common/01-flags/SetFlagsDlg.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
using DevExpress.XtraEditors;
using DevExpress.XtraRichEdit.Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace Yw.WinFrmUI
{
    /// <summary>
    /// 
    /// </summary>
    public partial class SetFlagsDlg : DevExpress.XtraEditors.XtraForm
    {
        /// <summary>
        /// 
        /// </summary>
        public SetFlagsDlg()
        {
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
            this.layoutControl1.SetupLayoutControl();
        }

        /// <summary>
        /// é‡è½½æ•°æ®äº‹ä»¶
        /// </summary>
        public event Action<List<string>> ReloadDataEvent;

        /// <summary>
        /// ç»‘定数据
        /// </summary>
        /// <param name="allFlagList">所有标签列表</param>
        /// <param name="selectedFlagList">选择的标签列表</param>
        public void SetBindingData(List<string> allFlagList, List<string> selectedFlagList)
        {
            this.stringListCheckedListBoxCtrl1.Initial(allFlagList);
            this.stringListCheckedListBoxCtrl1.Select(selectedFlagList);
        }

        //确定
        private void btnOk_Click(object sender, EventArgs e)
        {
            var selectedFlagList = this.stringListCheckedListBoxCtrl1.Get();
            this.ReloadDataEvent?.Invoke(selectedFlagList);
            this.DialogResult = DialogResult.OK;
            this.Close();
        }


    }
}

 WinFrmUI/Yw.WinFrmUI.Core/09-common/01-flags/SetFlagsDlg.resx

copy from WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/06-curve/SetHydroCurveDlg.resx
copy to WinFrmUI/Yw.WinFrmUI.Core/09-common/01-flags/SetFlagsDlg.resx

 WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj.user

@@ -10,6 +10,9 @@
    <Compile Update="09-common\01-flags\SetFlagsContainerCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="09-common\01-flags\SetFlagsDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="09-common\StringListCheckedListBoxCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>

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

@@ -98,6 +98,7 @@
        [Category("基础信息")]
        [DisplayName("标签")]
        [PropertyOrder(8)]
        [IsHydroFlagsPro(true)]
        [Browsable(true)]
        public virtual List<string> Flags { get; set; }


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

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/00-core/HydroSourcePropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/01-reservoir/HydroReservoirPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/02-tank/HydroTankPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/02-tank/HydroWaterboxPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroBluntheadPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroConnectPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroElbowPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroEmitterPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroFlowmeterPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroFourlinkPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroHydrantPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroJunctionPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroMeterPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroNozzlePropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroPressmeterPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/01-node/03-junction/HydroThreelinkPropertyViewModel.cs

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

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/01-pipe/HydroExchangerPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/01-pipe/HydroPipePropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/01-pipe/HydroTranslationPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/02-pump/HydroPumpPropertyViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-link/03-valve/HydroValvePropertyViewModel.cs

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

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

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

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

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-attribute/IsHydroCalcuProAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-attribute/IsHydroCurveProAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-attribute/IsHydroFlagsProAttribute.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// ç”¨äºŽæ ‡è¯†æ°´åŠ›æ ‡ç­¾å±žæ€§ç‰¹æ€§
    /// </summary>
    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
    public class IsHydroFlagsProAttribute : Attribute
    {
        /// <summary>
        /// 
        /// </summary>
        public IsHydroFlagsProAttribute(bool flagsPro)
        {
            this.FlagsPro = flagsPro;
        }

        /// <summary>
        /// æ˜¯å¦æ˜¯æ ‡ç­¾å±žæ€§
        /// </summary>
        public bool FlagsPro { get; set; }

    }

}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/04-attribute/IsHydroPatternProAttribute.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurvePointViewModel.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewCtrl.Designer.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewCtrl.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewCtrl.resx

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewDlg.Designer.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewDlg.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/HydroCurveViewDlg.resx

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveCtrl.Designer.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveCtrl.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveCtrl.resx

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveDlg.Designer.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveDlg.cs

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/05-curve/SetHydroCurveDlg.resx

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/HydroParterPropertyCtrl.Designer.cs

@@ -30,9 +30,9 @@
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroParterPropertyCtrl));
            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem1 = new DevExpress.Utils.ToolTipTitleItem();
            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem2 = new DevExpress.Utils.ToolTipTitleItem();
            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            propertyDescriptionControl1 = new DevExpress.XtraVerticalGrid.PropertyDescriptionControl();
            propertyGridControl1 = new DevExpress.XtraVerticalGrid.PropertyGridControl();
@@ -108,6 +108,8 @@
            propertyGridControl1.RowHeaderWidth = 80;
            propertyGridControl1.Size = new Size(256, 513);
            propertyGridControl1.TabIndex = 4;
            propertyGridControl1.CustomPropertyDescriptors += propertyGridControl1_CustomPropertyDescriptors;
            propertyGridControl1.FocusedRowChanged += propertyGridControl1_FocusedRowChanged;
            propertyGridControl1.CustomRecordCellEdit += propertyGridControl1_CustomRecordCellEdit;
            propertyGridControl1.CustomDrawRowValueCell += propertyGridControl1_CustomDrawRowValueCell;
            propertyGridControl1.ShowingEditor += propertyGridControl1_ShowingEditor;
@@ -204,14 +206,14 @@
            barBtnHelp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHelp.ImageOptions.SvgImage");
            barBtnHelp.ImageOptions.SvgImageSize = new Size(20, 20);
            barBtnHelp.Name = "barBtnHelp";
            toolTipTitleItem1.Appearance.Image = (Image)resources.GetObject("resource.Image");
            toolTipTitleItem1.Appearance.Options.UseImage = true;
            toolTipTitleItem1.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
            toolTipItem1.LeftIndent = 6;
            toolTipItem1.Text = "描述信息";
            superToolTip1.Items.Add(toolTipTitleItem1);
            superToolTip1.Items.Add(toolTipItem1);
            barBtnHelp.SuperTip = superToolTip1;
            toolTipTitleItem2.Appearance.Image = (Image)resources.GetObject("resource.Image");
            toolTipTitleItem2.Appearance.Options.UseImage = true;
            toolTipTitleItem2.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
            toolTipItem2.LeftIndent = 6;
            toolTipItem2.Text = "描述信息";
            superToolTip2.Items.Add(toolTipTitleItem2);
            superToolTip2.Items.Add(toolTipItem2);
            barBtnHelp.SuperTip = superToolTip2;
            barBtnHelp.ItemClick += barBtnHelp_ItemClick;
            // 
            // barDockControlTop

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/HydroParterPropertyCtrl.cs

@@ -8,6 +8,7 @@
using DevExpress.XtraVerticalGrid.Events;
using NetTaste;
using System.Windows.Forms.VisualStyles;
using Yw.EPAnet;

namespace Yw.WinFrmUI
{
@@ -119,7 +120,6 @@
        private void propertyGridControl1_CustomDrawRowValueCell(object sender, CustomDrawRowValueCellEventArgs e)
        {
            var rowTypeFullName = e.Row.Properties.RowType.FullName;

            if (rowTypeFullName == typeof(DateTime).FullName)
            {
                e.CellText = ((DateTime)e.Properties.Value).ToString("yyyy-MM-dd HH:mm:ss");
@@ -135,7 +135,25 @@
                        e.CellText = e.Properties.Value.ToString() + " " + displayUnit.Unit;
                    }
                }

                var flagsPro = (IsHydroFlagsProAttribute)descriptor.Attributes[typeof(IsHydroFlagsProAttribute)];
                if (flagsPro != null)
                {
                    if (flagsPro.FlagsPro)
                    {
                        var flags = e.Properties.Value as List<string>;
                        e.CellText = Yw.Untity.FlagsHelper.ToString(flags);
                    }
                }
            }


        }

        //自定义属性描述
        private void propertyGridControl1_CustomPropertyDescriptors(object sender, CustomPropertyDescriptorsEventArgs e)
        {

        }

        //属性编辑框的显示与取消
@@ -377,6 +395,31 @@

            #endregion

            #region æ ‡ç­¾

            var flagsPro = (IsHydroFlagsProAttribute)descriptor.Attributes[typeof(IsHydroFlagsProAttribute)];
            if (flagsPro != null)
            {
                var buttonEdit = new RepositoryItemButtonEdit();
                buttonEdit.TextEditStyle = TextEditStyles.DisableTextEditor;
                buttonEdit.ButtonClick += async delegate
                {
                    var vm = GetPropertyViewModel(e.Row);
                    var flagVmoList = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(Yw.Hydro.DataType.HydroParter);
                    var dbFlagList = flagVmoList?.Select(x => x.Name).Distinct().ToList();
                    var dlg = new SetFlagsDlg();
                    dlg.SetBindingData(dbFlagList, vm.Flags);
                    dlg.ReloadDataEvent += (flags) =>
                    {
                        vm.Flags = flags;
                        UpdateRows();
                    };
                    dlg.ShowDialog();
                };
                e.RepositoryItem = buttonEdit;
            }

            #endregion

        }

@@ -433,6 +476,11 @@
            this.propertyGridControl1.CollapseAllRows();
        }

        private void propertyGridControl1_FocusedRowChanged(object sender, FocusedRowChangedEventArgs e)
        {

        }


    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/HydroParterPropertyCtrl.resx

@@ -121,43 +121,6 @@
    <value>17, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="barBtnExpandAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALACAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iRXhwYW5kX0ZpZWxkIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3
        IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3Mjcy
        O30KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
        cG9seWdvbiBwb2ludHM9IjE0LDYgMTAsNiAxMCwyIDYsMiA2LDYgMiw2IDIsMTAgNiwxMCA2LDE0IDEw
        LDE0IDEwLDEwIDE0LDEwICIgY2xhc3M9IkdyZWVuIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8
        cGF0aCBkPSJNMjIsNmgxMHYySDIyVjZ6IE0yMiwxMmgxMHYtMkgyMlYxMnogTTIyLDIwaDEwdi0ySDIy
        VjIweiBNMjIsMjRoMTB2LTJIMjJWMjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHBhdGgg
        ZD0iTTE4LDJoMTR2MkgxOFYyeiBNMTgsMTZoMTR2LTJIMThWMTZ6IE0xOCwyOGgxNHYtMkgxOFYyOHoi
        IGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="barBtnCollpseAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iQ29sbGFwc2VfRmllbGQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpu
        ZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3Mjcy
        NzI7fQoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
        cmVjdCB4PSIyIiB5PSI2IiB3aWR0aD0iMTIiIGhlaWdodD0iNCIgY2xhc3M9IlJlZCIgLz4NCiAgPGcg
        Y2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTIyLDZoMTB2MkgyMlY2eiBNMjIsMTJoMTB2LTJIMjJW
        MTJ6IE0yMiwyMGgxMHYtMkgyMlYyMHogTTIyLDI0aDEwdi0ySDIyVjI0eiIgY2xhc3M9IkJsYWNrIiAv
        Pg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0xOCwyaDE0djJIMThWMnogTTE4LDE2aDE0di0ySDE4VjE2eiBN
        MTgsMjhoMTR2LTJIMThWMjh6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
  </data>
  <data name="barBtnHelp.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
@@ -214,4 +177,41 @@
        6XTsLy5SM69xQkG9AAAAAElFTkSuQmCC
</value>
  </data>
  <data name="barBtnExpandAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALACAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iRXhwYW5kX0ZpZWxkIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3
        IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3Mjcy
        O30KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
        cG9seWdvbiBwb2ludHM9IjE0LDYgMTAsNiAxMCwyIDYsMiA2LDYgMiw2IDIsMTAgNiwxMCA2LDE0IDEw
        LDE0IDEwLDEwIDE0LDEwICIgY2xhc3M9IkdyZWVuIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8
        cGF0aCBkPSJNMjIsNmgxMHYySDIyVjZ6IE0yMiwxMmgxMHYtMkgyMlYxMnogTTIyLDIwaDEwdi0ySDIy
        VjIweiBNMjIsMjRoMTB2LTJIMjJWMjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHBhdGgg
        ZD0iTTE4LDJoMTR2MkgxOFYyeiBNMTgsMTZoMTR2LTJIMThWMTZ6IE0xOCwyOGgxNHYtMkgxOFYyOHoi
        IGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="barBtnCollpseAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iQ29sbGFwc2VfRmllbGQiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpu
        ZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbGFja3tmaWxsOiM3Mjcy
        NzI7fQoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8
        cmVjdCB4PSIyIiB5PSI2IiB3aWR0aD0iMTIiIGhlaWdodD0iNCIgY2xhc3M9IlJlZCIgLz4NCiAgPGcg
        Y2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTIyLDZoMTB2MkgyMlY2eiBNMjIsMTJoMTB2LTJIMjJW
        MTJ6IE0yMiwyMGgxMHYtMkgyMlYyMHogTTIyLDI0aDEwdi0ySDIyVjI0eiIgY2xhc3M9IkJsYWNrIiAv
        Pg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0xOCwyaDE0djJIMThWMnogTTE4LDE2aDE0di0ySDE4VjE2eiBN
        MTgsMjhoMTR2LTJIMThWMjh6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
</value>
  </data>
</root>

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj

@@ -99,8 +99,4 @@
    </EmbeddedResource>
  </ItemGroup>

  <ItemGroup>
    <Folder Include="03-property\01-calcu\" />
  </ItemGroup>

</Project>

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user

@@ -4,16 +4,16 @@
    <Compile Update="01-scene\AddHydroSceneDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-property\06-curve\HydroCurveViewCtrl.cs">
    <Compile Update="03-property\05-curve\HydroCurveViewCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-property\06-curve\HydroCurveViewDlg.cs">
    <Compile Update="03-property\05-curve\HydroCurveViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-property\06-curve\SetHydroCurveCtrl.cs">
    <Compile Update="03-property\05-curve\SetHydroCurveCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-property\06-curve\SetHydroCurveDlg.cs">
    <Compile Update="03-property\05-curve\SetHydroCurveDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-parter\00-core\HydroParterListCtrl.cs">