添加图表显示窗体

duheng

2024-09-19 3816b7dfff85051c09a99f2e49196a731ce994a5

添加图表显示窗体

 BLL/HStation.BLL.Assets.Core/01-interface/02-IAdaptingManage/IAdaptingManage.cs

@@ -7,6 +7,6 @@
    /// </summary>
    public interface IAdaptingManage : IBaseCAL<AddAdaptingManageInput, UpdateAdaptingManageInput, AdaptingManageDto>
    {
        public Task<List<AdaptingManageDto>> GetByAdaptingType(Service.Assets.eAdaptingType eAdaptingType);
        public Task<List<AdaptingManageDto>> GetByAdaptingType(HStation.Assets.eAdaptingType eAdaptingType);
    }
}

 BLL/HStation.BLL.Assets.Core/03-localclient/02-AdaptingManage/AdaptingManage.cs

@@ -40,7 +40,7 @@
        /// <summary>
        /// é€šè¿‡ç±»åž‹èŽ·å–
        /// </summary>
        public async Task<List<AdaptingManageDto>> GetByAdaptingType(Service.Assets.eAdaptingType AdaptingType)
        public async Task<List<AdaptingManageDto>> GetByAdaptingType(HStation.Assets.eAdaptingType AdaptingType)
        {
            return await Task.Factory.StartNew(() =>
            {

 BLL/HStation.BLL.Assets.Core/04-bll/03-AdaptingManage/AdaptingManage.cs

@@ -41,7 +41,7 @@
        /// </summary>
        /// <param name="ID"></param>
        /// <returns></returns>
        public virtual async Task<List<Vmo.AdaptingManageVmo>> GetByAdaptingType(Service.Assets.eAdaptingType type)
        public virtual async Task<List<Vmo.AdaptingManageVmo>> GetByAdaptingType(HStation.Assets.eAdaptingType type)
        {
            var DtoList = await _cal.GetByAdaptingType(type);
            var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AdaptingManageDto, Vmo.AdaptingManageVmo>()

 Dto/HStation.Dto.Assets.Core/01-ValveManage/01-ValveSeries/AddValveSeriesInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/01-ValveManage/01-ValveSeries/UpdateValveSeriesInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using System.ComponentModel.DataAnnotations;
using Yw.Model;


 Dto/HStation.Dto.Assets.Core/01-ValveManage/01-ValveSeries/ValveSeriesDto.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/AddValveMainInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;

namespace HStation.Dto.Assets
{

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/UpdateValveMainInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using System.ComponentModel.DataAnnotations;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-ValveMain/ValveMainDto.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;

namespace HStation.Dto.Assets
{

 Dto/HStation.Dto.Assets.Core/02-AdaptingManage/AdaptingManageDto.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/02-AdaptingManage/AddAdaptingManageInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;

namespace HStation.Dto.Assets
{
@@ -7,7 +7,7 @@
        /// <summary>
        /// è®¾å¤‡ç±»åž‹(弯头,三通,四通....)
        /// </summary>
        public eAdaptingType  AdaptingType { get; set; }
        public eAdaptingType AdaptingType { get; set; }

        /// <summary>
        /// åç§°

 Dto/HStation.Dto.Assets.Core/02-AdaptingManage/UpdateAdaptingManageInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using System.ComponentModel.DataAnnotations;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/03-PipeLineRoughnessCoefficient/AddPipeLineRoughnessCoefficientInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;

namespace HStation.Dto.Assets
{

 Dto/HStation.Dto.Assets.Core/03-PipeLineRoughnessCoefficient/PipeLineRoughnessCoefficientDto.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Dto.Assets

 Dto/HStation.Dto.Assets.Core/03-PipeLineRoughnessCoefficient/UpdatePipeLineRoughnessCoefficientInput.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using System.ComponentModel.DataAnnotations;

namespace HStation.Dto.Assets

 Service/HStation.Service.Assets.Core/00-core/eAdaptingType.cs

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace HStation.Service.Assets
namespace HStation.Assets
{
    public enum eAdaptingType
    {

 Service/HStation.Service.Assets.Core/00-core/eAlgorithmType.cs

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace HStation.Service.Assets
namespace HStation.Assets
{
    /// <summary>
    /// ç®—法类型

 Service/HStation.Service.Assets.Core/00-core/eValveSeriesType.cs

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;

namespace HStation.Service.Assets
namespace HStation.Assets
{
    public enum eValveSeriesType
    {

 Service/HStation.Service.Assets.Core/01-entity/AdaptingManage/AdaptingManage.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Entity;

namespace HStation.Entity

 Service/HStation.Service.Assets.Core/01-entity/PipeLineRoughnessCoefficient/PipeLineCoarseCoefficient.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Entity;

namespace HStation.Entity

 Service/HStation.Service.Assets.Core/02-model/AdaptingManage/AdaptingManage.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Model

 Service/HStation.Service.Assets.Core/02-model/PipeLineRoughnessCoefficient/PipeLineRoughnessCoefficient.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Model

 Service/HStation.Service.Assets.Core/02-model/ValveManage/ValveMain.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Model

 Service/HStation.Service.Assets.Core/02-model/ValveManage/ValveSeries.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;
using Yw.Model;

namespace HStation.Model

 Service/HStation.Service.Assets.Core/05-service/02-AdaptingManage/AdaptingManage.cs

@@ -1,4 +1,4 @@
using HStation.Service.Assets;
using HStation.Assets;

namespace HStation.Service
{

 Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveMainVmo.cs

@@ -50,7 +50,7 @@
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public eValveSeriesType Type { get; set; }
        public HStation.Assets.eValveSeriesType Type { get; set; }

        /// <summary>
        /// æŽ’序码

 Vmo/HStation.Vmo.Assets.Core/02-ValveManage/ValveSeriesVmo.cs

@@ -45,6 +45,6 @@
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public eValveSeriesType Type { get; set; }
        public HStation.Assets.eValveSeriesType Type { get; set; }
    }
}

 Vmo/HStation.Vmo.Assets.Core/03-AdaptingManage/AdaptingManage.cs

@@ -1,4 +1,7 @@
namespace HStation.Vmo
using HStation.Assets;

namespace HStation.Vmo

{
    public class AdaptingManageVmo
    {

 Vmo/HStation.Vmo.Assets.Core/04-PipeLineRoughnessCoefficient/AdaptingManage.cs

@@ -1,4 +1,6 @@
namespace HStation.Vmo
using HStation.Assets;

namespace HStation.Vmo
{
    public class PipeLineRoughnessCoefficientVmo
    {

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingManageMainPanel.cs

@@ -35,7 +35,7 @@
        private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AddAdaptingMainDlg();
            dlg.SetBindingData(Service.Assets.eAdaptingType.Elbow);
            dlg.SetBindingData(HStation.Assets.eAdaptingType.Elbow);
            dlg.ReloadDataEvent += async (rhs) =>
            {
                var id = await _bll.Insert(rhs);

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs

@@ -22,7 +22,7 @@

        public void Reset(Vmo.AdaptingManageVmo rhs)
        {
            this.AdaptingType = (Service.Assets.eAdaptingType)rhs.AdaptingType;
            this.AdaptingType = (HStation.Assets.eAdaptingType)rhs.AdaptingType;
            this.Coefficient = rhs.Coefficient;
            this.Material = rhs.Material;
            this.ID = rhs.ID;
@@ -42,7 +42,7 @@
        /// </summary>
        [DisplayName("附件类型")]
        [Browsable(true)]
        public Service.Assets.eAdaptingType AdaptingType { get; set; }
        public HStation.Assets.eAdaptingType AdaptingType { get; set; }

        /// <summary>
        /// åç§°

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AddAdaptingMainDlg.cs

@@ -11,7 +11,7 @@

        private Vmo.AdaptingManageVmo _AdaptingVmo = null;

        public async void SetBindingData(Service.Assets.eAdaptingType AdaptingType)
        public async void SetBindingData(HStation.Assets.eAdaptingType AdaptingType)
        {
            _AdaptingVmo = new Vmo.AdaptingManageVmo();
            _AdaptingVmo.AdaptingType = AdaptingType;
@@ -33,7 +33,7 @@
                    TextEditMaterial.Properties.Items.Add(imageItem);
                }
            }
            TextEditAdaptingType.Properties.AddEnum(typeof(eAdaptingType));
            TextEditAdaptingType.Properties.AddEnum(typeof(HStation.Assets.eAdaptingType));
            TextEditCaliber.SelectedIndex = 0;
            TextEditMaterial.SelectedIndex = 0;
        }
@@ -62,7 +62,7 @@
            _AdaptingVmo.Description = DescriptionTextEdit.Text.Trim();
            _AdaptingVmo.Name = TextEditName.Text.Trim();
            _AdaptingVmo.Caliber = TextEditCaliber.Text.Trim();
            if (Enum.TryParse(Convert.ToString(TextEditAdaptingType.EditValue), true, out eAdaptingType adaptingtype))
            if (Enum.TryParse(Convert.ToString(TextEditAdaptingType.EditValue), true, out HStation.Assets.eAdaptingType adaptingtype))
            {
                _AdaptingVmo.AdaptingType = adaptingtype;
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/EditAdaptingMainDlg.cs

@@ -68,7 +68,7 @@
            _AdaptingVmo.Description = TextEditDescription.Text.Trim();
            _AdaptingVmo.Name = TextEditName.Text.Trim();
            _AdaptingVmo.Caliber = TextEditCaliber.Text.Trim();
            if (Enum.TryParse(Convert.ToString(TextEditAdaptingType.EditValue), true, out eAdaptingType adaptingtype))
            if (Enum.TryParse(Convert.ToString(TextEditAdaptingType.EditValue), true, out HStation.Assets.eAdaptingType adaptingtype))
            {
                _AdaptingVmo.AdaptingType = adaptingtype;
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/00-ViewModel/ValveMainViewModel.cs

@@ -71,7 +71,7 @@
        /// </summary>
        [DisplayName("类型")]
        [Browsable(true)]
        public eValveSeriesType Type { get; set; }
        public HStation.Assets.eValveSeriesType Type { get; set; }

        /// <summary>
        /// è¯´æ˜Ž

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-ValveManage/00-ViewModel/ValveSeriesViewModel.cs

@@ -28,6 +28,6 @@
        public long ID { get; set; }
        public long ParentID { get; set; }
        public string Description { get; set; }
        public HStation.Service.Assets.eValveSeriesType Type { get; set; }
        public HStation.Assets.eValveSeriesType Type { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/01-series/AddValveSeriesDlg.cs

@@ -12,7 +12,7 @@
        //初始化
        private void AddValveSeriesDlg_Load(object sender, EventArgs e)
        {
            TextEditType.Properties.AddEnum(typeof(HStation.Service.Assets.eValveSeriesType));
            TextEditType.Properties.AddEnum(typeof(HStation.Assets.eValveSeriesType));
        }

        //数据验证
@@ -34,7 +34,7 @@
                return;
            var model = new Vmo.ValveSeriesVmo();
            model.Name = NameTextEdit.Text;
            if (Enum.TryParse(Convert.ToString(TextEditType.EditValue), true, out HStation.Service.Assets.eValveSeriesType valvetype))
            if (Enum.TryParse(Convert.ToString(TextEditType.EditValue), true, out HStation.Assets.eValveSeriesType valvetype))
            {
                model.Type = valvetype;
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/01-series/EditValveSeriesDlg.cs

@@ -13,7 +13,7 @@

        public void SetBindingData(Vmo.ValveSeriesVmo seriesVmo)
        {
            TextEditType.Properties.AddEnum(typeof(HStation.Service.Assets.eValveSeriesType));
            TextEditType.Properties.AddEnum(typeof(HStation.Assets.eValveSeriesType));
            TextEditType.EditValue = seriesVmo.Type;
            _valveSeries = seriesVmo;
            this.NameTextEdit.Text = _valveSeries.Name;
@@ -39,7 +39,7 @@
            if (!Valid())
                return;
            _valveSeries.Name = NameTextEdit.Text;
            if (Enum.TryParse(Convert.ToString(TextEditType.EditValue), true, out HStation.Service.Assets.eValveSeriesType valvetype))
            if (Enum.TryParse(Convert.ToString(TextEditType.EditValue), true, out HStation.Assets.eValveSeriesType valvetype))
            {
                _valveSeries.Type = valvetype;
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-valveManage/02-main/AddValveMainDlg.cs

@@ -11,7 +11,7 @@

        private Vmo.ValveMainVmo _ValveMain = null;   //阀门型号

        public async void SetBindingData(long SeriesID, eValveSeriesType type)
        public async void SetBindingData(long SeriesID, HStation.Assets.eValveSeriesType type)
        {
            _ValveMain = new Vmo.ValveMainVmo();
            _ValveMain.SeriesID = SeriesID;

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.Designer.cs

@@ -267,11 +267,12 @@
            // 
            // layoutControlItem11
            // 
            layoutControlItem11.AllowHtmlStringInCaption = true;
            layoutControlItem11.Control = TextEditHazenValue;
            layoutControlItem11.Location = new Point(0, 0);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(645, 24);
            layoutControlItem11.Text = "Hazen:";
            layoutControlItem11.Text = "<color=red>*</color>Hazen:";
            layoutControlItem11.TextSize = new Size(49, 14);
            // 
            // layoutControlItem3

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/AddPipeLineMainDlg.cs

@@ -47,6 +47,11 @@
                this.dxErrorProvider1.SetError(this.TextEditName, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(TextEditHazenValue.Text.Trim()))
            {
                this.dxErrorProvider1.SetError(this.TextEditHazenValue, "必填项");
                return false;
            }
            return true;
        }

@@ -79,16 +84,16 @@
        {
            TextEditManningValue.Text = null;
            TextEditHazenValue.Text = null;
            TextEditManningValue.Text = null;
            TextEditDarcyValue.Text = null;
            var bll = new BLL.PipeLineRoughnessCoefficient();
            var materialid = Convert.ToInt64(TextEditMaterial.EditValue);
            var alllist = await bll.GetByPipeID(materialid);
            if (alllist == null || alllist.Count == 0)
                return;
            var manning = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Manning);
            var manning = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Manning);
            if (manning != null)
            {
                if (manning.EndValue != null || manning.EndValue != string.Empty)
                if (manning.EndValue != null && manning.EndValue != string.Empty)
                {
                    this.toolTipController1.SetToolTip(TextEditManningValue, "正确范围应在:" + string.Format("{0}~{1}", manning.StartValue, manning.EndValue));
                }
@@ -97,10 +102,10 @@
                    this.TextEditManningValue.Text = manning.StartValue.ToString();
                }
            }
            var hazen = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Hazen);
            var hazen = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Hazen);
            if (hazen != null)
            {
                if (hazen.EndValue != null)
                if (hazen.EndValue != null && hazen.EndValue != string.Empty)
                {
                    this.toolTipController1.SetToolTip(TextEditHazenValue, "正确范围应在:" + string.Format("{0}~{1}", hazen.StartValue, hazen.EndValue));
                }
@@ -109,10 +114,10 @@
                    this.TextEditHazenValue.Text = hazen.StartValue.ToString();
                }
            }
            var darcy = alllist.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Darcy);
            var darcy = alllist.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Darcy);
            if (darcy != null)
            {
                if (darcy.EndValue != null)
                if (darcy.EndValue != null && darcy.EndValue != string.Empty)
                {
                    this.toolTipController1.SetToolTip(TextEditDarcyValue, "正确范围应在:" + string.Format("{0}~{1}", darcy.StartValue, darcy.EndValue));
                }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/CoefficientDisplayNameHelper.cs

@@ -12,7 +12,7 @@
        public static CoefficientDisplayNameHelper GetStringName(List<Vmo.PipeLineRoughnessCoefficientVmo> vmos)
        {
            var model = new CoefficientDisplayNameHelper();
            var hazenVmo = vmos.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Hazen);
            var hazenVmo = vmos.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Hazen);
            if (hazenVmo != null)
            {
                if (hazenVmo.EndValue != string.Empty)
@@ -24,7 +24,7 @@
                    model.hazen = hazenVmo.StartValue;
                }
            }
            var darcyVmo = vmos.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Darcy);
            var darcyVmo = vmos.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Darcy);
            if (darcyVmo != null)
            {
                if (darcyVmo.EndValue != string.Empty)
@@ -36,7 +36,7 @@
                    model.darcy = darcyVmo.StartValue;
                }
            }
            var manningVmo = vmos.Find(x => x.eAlgorithmType == Service.Assets.eAlgorithmType.Manning);
            var manningVmo = vmos.Find(x => x.eAlgorithmType == HStation.Assets.eAlgorithmType.Manning);
            if (manningVmo != null)
            {
                if (manningVmo.EndValue != string.Empty)

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.Designer.cs

@@ -35,8 +35,10 @@
            BtnEdit = new DevExpress.XtraBars.BarButtonItem();
            BtnDelete = new DevExpress.XtraBars.BarButtonItem();
            BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
            BtnDescription = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            svgImageCollection1 = new DevExpress.Utils.SvgImageCollection(components);
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -50,8 +52,6 @@
            colManning = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            BtnDescription = new DevExpress.XtraBars.BarButtonItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
            sidePanel1.SuspendLayout();
@@ -107,6 +107,14 @@
            BarBtnEidtPumpPart.Id = 16;
            BarBtnEidtPumpPart.Name = "BarBtnEidtPumpPart";
            // 
            // BtnDescription
            // 
            BtnDescription.Caption = "说明";
            BtnDescription.Id = 22;
            BtnDescription.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDescription.ImageOptions.SvgImage");
            BtnDescription.Name = "BtnDescription";
            BtnDescription.ItemClick += BtnDescription_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
@@ -120,6 +128,12 @@
            ribbonPageGroup1.ItemLinks.Add(BtnDelete);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础功能";
            // 
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(BtnDescription);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "更多";
            // 
            // svgImageCollection1
            // 
@@ -195,31 +209,34 @@
            // 
            colHazen.AppearanceCell.Options.UseTextOptions = true;
            colHazen.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colHazen.Caption = "威廉姆斯粗糙系数";
            colHazen.FieldName = "Hazen";
            colHazen.Name = "colHazen";
            colHazen.Visible = true;
            colHazen.VisibleIndex = 3;
            colHazen.Width = 125;
            colHazen.Width = 136;
            // 
            // colDarcy
            // 
            colDarcy.AppearanceCell.Options.UseTextOptions = true;
            colDarcy.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colDarcy.Caption = "达西粗糙系数";
            colDarcy.FieldName = "Darcy";
            colDarcy.Name = "colDarcy";
            colDarcy.Visible = true;
            colDarcy.VisibleIndex = 4;
            colDarcy.Width = 150;
            colDarcy.Width = 147;
            // 
            // colManning
            // 
            colManning.AppearanceCell.Options.UseTextOptions = true;
            colManning.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colManning.Caption = "曼宁粗糙系数";
            colManning.FieldName = "Manning";
            colManning.Name = "colManning";
            colManning.Visible = true;
            colManning.VisibleIndex = 5;
            colManning.Width = 128;
            colManning.Width = 125;
            // 
            // colSortCode
            // 
@@ -239,21 +256,7 @@
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 6;
            colDescription.Width = 233;
            // 
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(BtnDescription);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "更多";
            // 
            // BtnDescription
            // 
            BtnDescription.Caption = "说明";
            BtnDescription.Id = 22;
            BtnDescription.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
            BtnDescription.Name = "BtnDescription";
            BtnDescription.ItemClick += BtnDescription_ItemClick;
            colDescription.Width = 228;
            // 
            // PipeLineManageMainPanel
            // 

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManage.resx

@@ -189,7 +189,7 @@
        L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="barButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="BtnDescription.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj

@@ -8,7 +8,7 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.7" />
    <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.8" />
  </ItemGroup>

  <ItemGroup>

 WinFrmUI/HStation.WinFrmUI.Dict.Core/ValveManageMainPanel.cs

@@ -61,7 +61,7 @@
                if (id > 0)
                {
                    rhs.ID = id;
                    _allBindingList.Add(new DictTypeViewModel(rhs));
                    _allBindingList.Add(new DictTypeViewModel(await _bll.GetByID(id)));
                    this.dictTypeViewModelBindingSource.ResetBindings(false);
                    return true;
                }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/HomeXhsProjectPage.cs

@@ -187,7 +187,7 @@
                    {
                        Modular = "Xhs",
                        MoudingType = eMoudingType.Tab,
                        Function = "PumpMgr",
                        Function = "pumpMgr",
                    };
                    if (!IsExistPage(pumpGuid, true))
                    {
@@ -201,7 +201,7 @@
                    {
                        Modular = "Xhs",
                        MoudingType = eMoudingType.Tab,
                        Function = "VlveMgr",
                        Function = "ValveMgr",
                    };
                    if (!IsExistPage(valveGuid, true))
                    {

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/00-core/PumpMainChoiceManager.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/00-core/PumpMainChoiceViewModel.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ChoicePumpMainDlg.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ChoicePumpMainDlg.resx

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/PumpMainChoicePage.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ValveChoicePage.Designer.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ValveChoicePage.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs

@@ -80,7 +80,7 @@
        //临时---选择泵型号
        private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new ChoicePumpMainDlg();
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.SetBindingData();
            dlg.ShowDialog();
        }
@@ -115,7 +115,7 @@
        //自动匹配
        private void barBtnAutoMatch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new ChoicePumpMainDlg();
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.SetBindingData();
            dlg.ShowDialog();


 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingInputViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
namespace HStation.WinFrmUI
{
    public class AssetsAutoMatchingInputViewModel
    {
        /// <summary>
        /// æ°´æ³µåˆ—表
        /// </summary>
        public List<PumpMatchingViewModel> PumpMatchingModels { get; set; }

        /// <summary>
        /// è¿žæŽ¥ä»¶åˆ—表
        /// </summary>
        public List<AdaptingMatchingViewModel> AdaptingMatchingModels { get; set; }

        /// <summary>
        /// ç®¡é“列表
        /// </summary>
        public List<PipeLineMatchingViewModel> PipeLineMatchingModels { get; set; }

        /// <summary>
        /// é˜€é—¨åˆ—表
        /// </summary>
        public List<ValveMatchingViewModel> ValveMatchingModels { get; set; }
    }

    /// <summary>
    /// è¿žæŽ¥ä»¶
    /// </summary>
    public class AdaptingMatchingViewModel
    {
        public long ID { get; set; }

        /// <summary>
        /// ç¼–码
        /// </summary>
        public string Code { get; set; }

        /// <summary>
        /// åž‹å·å
        /// </summary>
        public string ModelType { get; set; }

        /// <summary>
        /// æž„建类型
        /// </summary>
 //       public .Assets.eAdaptingType MatchingType { get; set; }

        /// <summary>
        /// æè´¨
        /// </summary>
        public string Material { get; set; }

        /// <summary>
        /// å£å¾„
        /// </summary>
        public string Caliber { get; set; }
    }

    /// <summary>
    /// ç®¡é“
    /// </summary>
    public class PipeLineMatchingViewModel
    {
        public long ID { get; set; }

        //       public HStation.Assets.eAlgorithmType

        /// <summary>
        /// åž‹å·å
        /// </summary>
        public string ModelType { get; set; }

        /// <summary>
        /// æè´¨
        /// </summary>
        public string Material { get; set; }

        /// <summary>
        /// å£å¾„
        /// </summary>
        public string Caliber { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ChoicePumpMainDlg.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI.Xhs 
{ 
    partial class ChoicePumpMainDlg
    partial class AssetsAutoMatchingMainDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -28,43 +28,38 @@
        /// </summary>
        private void InitializeComponent()
        {
            ComponentResourceManager resources = new ComponentResourceManager(typeof(ChoicePumpMainDlg));
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            btnComplete = new SimpleButton();
            navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
            navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
            pumpMainChoicePage = new PumpMainChoicePage();
            navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
            valveChoicePage1 = new ValveChoicePage();
            btnPrev = new SimpleButton();
             btnPrev = new SimpleButton();
            btnNext = new SimpleButton();
            stepProgressBar1 = new StepProgressBar();
            stepPbSelectModelFile = new StepProgressBarItem();
            stepPbSetMapLocation = new StepProgressBarItem();
            btnCancel = new SimpleButton();
            simpleButton1 = new SimpleButton();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
            itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
            itemForNext = new DevExpress.XtraLayout.LayoutControlItem();
            itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)navigationFrame1).BeginInit();
            navigationFrame1.SuspendLayout();
            navigationPage1.SuspendLayout();
            navigationPage2.SuspendLayout();
            ((ISupportInitialize)stepProgressBar1).BeginInit();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)itemForComplete).BeginInit();
            ((ISupportInitialize)itemForCancel).BeginInit();
            ((ISupportInitialize)itemForNext).BeginInit();
            ((ISupportInitialize)itemForPrev).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -73,8 +68,8 @@
            layoutControl1.Controls.Add(navigationFrame1);
            layoutControl1.Controls.Add(btnPrev);
            layoutControl1.Controls.Add(btnNext);
            layoutControl1.Controls.Add(stepProgressBar1);
            layoutControl1.Controls.Add(btnCancel);
            layoutControl1.Controls.Add(simpleButton1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
@@ -102,11 +97,11 @@
            // 
            navigationFrame1.Controls.Add(navigationPage1);
            navigationFrame1.Controls.Add(navigationPage2);
            navigationFrame1.Location = new Point(12, 86);
            navigationFrame1.Location = new Point(12, 38);
            navigationFrame1.Name = "navigationFrame1";
            navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2 });
            navigationFrame1.SelectedPage = navigationPage1;
            navigationFrame1.Size = new Size(1051, 457);
            navigationFrame1.Size = new Size(1051, 505);
            navigationFrame1.TabIndex = 2;
            navigationFrame1.Text = "navigationFrame1";
            // 
@@ -115,124 +110,44 @@
            navigationPage1.Caption = "navigationPage1";
            navigationPage1.Controls.Add(pumpMainChoicePage);
            navigationPage1.Name = "navigationPage1";
            navigationPage1.Size = new Size(1051, 457);
            navigationPage1.Size = new Size(1051, 505);
            // 
            // pumpMainChoicePage
            // 
            pumpMainChoicePage.Dock = DockStyle.Fill;
            pumpMainChoicePage.Location = new Point(0, 0);
            pumpMainChoicePage.Name = "pumpMainChoicePage";
            pumpMainChoicePage.Size = new Size(1051, 457);
            pumpMainChoicePage.Size = new Size(1051, 505);
            pumpMainChoicePage.TabIndex = 0;
            // 
            // navigationPage2
              // 
             // 
             // 
             // 
            // simpleButton1
            // 
            navigationPage2.Caption = "navigationPage2";
            navigationPage2.Controls.Add(valveChoicePage1);
            navigationPage2.Name = "navigationPage2";
            navigationPage2.Size = new Size(1051, 457);
            // 
            // valveChoicePage1
            // 
            valveChoicePage1.Dock = DockStyle.Top;
            valveChoicePage1.Location = new Point(0, 0);
            valveChoicePage1.Name = "valveChoicePage1";
            valveChoicePage1.Size = new Size(1051, 150);
            valveChoicePage1.TabIndex = 0;
            // 
            // btnPrev
            // 
            btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            btnPrev.Appearance.Options.UseBackColor = true;
            btnPrev.Location = new Point(635, 547);
            btnPrev.MinimumSize = new Size(104, 0);
            btnPrev.Name = "btnPrev";
            btnPrev.Size = new Size(104, 22);
            btnPrev.StyleController = layoutControl1;
            btnPrev.TabIndex = 5;
            btnPrev.Text = "<上一步";
            btnPrev.Click += btnPrev_Click;
            // 
            // btnNext
            // 
            btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnNext.Appearance.Options.UseBackColor = true;
            btnNext.Location = new Point(743, 547);
            btnNext.MaximumSize = new Size(104, 0);
            btnNext.MinimumSize = new Size(104, 0);
            btnNext.Name = "btnNext";
            btnNext.Size = new Size(104, 22);
            btnNext.StyleController = layoutControl1;
            btnNext.TabIndex = 4;
            btnNext.Text = "下一步>";
            btnNext.Click += btnNext_Click;
            // 
            // stepProgressBar1
            // 
            stepProgressBar1.ContentAlignment = ContentAlignment.MiddleLeft;
            stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImage");
            stepProgressBar1.ItemOptions.Indicator.ActiveStateImageOptions.SvgImageSize = new Size(20, 20);
            stepProgressBar1.Items.Add(stepPbSelectModelFile);
            stepProgressBar1.Items.Add(stepPbSetMapLocation);
            stepProgressBar1.Location = new Point(12, 12);
            stepProgressBar1.MaximumSize = new Size(900, 70);
            stepProgressBar1.MinimumSize = new Size(900, 70);
            stepProgressBar1.Name = "stepProgressBar1";
            stepProgressBar1.SelectedItemIndex = 0;
            stepProgressBar1.Size = new Size(900, 70);
            stepProgressBar1.StyleController = layoutControl1;
            stepProgressBar1.TabIndex = 0;
            stepProgressBar1.Visible = false;
            // 
            // stepPbSelectModelFile
            // 
            stepPbSelectModelFile.ContentBlock2.Caption = "泵型号匹配";
            stepPbSelectModelFile.Name = "stepPbSelectModelFile";
            stepPbSelectModelFile.State = StepProgressBarItemState.Active;
            // 
            // stepPbSetMapLocation
            // 
            stepPbSetMapLocation.ContentBlock2.Caption = "阀门匹配";
            stepPbSetMapLocation.Name = "stepPbSetMapLocation";
            // 
            // btnCancel
            // 
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.Location = new Point(851, 547);
            btnCancel.MaximumSize = new Size(104, 0);
            btnCancel.MinimumSize = new Size(104, 0);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(104, 22);
            btnCancel.StyleController = layoutControl1;
            btnCancel.TabIndex = 3;
            btnCancel.Text = "取消";
            btnCancel.Click += btnCancel_Click;
            simpleButton1.Location = new Point(12, 12);
            simpleButton1.Name = "simpleButton1";
            simpleButton1.Size = new Size(1051, 22);
            simpleButton1.StyleController = layoutControl1;
            simpleButton1.TabIndex = 7;
            simpleButton1.Text = "simpleButton1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, itemForComplete, itemForCancel, itemForNext, itemForPrev });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, emptySpaceItem1, itemForComplete, itemForCancel, itemForNext, itemForPrev, layoutControlItem3 });
            Root.Name = "Root";
            Root.Size = new Size(1075, 581);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = stepProgressBar1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(1055, 74);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = navigationFrame1;
            layoutControlItem2.Location = new Point(0, 74);
            layoutControlItem2.Location = new Point(0, 26);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(1055, 461);
            layoutControlItem2.Size = new Size(1055, 509);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            // 
@@ -292,13 +207,22 @@
            itemForPrev.TextSize = new Size(0, 0);
            itemForPrev.TextVisible = false;
            // 
            // ChoicePumpMainDlg
            // layoutControlItem3
            // 
            layoutControlItem3.Control = simpleButton1;
            layoutControlItem3.Location = new Point(0, 0);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(1055, 26);
            layoutControlItem3.TextSize = new Size(0, 0);
            layoutControlItem3.TextVisible = false;
            // 
            // AssetsAutoMatchingMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(1075, 581);
            Controls.Add(layoutControl1);
            Name = "ChoicePumpMainDlg";
            Name = "AssetsAutoMatchingMainDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "泵型号选择";
            ((ISupportInitialize)layoutControl1).EndInit();
@@ -307,15 +231,14 @@
            navigationFrame1.ResumeLayout(false);
            navigationPage1.ResumeLayout(false);
            navigationPage2.ResumeLayout(false);
            ((ISupportInitialize)stepProgressBar1).EndInit();
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)itemForComplete).EndInit();
            ((ISupportInitialize)itemForCancel).EndInit();
            ((ISupportInitialize)itemForNext).EndInit();
            ((ISupportInitialize)itemForPrev).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ResumeLayout(false);
        }

@@ -326,10 +249,6 @@
        private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2;
        private DevExpress.XtraEditors.StepProgressBar stepProgressBar1;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbSelectModelFile;
        private DevExpress.XtraEditors.StepProgressBarItem stepPbSetMapLocation;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraEditors.SimpleButton btnComplete;
        private DevExpress.XtraEditors.SimpleButton btnPrev;
@@ -341,6 +260,7 @@
        private DevExpress.XtraLayout.LayoutControlItem itemForPrev;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private PumpMainChoicePage pumpMainChoicePage;
         private ValveChoicePage valveChoicePage1;
        private SimpleButton simpleButton1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
namespace HStation.WinFrmUI.Xhs
{
    public partial class AssetsAutoMatchingMainDlg : DevExpress.XtraEditors.XtraForm
    {
        public AssetsAutoMatchingMainDlg()
        {
            InitializeComponent();
        }

        public void SetBindingData()
        {
        }

        //完成
        private void btnComplete_Click(object sender, EventArgs e)
        {
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.resx

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ValveChoicePage.resx ÐÞ¸Ä
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
  <!--
    Microsoft ResX Schema 
    

    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    

    Example:
    

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 

    There are any number of "resheader" rows that contain simple
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/FourLinkMatchingViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
namespace HStation.WinFrmUI
{
    public class FourLinkMatchingViewModel : AdaptingViewModel
    {
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/PumpMainChoicePage.Designer.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/PumpMainChoicePage.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
namespace HStation.WinFrmUI.Xhs
{
    public partial class PumpMainChoicePage : DevExpress.XtraEditors.XtraUserControl
    {
        public PumpMainChoicePage()
        {
            InitializeComponent();
            this.gridView1.SetNormalView(30);
            this.gridView1.OptionsView.ShowDetailButtons = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
        }

        /// <summary>
        /// åˆå§‹åŒ–
        /// </summary>
        public async void InitialPage()
        {
            var list = new List<HydroPumpViewModel>();
            list.Add(new HydroPumpViewModel { ID = 1, Name = "父", testChildrens = new List<TestChildren> { new TestChildren { Id = 2, Name = "子" } } });
            this.hydroPumpViewModelBindingSource.DataSource = list;
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/PumpMainChoicePage.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/PumpMainChoieViewModel.cs

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/ViewModel/AdaptingViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
namespace HStation.WinFrmUI
{
    public class AdaptingViewModel
    {
        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        ///
        /// </summary>
        public long Dbid { get; set; }

        /// <summary>
        /// ç¼–码
        /// </summary>
        public string Code { get; set; }

        /// <summary>
        /// åž‹å·å
        /// </summary>
        public string ModelType { get; set; }

        /// <summary>
        /// æè´¨
        /// </summary>
        public string Material { get; set; }

        /// <summary>
        /// å£å¾„
        /// </summary>
        public string Caliber { get; set; }

        /// <summary>
        /// Db锁定
        /// </summary>
        public bool DbLocked { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/ViewModel/PumpMatchingViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
namespace HStation.WinFrmUI
{
    public class PumpMatchingViewModel
    {
        public long ID { get; set; }

        /// <summary>
        /// åç§°
        /// </summary>
        public string Name { get; set; }

        /// <summary>
        /// åž‹å·å
        /// </summary>
        public string ModelType { get; set; }

        /// <summary>
        /// é¢å®šåŠŸçŽ‡
        /// </summary>
        public double RatedP { get; set; }

        /// <summary>
        ///  é¢å®šæµé‡
        /// </summary>
        public double? RatedQ { get; set; }

        /// <summary>
        /// é¢å®šæ‰¬ç¨‹
        /// </summary>
        public double? RatedH { get; set; }

        /// <summary>
        /// é¢å®šè½¬é€Ÿ
        /// </summary>
        public double? RatedN { get; set; }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/ViewModel/ThreeLinkMatchingViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
namespace HStation.WinFrmUI
{
    public class ThreeLinkMatchingViewModel : AdaptingViewModel
    {
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/ViewModel/ValveMatchingViewModel.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
namespace HStation.WinFrmUI
{
    public class ValveMatchingViewModel : AdaptingViewModel
    {
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/PerformChart.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,81 @@
namespace HStation.WinFrmUI
{
    partial class PerformChart
    {
        /// <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()
        {
            DevExpress.XtraCharts.XYDiagram xyDiagram1 = new DevExpress.XtraCharts.XYDiagram();
            DevExpress.XtraCharts.Series series1 = new DevExpress.XtraCharts.Series();
            DevExpress.XtraCharts.SplineSeriesView splineSeriesView1 = new DevExpress.XtraCharts.SplineSeriesView();
            chartControl1 = new DevExpress.XtraCharts.ChartControl();
            ((ISupportInitialize)chartControl1).BeginInit();
            ((ISupportInitialize)xyDiagram1).BeginInit();
            ((ISupportInitialize)series1).BeginInit();
            ((ISupportInitialize)splineSeriesView1).BeginInit();
            SuspendLayout();
            // 
            // chartControl1
            // 
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
            xyDiagram1.AxisY.VisibleInPanesSerializable = "-1";
            chartControl1.Diagram = xyDiagram1;
            chartControl1.Dock = DockStyle.Fill;
            chartControl1.Legend.LegendID = -1;
            chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
            chartControl1.Location = new Point(0, 0);
            chartControl1.Name = "chartControl1";
            series1.Name = "SeriesPoint";
            series1.SeriesID = 2;
            series1.View = splineSeriesView1;
            chartControl1.SeriesSerializable = new DevExpress.XtraCharts.Series[]
    {
    series1
    };
            chartControl1.Size = new Size(872, 546);
            chartControl1.TabIndex = 0;
            // 
            // PerformChart
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(872, 546);
            Controls.Add(chartControl1);
            Name = "PerformChart";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "曲线展示";
            ((ISupportInitialize)xyDiagram1).EndInit();
            ((ISupportInitialize)splineSeriesView1).EndInit();
            ((ISupportInitialize)series1).EndInit();
            ((ISupportInitialize)chartControl1).EndInit();
            ResumeLayout(false);
        }

        #endregion

        private DevExpress.XtraCharts.ChartControl chartControl1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/PerformChart.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
using DevExpress.XtraCharts;
using Yw.WinFrmUI.Phart;

namespace HStation.WinFrmUI
{
    public partial class PerformChart : DevExpress.XtraEditors.XtraForm
    {
        public PerformChart()
        {
            InitializeComponent();
            this.chartControl1.SetChartBackColor();
        }

        public class DataPoint
        {
            public DataPoint(double x, double y)
            {
                X = x;
                Y = y;
            }

            public double X { get; set; }
            public double Y { get; set; }
        }

        public void SetBindingData(List<DataPoint> dataPoint, string xTitle = "Xè½´", string yTitle = "Yè½´")
        {
            var series = this.chartControl1.GetSeriesByName("SeriesPoint");
            series.DataSource = dataPoint;
            series.ArgumentScaleType = ScaleType.Numerical;
            series.ArgumentDataMember = "X";
            series.ValueScaleType = ScaleType.Numerical;
            series.ValueDataMembers.AddRange(new string[] { "Y" });
            chartControl1.Series.Add(series);
            XYDiagram diagram = (XYDiagram)chartControl1.Diagram;
            //Xè½´
            diagram.AxisX.Title.Visible = true;
            diagram.AxisX.Title.Text = xTitle;
            diagram.AxisX.Title.TextColor = Color.DodgerBlue;
            diagram.AxisX.Label.TextColor = Color.DodgerBlue;
            diagram.AxisX.Title.Font = new Font("Tahoma", 12, FontStyle.Regular);
            //Yè½´
            diagram.AxisY.Title.Visible = true;
            diagram.AxisY.Title.Text = yTitle;
            diagram.AxisY.Title.TextColor = Color.Crimson;
            diagram.AxisY.Label.TextColor = Color.Crimson;
            diagram.AxisY.Title.Font = new Font("Tahoma", 12, FontStyle.Regular);
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/PerformChart.resx

copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ValveChoicePage.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/PerformChart.resx
Îļþ´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain_Wizrad/ValveChoicePage.resx ¸´ÖÆ
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
  <!--
    Microsoft ResX Schema 
    

    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    

    Example:
    

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 

    There are any number of "resheader" rows that contain simple
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs

@@ -43,6 +43,7 @@
            barBtnValveMatching = new DevExpress.XtraBars.BarButtonItem();
            barBtnPipeMatching = new DevExpress.XtraBars.BarButtonItem();
            barBtn = new DevExpress.XtraBars.BarButtonItem();
            BtnPerformChart = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -73,15 +74,15 @@
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnAllAutoMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, BtnPerformChart });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 18;
            ribbonControl1.MaxItemId = 19;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.Size = new Size(951, 128);
            ribbonControl1.Size = new Size(951, 101);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
            // barBtnHydroCheck
@@ -138,6 +139,7 @@
            barBtnAllAutoMatching.Id = 10;
            barBtnAllAutoMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAllAutoMatching.ImageOptions.SvgImage");
            barBtnAllAutoMatching.Name = "barBtnAllAutoMatching";
            barBtnAllAutoMatching.ItemClick += barBtnAllAutoMatching_ItemClick;
            // 
            // barBtnSingleMatching
            // 
@@ -175,6 +177,14 @@
            barBtn.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtn.ImageOptions.SvgImage");
            barBtn.Name = "barBtn";
            // 
            // BtnPerformChart
            // 
            BtnPerformChart.Caption = "显示曲线";
            BtnPerformChart.Id = 18;
            BtnPerformChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPerformChart.ImageOptions.SvgImage");
            BtnPerformChart.Name = "BtnPerformChart";
            BtnPerformChart.ItemClick += BtnPerformChart_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
@@ -201,6 +211,7 @@
            // ribbonPageGroup3
            // 
            ribbonPageGroup3.ItemLinks.Add(barBtnSave);
            ribbonPageGroup3.ItemLinks.Add(BtnPerformChart);
            ribbonPageGroup3.Name = "ribbonPageGroup3";
            ribbonPageGroup3.Text = "更多...";
            // 
@@ -214,12 +225,12 @@
            tabPane1.Controls.Add(pageBimface);
            tabPane1.Controls.Add(pageQ3d);
            tabPane1.Dock = DockStyle.Fill;
            tabPane1.Location = new Point(0, 128);
            tabPane1.Location = new Point(0, 101);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
            tabPane1.RegularSize = new Size(651, 459);
            tabPane1.RegularSize = new Size(651, 486);
            tabPane1.SelectedPage = pageBimface;
            tabPane1.Size = new Size(651, 459);
            tabPane1.Size = new Size(651, 486);
            tabPane1.TabIndex = 1;
            tabPane1.Text = "tabPane1";
            // 
@@ -228,14 +239,14 @@
            pageBimface.Caption = "三维模型";
            pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
            pageBimface.Name = "pageBimface";
            pageBimface.Size = new Size(651, 426);
            pageBimface.Size = new Size(651, 453);
            // 
            // xhsProjectSimulationBimfaceCtrl1
            // 
            xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
            xhsProjectSimulationBimfaceCtrl1.Size = new Size(651, 426);
            xhsProjectSimulationBimfaceCtrl1.Size = new Size(651, 453);
            xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
            xhsProjectSimulationBimfaceCtrl1.ClickParterEvent += xhsProjectSimulationBimfaceCtrl1_ClickParterEvent;
            // 
@@ -244,14 +255,14 @@
            pageQ3d.Caption = "水力模型";
            pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1);
            pageQ3d.Name = "pageQ3d";
            pageQ3d.Size = new Size(651, 426);
            pageQ3d.Size = new Size(651, 453);
            // 
            // xhsProjectSimulationQ3dCtrl1
            // 
            xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1";
            xhsProjectSimulationQ3dCtrl1.Size = new Size(651, 426);
            xhsProjectSimulationQ3dCtrl1.Size = new Size(651, 453);
            xhsProjectSimulationQ3dCtrl1.TabIndex = 0;
            // 
            // dockManager1
@@ -265,10 +276,10 @@
            docPnlProperty.Controls.Add(dockPanel1_Container);
            docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            docPnlProperty.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
            docPnlProperty.Location = new Point(651, 128);
            docPnlProperty.Location = new Point(651, 101);
            docPnlProperty.Name = "docPnlProperty";
            docPnlProperty.OriginalSize = new Size(300, 200);
            docPnlProperty.Size = new Size(300, 459);
            docPnlProperty.Size = new Size(300, 486);
            docPnlProperty.Text = "属性";
            // 
            // dockPanel1_Container
@@ -276,7 +287,7 @@
            dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
            dockPanel1_Container.Location = new Point(4, 26);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(293, 430);
            dockPanel1_Container.Size = new Size(293, 457);
            dockPanel1_Container.TabIndex = 0;
            // 
            // xhsProjectSimulationPropertyCtrl1
@@ -284,7 +295,7 @@
            xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
            xhsProjectSimulationPropertyCtrl1.Size = new Size(293, 430);
            xhsProjectSimulationPropertyCtrl1.Size = new Size(293, 457);
            xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
            // 
            // svgImg32
@@ -347,5 +358,6 @@
        private XhsProjectSimulationQ3dCtrl xhsProjectSimulationQ3dCtrl1;
        private XhsProjectSimulationPropertyCtrl xhsProjectSimulationPropertyCtrl1;
        private DevExpress.Utils.SvgImageCollection svgImg32;
        private DevExpress.XtraBars.BarButtonItem BtnPerformChart;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -1,4 +1,7 @@
global using Yw.EPAnet;
using HStation.WinFrmUI.Xhs;
using HStation.WinFrmUI.Xhs.Core;

namespace HStation.WinFrmUI
{
    public partial class XhsProjectSimulationCorePage : DocumentPage
@@ -18,7 +21,6 @@
        private Yw.Model.HydroParterInfo _parter = null;
        private Yw.EPAnet.CheckResult _checkResult = null;
        private Yw.EPAnet.CalcuResult _calcuResult = null;


        /// <summary>
        /// ç»‘定数据
@@ -75,12 +77,10 @@
            }
            if (_showHideCodeList == null)
            {

            }
        }

        #endregion

        #endregion æ¨¡åž‹

        #region æ°´åŠ›

@@ -133,8 +133,6 @@
            var dlg = new XhsProjectSimulationHydroCalcuFailedDlg();
            dlg.SetBindingData(_calcuResult.FailedList);
            dlg.ShowDialog();


        }

        //水力构件列表
@@ -231,7 +229,8 @@
                }
            }
        }
        #endregion

        #endregion æ°´åŠ›

        #region æ›´å¤š

@@ -252,9 +251,23 @@
            TipFormHelper.ShowSucceed("保存成功！");
        }

        #endregion
        #endregion æ›´å¤š

        #region è‡ªåŠ¨åŒ¹é…

        //自动匹配
        private void barBtnAllAutoMatching_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.ShowDialog();
        }

        #endregion è‡ªåŠ¨åŒ¹é…

        private void BtnPerformChart_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new PerformChart();
            dlg.ShowDialog();
        }
    }
}
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.resx

@@ -406,6 +406,47 @@
        LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="BtnPerformChart.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMEHAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLlll
        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMzU7fQoJLnN0M3tv
        cGFjaXR5OjAuNjU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iTGluZVN0YWNrZWQxMDBfeDI1XyI+DQogICAg
        PHBhdGggZD0iTTI5LDBjLTEuMywwLTIuNCwwLjgtMi44LDJoLTguNGMtMC40LTEuMi0xLjUtMi0yLjgt
        MnMtMi40LDAuOC0yLjgsMkg1LjhDNS40LDAuOCw0LjMsMCwzLDBDMS4zLDAsMCwxLjMsMCwzICAgczEu
        MywzLDMsM2MxLjMsMCwyLjQtMC44LDIuOC0yaDYuNGMwLjQsMS4yLDEuNSwyLDIuOCwyczIuNC0wLjgs
        Mi44LTJoOC40YzAuNCwxLjIsMS41LDIsMi44LDJjMS43LDAsMy0xLjMsMy0zUzMwLjcsMCwyOSwweiBN
        Myw0ICAgQzIuNCw0LDIsMy42LDIsM3MwLjQtMSwxLTFzMSwwLjQsMSwxUzMuNiw0LDMsNHogTTE1LDRj
        LTAuNiwwLTEtMC40LTEtMXMwLjQtMSwxLTFzMSwwLjQsMSwxUzE1LjYsNCwxNSw0eiBNMjksNGMtMC42
        LDAtMS0wLjQtMS0xICAgczAuNC0xLDEtMXMxLDAuNCwxLDFTMjkuNiw0LDI5LDR6IiBjbGFzcz0iUmVk
        IiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSw4Yy0xLjYsMC0yLjksMS4yLTMsMi44bC04LjUsMi41QzE2Ljks
        MTIuNSwxNiwxMiwxNSwxMmMtMSwwLTEuOCwwLjUtMi40LDEuMkw2LDExYzAtMS43LTEuNC0zLTMtMyAg
        IGMtMS43LDAtMywxLjMtMywzczEuMywzLDMsM2MxLDAsMS44LTAuNSwyLjQtMS4yTDEyLDE1YzAsMCww
        LDAsMCwwYzAsMS43LDEuMywzLDMsM2MxLjYsMCwyLjktMS4zLDMtMi45bDguNy0yLjUgICBDMjcuMSwx
        My41LDI4LDE0LDI5LDE0YzEuNywwLDMtMS4zLDMtM0MzMiw5LjQsMzAuNyw4LDI5LDh6IE0zLDEyYy0w
        LjYsMC0xLTAuNC0xLTFzMC40LTEsMS0xYzAuNiwwLDEsMC40LDEsMVMzLjYsMTIsMywxMnogICAgTTE1
        LDE2Yy0wLjYsMC0xLTAuNC0xLTFzMC40LTEsMS0xYzAuNiwwLDEsMC40LDEsMVMxNS42LDE2LDE1LDE2
        eiBNMjksMTJjLTAuNiwwLTEtMC40LTEtMXMwLjQtMSwxLTFzMSwwLjQsMSwxUzI5LjYsMTIsMjksMTJ6
        IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwyNGMtMSwwLTEuOSwwLjUtMi41LDEu
        M0wxOCwyMi44Yy0wLjEtMS41LTEuNC0yLjgtMy0yLjhjLTEuNywwLTMsMS4zLTMsM2MwLDAuMSwwLDAu
        MywwLDAuNGwtNywzLjUgICBDNC41LDI2LjMsMy44LDI2LDMsMjZjLTEuNywwLTMsMS4zLTMsM3MxLjMs
        MywzLDNzMy0xLjMsMy0zYzAtMC4xLDAtMC4yLDAtMC40bDYuOS0zLjVjMC41LDAuNSwxLjMsMC45LDIu
        MSwwLjkgICBjMS4xLDAsMi0wLjYsMi41LTEuNGw4LjUsMi41YzAuMSwxLjYsMS40LDIuOSwzLDIuOWMx
        LjcsMCwzLTEuMywzLTNTMzAuNywyNCwyOSwyNHogTTMsMzBjLTAuNiwwLTEtMC40LTEtMXMwLjQtMSwx
        LTFzMSwwLjQsMSwxICAgUzMuNiwzMCwzLDMweiBNMTUsMjRjLTAuNiwwLTEtMC40LTEtMXMwLjQtMSwx
        LTFzMSwwLjQsMSwxUzE1LjYsMjQsMTUsMjR6IE0yOSwyOGMtMC42LDAtMS0wLjQtMS0xczAuNC0xLDEt
        MXMxLDAuNCwxLDEgICBTMjkuNiwyOCwyOSwyOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2
        Zz4L
</value>
  </data>
  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>179, 21</value>
  </metadata>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj

@@ -77,6 +77,7 @@
    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
  </ItemGroup>

  <ItemGroup>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user

@@ -61,16 +61,13 @@
    <Compile Update="03-scheme\02-asset-mgr\PumpMain_Wizrad\AddPumpMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\PumpMain_Wizrad\ChoicePumpMainDlg.cs">
    <Compile Update="04-simulation\06-simulation\01-AutoMatching\AssetsAutoMatchingMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\PumpMain_Wizrad\PumpMainForm.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\PumpMain_Wizrad\PumpMainChoicePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\PumpMain_Wizrad\ValveChoicePage.cs">
    <Compile Update="04-simulation\06-simulation\01-AutoMatching\PumpMainChoicePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\XhsProjectAssetsBimfaceCtrl.cs">
@@ -106,6 +103,9 @@
    <Compile Update="04-simulation\05-function\XhsProjectSimulationFunctionMgrCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\PerformChart.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-simulation\06-simulation\XhsProjectSimulationHydroCheckFailedDlg.cs">
      <SubType>Form</SubType>
    </Compile>

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-chart/01-chart/XtrPerform2dChart.Designer.cs

@@ -176,6 +176,7 @@
            chartControl1.Legend.MarkerMode = DevExpress.XtraCharts.LegendMarkerMode.CheckBoxAndMarker;
            chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True;
            chartControl1.Location = new Point(0, 0);
            chartControl1.Margin = new Padding(2, 2, 2, 2);
            chartControl1.Name = "chartControl1";
            series1.Name = "SeriesCurveQH";
            series1.SeriesID = 0;
@@ -214,7 +215,7 @@
    series5,
    series6
    };
            chartControl1.Size = new Size(1023, 857);
            chartControl1.Size = new Size(716, 545);
            chartControl1.TabIndex = 0;
            // 
            // popMenuChart
@@ -323,15 +324,17 @@
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Size = new Size(1023, 0);
            barDockControlTop.Margin = new Padding(2, 2, 2, 2);
            barDockControlTop.Size = new Size(716, 0);
            // 
            // barDockControlBottom
            // 
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 857);
            barDockControlBottom.Location = new Point(0, 545);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Size = new Size(1023, 0);
            barDockControlBottom.Margin = new Padding(2, 2, 2, 2);
            barDockControlBottom.Size = new Size(716, 0);
            // 
            // barDockControlLeft
            // 
@@ -339,15 +342,17 @@
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 0);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Size = new Size(0, 857);
            barDockControlLeft.Margin = new Padding(2, 2, 2, 2);
            barDockControlLeft.Size = new Size(0, 545);
            // 
            // barDockControlRight
            // 
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(1023, 0);
            barDockControlRight.Location = new Point(716, 0);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Size = new Size(0, 857);
            barDockControlRight.Margin = new Padding(2, 2, 2, 2);
            barDockControlRight.Size = new Size(0, 545);
            // 
            // barBtnPositioningMaxQ
            // 
@@ -389,15 +394,16 @@
            // 
            // XtrPerform2dChart
            // 
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(chartControl1);
            Controls.Add(barDockControlLeft);
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Margin = new Padding(2, 2, 2, 2);
            Name = "XtrPerform2dChart";
            Size = new Size(1023, 857);
            Size = new Size(716, 545);
            ((System.ComponentModel.ISupportInitialize)textAnnotation1).EndInit();
            ((System.ComponentModel.ISupportInitialize)constantLine1).EndInit();
            ((System.ComponentModel.ISupportInitialize)constantLine2).EndInit();

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-chart/02-chart-edit/XtrPerform2dEditChart.Designer.cs

@@ -28,13 +28,13 @@
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            components = new System.ComponentModel.Container();
            DevExpress.XtraCharts.TextAnnotation textAnnotation1 = new DevExpress.XtraCharts.TextAnnotation();
            DevExpress.XtraCharts.PaneAnchorPoint paneAnchorPoint1 = new DevExpress.XtraCharts.PaneAnchorPoint();
            DevExpress.XtraCharts.FreePosition freePosition1 = new DevExpress.XtraCharts.FreePosition();
            DevExpress.XtraCharts.XYDiagram xyDiagram1 = new DevExpress.XtraCharts.XYDiagram();
            DevExpress.XtraCharts.SecondaryAxisY secondaryAxisY1 = new DevExpress.XtraCharts.SecondaryAxisY();
            DevExpress.XtraCharts.SecondaryAxisY secondaryAxisY2 = new DevExpress.XtraCharts.SecondaryAxisY();
            DevExpress.XtraCharts.SecondaryAxisY secondaryAxisy1 = new DevExpress.XtraCharts.SecondaryAxisY();
            DevExpress.XtraCharts.SecondaryAxisY secondaryAxisy2 = new DevExpress.XtraCharts.SecondaryAxisY();
            DevExpress.XtraCharts.Series series1 = new DevExpress.XtraCharts.Series();
            DevExpress.XtraCharts.SplineSeriesView splineSeriesView1 = new DevExpress.XtraCharts.SplineSeriesView();
            DevExpress.XtraCharts.Series series2 = new DevExpress.XtraCharts.Series();
@@ -48,44 +48,45 @@
            DevExpress.XtraCharts.Series series6 = new DevExpress.XtraCharts.Series();
            DevExpress.XtraCharts.PointSeriesView pointSeriesView3 = new DevExpress.XtraCharts.PointSeriesView();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XtrPerform2dEditChart));
            this.chartControl1 = new DevExpress.XtraCharts.ChartControl();
            this.popMenuChart = new DevExpress.XtraBars.PopupMenu(this.components);
            this.barCekChartEditMode = new DevExpress.XtraBars.BarCheckItem();
            this.barBtnSetChartAxis = new DevExpress.XtraBars.BarButtonItem();
            this.barBtnCalcCoordinate = new DevExpress.XtraBars.BarButtonItem();
            this.barCekSetAxisNameVisible = new DevExpress.XtraBars.BarCheckItem();
            this.barCekLegendVisible = new DevExpress.XtraBars.BarCheckItem();
            this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            ((System.ComponentModel.ISupportInitialize)(this.chartControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(textAnnotation1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(xyDiagram1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(secondaryAxisY1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(secondaryAxisY2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(series6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.popMenuChart)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
            this.SuspendLayout();
            chartControl1 = new DevExpress.XtraCharts.ChartControl();
            popMenuChart = new DevExpress.XtraBars.PopupMenu(components);
            barCekChartEditMode = new DevExpress.XtraBars.BarCheckItem();
            barBtnSetChartAxis = new DevExpress.XtraBars.BarButtonItem();
            barBtnCalcCoordinate = new DevExpress.XtraBars.BarButtonItem();
            barCekSetAxisNameVisible = new DevExpress.XtraBars.BarCheckItem();
            barCekLegendVisible = new DevExpress.XtraBars.BarCheckItem();
            barManager1 = new DevExpress.XtraBars.BarManager(components);
            barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            ((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textAnnotation1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)popMenuChart).BeginInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            SuspendLayout();
            // 
            // chartControl1
            // 
            paneAnchorPoint1.AxisXCoordinate.AxisValueSerializable = "9.5";
            paneAnchorPoint1.AxisYCoordinate.AxisValueSerializable = "0";
            textAnnotation1.AnchorPoint = paneAnchorPoint1;
            textAnnotation1.AnnotationID = 0;
            textAnnotation1.AutoHeight = true;
            textAnnotation1.AutoWidth = true;
            textAnnotation1.Name = "TextAnnoCurveInfo";
@@ -94,220 +95,221 @@
            textAnnotation1.ShapePosition = freePosition1;
            textAnnotation1.Text = "信息";
            textAnnotation1.Visible = false;
            this.chartControl1.AnnotationRepository.AddRange(new DevExpress.XtraCharts.Annotation[] {
            textAnnotation1});
            this.chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
            chartControl1.AnnotationRepository.AddRange(new DevExpress.XtraCharts.Annotation[] { textAnnotation1 });
            chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
            xyDiagram1.AxisX.Title.Text = "流量 ï¼ˆm³/h）";
            xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
            xyDiagram1.AxisY.Color = System.Drawing.Color.DodgerBlue;
            xyDiagram1.AxisY.Label.TextColor = System.Drawing.Color.DodgerBlue;
            xyDiagram1.AxisY.Title.Alignment = System.Drawing.StringAlignment.Far;
            xyDiagram1.AxisY.Color = Color.DodgerBlue;
            xyDiagram1.AxisY.Label.TextColor = Color.DodgerBlue;
            xyDiagram1.AxisY.Title.Alignment = StringAlignment.Far;
            xyDiagram1.AxisY.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.False;
            xyDiagram1.AxisY.Title.Text = "扬程/m";
            xyDiagram1.AxisY.Title.TextColor = System.Drawing.Color.DodgerBlue;
            xyDiagram1.AxisY.Title.TextColor = Color.DodgerBlue;
            xyDiagram1.AxisY.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
            xyDiagram1.AxisY.VisibleInPanesSerializable = "-1";
            xyDiagram1.DefaultPane.BorderVisible = false;
            xyDiagram1.DefaultPane.Title.Text = "修改模式:鼠标/键盘☑ ";
            xyDiagram1.DefaultPane.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
            secondaryAxisY1.AxisID = 0;
            secondaryAxisY1.Color = System.Drawing.Color.Green;
            secondaryAxisY1.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            secondaryAxisY1.Label.TextColor = System.Drawing.Color.Green;
            secondaryAxisY1.Name = "AxisYQE";
            secondaryAxisY1.Title.Text = "效率/%";
            secondaryAxisY1.Title.TextColor = System.Drawing.Color.Green;
            secondaryAxisY1.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            secondaryAxisY1.VisibleInPanesSerializable = "-1";
            secondaryAxisY2.AxisID = 1;
            secondaryAxisY2.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            secondaryAxisY2.Label.TextColor = System.Drawing.Color.Crimson;
            secondaryAxisY2.Name = "AxisYQP";
            secondaryAxisY2.NumericScaleOptions.AutoGrid = false;
            secondaryAxisY2.NumericScaleOptions.GridSpacing = 2D;
            secondaryAxisY2.Title.Alignment = System.Drawing.StringAlignment.Near;
            secondaryAxisY2.Title.Text = "功率/kW";
            secondaryAxisY2.Title.TextColor = System.Drawing.Color.Crimson;
            secondaryAxisY2.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            secondaryAxisY2.VisibleInPanesSerializable = "-1";
            xyDiagram1.SecondaryAxesY.AddRange(new DevExpress.XtraCharts.SecondaryAxisY[] {
            secondaryAxisY1,
            secondaryAxisY2});
            this.chartControl1.Diagram = xyDiagram1;
            this.chartControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.chartControl1.Legend.AlignmentHorizontal = DevExpress.XtraCharts.LegendAlignmentHorizontal.Right;
            this.chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            this.chartControl1.Legend.Direction = DevExpress.XtraCharts.LegendDirection.LeftToRight;
            this.chartControl1.Legend.MarkerMode = DevExpress.XtraCharts.LegendMarkerMode.CheckBoxAndMarker;
            this.chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True;
            this.chartControl1.Location = new System.Drawing.Point(0, 0);
            this.chartControl1.Name = "chartControl1";
            secondaryAxisy1.AxisID = 0;
            secondaryAxisy1.Color = Color.Green;
            secondaryAxisy1.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            secondaryAxisy1.Label.TextColor = Color.Green;
            secondaryAxisy1.Name = "AxisYQE";
            secondaryAxisy1.Title.Text = "效率/%";
            secondaryAxisy1.Title.TextColor = Color.Green;
            secondaryAxisy1.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            secondaryAxisy1.VisibleInPanesSerializable = "-1";
            secondaryAxisy2.AxisID = 1;
            secondaryAxisy2.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            secondaryAxisy2.Label.TextColor = Color.Crimson;
            secondaryAxisy2.Name = "AxisYQP";
            secondaryAxisy2.NumericScaleOptions.AutoGrid = false;
            secondaryAxisy2.NumericScaleOptions.GridSpacing = 2D;
            secondaryAxisy2.Title.Alignment = StringAlignment.Near;
            secondaryAxisy2.Title.Text = "功率/kW";
            secondaryAxisy2.Title.TextColor = Color.Crimson;
            secondaryAxisy2.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            secondaryAxisy2.VisibleInPanesSerializable = "-1";
            xyDiagram1.SecondaryAxesY.AddRange(new DevExpress.XtraCharts.SecondaryAxisY[] { secondaryAxisy1, secondaryAxisy2 });
            chartControl1.Diagram = xyDiagram1;
            chartControl1.Dock = DockStyle.Fill;
            chartControl1.Legend.AlignmentHorizontal = DevExpress.XtraCharts.LegendAlignmentHorizontal.Right;
            chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
            chartControl1.Legend.Direction = DevExpress.XtraCharts.LegendDirection.LeftToRight;
            chartControl1.Legend.LegendID = -1;
            chartControl1.Legend.MarkerMode = DevExpress.XtraCharts.LegendMarkerMode.CheckBoxAndMarker;
            chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.True;
            chartControl1.Location = new Point(0, 0);
            chartControl1.Margin = new Padding(2);
            chartControl1.Name = "chartControl1";
            series1.Name = "SeriesCurveQH";
            splineSeriesView1.Color = System.Drawing.Color.DodgerBlue;
            series1.SeriesID = 0;
            splineSeriesView1.Color = Color.DodgerBlue;
            series1.View = splineSeriesView1;
            series2.Name = "SeriesCurveQE";
            series2.SeriesID = 1;
            splineSeriesView2.AxisYName = "AxisYQE";
            splineSeriesView2.Color = System.Drawing.Color.Green;
            splineSeriesView2.Color = Color.Green;
            series2.View = splineSeriesView2;
            series3.Name = "SeriesCurveQP";
            series3.SeriesID = 2;
            splineSeriesView3.AxisYName = "AxisYQP";
            splineSeriesView3.Color = System.Drawing.Color.Crimson;
            splineSeriesView3.Color = Color.Crimson;
            series3.View = splineSeriesView3;
            series4.Name = "SeriesPointQH";
            pointSeriesView1.Color = System.Drawing.Color.DodgerBlue;
            series4.SeriesID = 3;
            pointSeriesView1.Color = Color.DodgerBlue;
            series4.View = pointSeriesView1;
            series5.Name = "SeriesPointQE";
            series5.SeriesID = 4;
            pointSeriesView2.AxisYName = "AxisYQE";
            pointSeriesView2.Color = System.Drawing.Color.Green;
            pointSeriesView2.Color = Color.Green;
            series5.View = pointSeriesView2;
            series6.Name = "SeriesPointQP";
            series6.SeriesID = 5;
            pointSeriesView3.AxisYName = "AxisYQP";
            pointSeriesView3.Color = System.Drawing.Color.Crimson;
            pointSeriesView3.Color = Color.Crimson;
            series6.View = pointSeriesView3;
            this.chartControl1.SeriesSerializable = new DevExpress.XtraCharts.Series[] {
        series1,
        series2,
        series3,
        series4,
        series5,
        series6};
            this.chartControl1.Size = new System.Drawing.Size(1023, 857);
            this.chartControl1.TabIndex = 0;
            chartControl1.SeriesSerializable = new DevExpress.XtraCharts.Series[]
    {
    series1,
    series2,
    series3,
    series4,
    series5,
    series6
    };
            chartControl1.Size = new Size(716, 545);
            chartControl1.TabIndex = 0;
            // 
            // popMenuChart
            // 
            this.popMenuChart.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
            new DevExpress.XtraBars.LinkPersistInfo(this.barCekChartEditMode),
            new DevExpress.XtraBars.LinkPersistInfo(this.barBtnSetChartAxis, true),
            new DevExpress.XtraBars.LinkPersistInfo(this.barBtnCalcCoordinate),
            new DevExpress.XtraBars.LinkPersistInfo(this.barCekSetAxisNameVisible, true),
            new DevExpress.XtraBars.LinkPersistInfo(this.barCekLegendVisible)});
            this.popMenuChart.Manager = this.barManager1;
            this.popMenuChart.Name = "popMenuChart";
            popMenuChart.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barCekChartEditMode), new DevExpress.XtraBars.LinkPersistInfo(barBtnSetChartAxis, true), new DevExpress.XtraBars.LinkPersistInfo(barBtnCalcCoordinate), new DevExpress.XtraBars.LinkPersistInfo(barCekSetAxisNameVisible, true), new DevExpress.XtraBars.LinkPersistInfo(barCekLegendVisible) });
            popMenuChart.Manager = barManager1;
            popMenuChart.Name = "popMenuChart";
            // 
            // barCekChartEditMode
            // 
            this.barCekChartEditMode.Caption = "切换模式";
            this.barCekChartEditMode.Id = 20;
            this.barCekChartEditMode.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barCekChartEditMode.ImageOptions.SvgImage")));
            this.barCekChartEditMode.Name = "barCekChartEditMode";
            this.barCekChartEditMode.CheckedChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.barCekChartEditMode_CheckedChanged);
            barCekChartEditMode.Caption = "切换模式";
            barCekChartEditMode.Id = 20;
            barCekChartEditMode.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekChartEditMode.ImageOptions.SvgImage");
            barCekChartEditMode.Name = "barCekChartEditMode";
            barCekChartEditMode.CheckedChanged += barCekChartEditMode_CheckedChanged;
            // 
            // barBtnSetChartAxis
            // 
            this.barBtnSetChartAxis.Caption = "修改坐标";
            this.barBtnSetChartAxis.Id = 0;
            this.barBtnSetChartAxis.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barBtnSetChartAxis.ImageOptions.SvgImage")));
            this.barBtnSetChartAxis.Name = "barBtnSetChartAxis";
            this.barBtnSetChartAxis.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barBtnSetChartAxis_ItemClick);
            barBtnSetChartAxis.Caption = "修改坐标";
            barBtnSetChartAxis.Id = 0;
            barBtnSetChartAxis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetChartAxis.ImageOptions.SvgImage");
            barBtnSetChartAxis.Name = "barBtnSetChartAxis";
            barBtnSetChartAxis.ItemClick += barBtnSetChartAxis_ItemClick;
            // 
            // barBtnCalcCoordinate
            // 
            this.barBtnCalcCoordinate.Caption = "计算坐标";
            this.barBtnCalcCoordinate.Id = 19;
            this.barBtnCalcCoordinate.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barBtnCalcCoordinate.ImageOptions.SvgImage")));
            this.barBtnCalcCoordinate.Name = "barBtnCalcCoordinate";
            this.barBtnCalcCoordinate.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.BarBtnCalcCoordinate_ItemClick);
            barBtnCalcCoordinate.Caption = "计算坐标";
            barBtnCalcCoordinate.Id = 19;
            barBtnCalcCoordinate.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCalcCoordinate.ImageOptions.SvgImage");
            barBtnCalcCoordinate.Name = "barBtnCalcCoordinate";
            barBtnCalcCoordinate.ItemClick += BarBtnCalcCoordinate_ItemClick;
            // 
            // barCekSetAxisNameVisible
            // 
            this.barCekSetAxisNameVisible.BindableChecked = true;
            this.barCekSetAxisNameVisible.Caption = "轴名称";
            this.barCekSetAxisNameVisible.Checked = true;
            this.barCekSetAxisNameVisible.Id = 15;
            this.barCekSetAxisNameVisible.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barCekSetAxisNameVisible.ImageOptions.SvgImage")));
            this.barCekSetAxisNameVisible.Name = "barCekSetAxisNameVisible";
            this.barCekSetAxisNameVisible.CheckedChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.barCekSetAxisNameVisible_CheckedChanged);
            barCekSetAxisNameVisible.BindableChecked = true;
            barCekSetAxisNameVisible.Caption = "轴名称";
            barCekSetAxisNameVisible.Checked = true;
            barCekSetAxisNameVisible.Id = 15;
            barCekSetAxisNameVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekSetAxisNameVisible.ImageOptions.SvgImage");
            barCekSetAxisNameVisible.Name = "barCekSetAxisNameVisible";
            barCekSetAxisNameVisible.CheckedChanged += barCekSetAxisNameVisible_CheckedChanged;
            // 
            // barCekLegendVisible
            // 
            this.barCekLegendVisible.Caption = "图例";
            this.barCekLegendVisible.Id = 10;
            this.barCekLegendVisible.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barCekLegendVisible.ImageOptions.SvgImage")));
            this.barCekLegendVisible.Name = "barCekLegendVisible";
            this.barCekLegendVisible.CheckedChanged += new DevExpress.XtraBars.ItemClickEventHandler(this.barCekLegendVisible_CheckedChanged);
            barCekLegendVisible.Caption = "图例";
            barCekLegendVisible.Id = 10;
            barCekLegendVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCekLegendVisible.ImageOptions.SvgImage");
            barCekLegendVisible.Name = "barCekLegendVisible";
            barCekLegendVisible.CheckedChanged += barCekLegendVisible_CheckedChanged;
            // 
            // barManager1
            // 
            this.barManager1.DockControls.Add(this.barDockControlTop);
            this.barManager1.DockControls.Add(this.barDockControlBottom);
            this.barManager1.DockControls.Add(this.barDockControlLeft);
            this.barManager1.DockControls.Add(this.barDockControlRight);
            this.barManager1.Form = this;
            this.barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
            this.barBtnSetChartAxis,
            this.barCekLegendVisible,
            this.barCekSetAxisNameVisible,
            this.barBtnCalcCoordinate,
            this.barCekChartEditMode});
            this.barManager1.MaxItemId = 21;
            barManager1.DockControls.Add(barDockControlTop);
            barManager1.DockControls.Add(barDockControlBottom);
            barManager1.DockControls.Add(barDockControlLeft);
            barManager1.DockControls.Add(barDockControlRight);
            barManager1.Form = this;
            barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnSetChartAxis, barCekLegendVisible, barCekSetAxisNameVisible, barBtnCalcCoordinate, barCekChartEditMode });
            barManager1.MaxItemId = 21;
            // 
            // barDockControlTop
            // 
            this.barDockControlTop.CausesValidation = false;
            this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
            this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
            this.barDockControlTop.Manager = this.barManager1;
            this.barDockControlTop.Size = new System.Drawing.Size(1023, 0);
            barDockControlTop.CausesValidation = false;
            barDockControlTop.Dock = DockStyle.Top;
            barDockControlTop.Location = new Point(0, 0);
            barDockControlTop.Manager = barManager1;
            barDockControlTop.Margin = new Padding(2);
            barDockControlTop.Size = new Size(716, 0);
            // 
            // barDockControlBottom
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 857);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1023, 0);
            barDockControlBottom.CausesValidation = false;
            barDockControlBottom.Dock = DockStyle.Bottom;
            barDockControlBottom.Location = new Point(0, 545);
            barDockControlBottom.Manager = barManager1;
            barDockControlBottom.Margin = new Padding(2);
            barDockControlBottom.Size = new Size(716, 0);
            // 
            // barDockControlLeft
            // 
            this.barDockControlLeft.CausesValidation = false;
            this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
            this.barDockControlLeft.Location = new System.Drawing.Point(0, 0);
            this.barDockControlLeft.Manager = this.barManager1;
            this.barDockControlLeft.Size = new System.Drawing.Size(0, 857);
            barDockControlLeft.CausesValidation = false;
            barDockControlLeft.Dock = DockStyle.Left;
            barDockControlLeft.Location = new Point(0, 0);
            barDockControlLeft.Manager = barManager1;
            barDockControlLeft.Margin = new Padding(2);
            barDockControlLeft.Size = new Size(0, 545);
            // 
            // barDockControlRight
            // 
            this.barDockControlRight.CausesValidation = false;
            this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
            this.barDockControlRight.Location = new System.Drawing.Point(1023, 0);
            this.barDockControlRight.Manager = this.barManager1;
            this.barDockControlRight.Size = new System.Drawing.Size(0, 857);
            barDockControlRight.CausesValidation = false;
            barDockControlRight.Dock = DockStyle.Right;
            barDockControlRight.Location = new Point(716, 0);
            barDockControlRight.Manager = barManager1;
            barDockControlRight.Margin = new Padding(2);
            barDockControlRight.Size = new Size(0, 545);
            // 
            // CurveExpressEditChart
            // XtrPerform2dEditChart
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.chartControl1);
            this.Controls.Add(this.barDockControlLeft);
            this.Controls.Add(this.barDockControlRight);
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "CurveExpressEditChart";
            this.Size = new System.Drawing.Size(1023, 857);
            ((System.ComponentModel.ISupportInitialize)(textAnnotation1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(secondaryAxisY1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(secondaryAxisY2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(xyDiagram1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(splineSeriesView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(pointSeriesView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(series6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.chartControl1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.popMenuChart)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(chartControl1);
            Controls.Add(barDockControlLeft);
            Controls.Add(barDockControlRight);
            Controls.Add(barDockControlBottom);
            Controls.Add(barDockControlTop);
            Margin = new Padding(2);
            Name = "XtrPerform2dEditChart";
            Size = new Size(716, 545);
            ((System.ComponentModel.ISupportInitialize)textAnnotation1).EndInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).EndInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy2).EndInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram1).EndInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)series1).EndInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView2).EndInit();
            ((System.ComponentModel.ISupportInitialize)series2).EndInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView3).EndInit();
            ((System.ComponentModel.ISupportInitialize)series3).EndInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)series4).EndInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView2).EndInit();
            ((System.ComponentModel.ISupportInitialize)series5).EndInit();
            ((System.ComponentModel.ISupportInitialize)pointSeriesView3).EndInit();
            ((System.ComponentModel.ISupportInitialize)series6).EndInit();
            ((System.ComponentModel.ISupportInitialize)chartControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)popMenuChart).EndInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }

        #endregion

 WinFrmUI/Yw.WinFrmUI.Phart.Core/01-perform/01-chart/02-chart-edit/XtrPerform2dEditChart.resx

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!-- 
  <!--
    Microsoft ResX Schema 
    

    Version 2.0
    
    The primary goals of this format is to allow a simple XML format 
    that is mostly human readable. The generation and parsing of the 
    various data types are done through the TypeConverter classes 

    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    

    Example:
    

    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
                
    There are any number of "resheader" rows that contain simple 

    There are any number of "resheader" rows that contain simple
    name/value pairs.
    
    Each data row contains a name, and value. The row also contains a 
    type or mimetype. Type corresponds to a .NET class that support 
    text/value conversion through the TypeConverter architecture. 
    Classes that don't support this are serialized and stored with the 

    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    
    The mimetype is used for serialized objects, and tells the 
    ResXResourceReader how to depersist the object. This is currently not 

    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    
    Note - application/x-microsoft.net.object.binary.base64 is the format 
    that the ResXResourceWriter will generate, however the reader can 

    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    

    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with 
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array 
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -120,10 +120,10 @@
  <metadata name="popMenuChart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>200, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="barCekChartEditMode.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="barCekChartEditMode.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJECAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -139,9 +139,9 @@
        MC4yLDAuOC0wLjgsMC41LTEuM0wxOC4yLDIweiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="barBtnSetChartAxis.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barBtnSetChartAxis.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -166,9 +166,9 @@
        UzE4LjcsMTYsMTcsMTZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="barBtnCalcCoordinate.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barBtnCalcCoordinate.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -189,9 +189,9 @@
        LTJoMTBWMjJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="barCekSetAxisNameVisible.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barCekSetAxisNameVisible.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEMEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -215,9 +215,9 @@
        DQo8L3N2Zz4L
</value>
  </data>
  <data name="barCekLegendVisible.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barCekLegendVisible.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALgDAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi