增减计算前提于切换

lixiaojun

2024-10-12 299013bc2d9eb529a309b3ee63e22ed24f87aebe

增减计算前提于切换

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/00-core/XhsProjectSimulationCalcuCtrl.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
namespace HStation.WinFrmUI
{
    partial class XhsProjectSimulationCalcuCtrl
    {
        /// <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 Component 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()
        {
            SuspendLayout();
            // 
            // XhsProjectSimulationCalcuCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Name = "XhsProjectSimulationCalcuCtrl";
            Size = new Size(874, 501);
            ResumeLayout(false);
        }

        #endregion
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/00-core/XhsProjectSimulationCalcuCtrl.cs

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

        /// <summary>
        /// æ°´åŠ›ç‚¹å‡»äº‹ä»¶
        /// </summary>
        public event Action<string> HydroClickEvent;
        /// <summary>
        /// å–消事件
        /// </summary>
        public event Action CancelEvent;
        /// <summary>
        /// è®¡ç®—事件
        /// </summary>
        public event Action OkEvent;

        private XhsProjectSimulationCalcuPrefixCtrl _calcuPrefixCtrl = null;
        private XhsProjectSimulationCalcuFailedCtrl _calcuFailedCtrl = null;

        /// <summary>
        /// è®¡ç®—条件
        /// </summary>
        public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo)
        {
            this.Controls.Clear();
            var calcuPrefixCtrl = GetCalcuPrefixCtrl();
            calcuPrefixCtrl.SetBindingData(hydroInfo);
            this.Controls.Add(calcuPrefixCtrl);
        }

        /// <summary>
        /// è®¡ç®—失败
        /// </summary>
        public void SetBindingData(List<Yw.EPAnet.CalcuFailed> allFailedList)
        {
            this.Controls.Clear();
            var calcuFailedCtrl = GetCalcuFailedCtrl();
            calcuFailedCtrl.SetBindingData(allFailedList);
            this.Controls.Add(calcuFailedCtrl);
        }

        private XhsProjectSimulationCalcuPrefixCtrl GetCalcuPrefixCtrl()
        {
            if (_calcuPrefixCtrl == null)
            {
                _calcuPrefixCtrl = new XhsProjectSimulationCalcuPrefixCtrl();
                _calcuPrefixCtrl.Dock = DockStyle.Fill;
                _calcuPrefixCtrl.CancelEvent += () =>
                {
                    this.CancelEvent?.Invoke();
                };
                _calcuPrefixCtrl.OkEvent += () =>
                {
                    this.OkEvent?.Invoke();
                };
            }
            return _calcuPrefixCtrl;
        }

        private XhsProjectSimulationCalcuFailedCtrl GetCalcuFailedCtrl()
        {
            if (_calcuFailedCtrl == null)
            {
                _calcuFailedCtrl = new XhsProjectSimulationCalcuFailedCtrl();
                _calcuFailedCtrl.Dock = DockStyle.Fill;
            }
            return _calcuFailedCtrl;
        }



    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/00-core/XhsProjectSimulationCalcuCtrl.resx

copy from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedDlg.resx
copy to WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/00-core/XhsProjectSimulationCalcuCtrl.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedCtrl.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedCtrl.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI
{
    partial class XhsProjectSimulationHydroCalcuFailedCtrl
    partial class XhsProjectSimulationCalcuFailedCtrl
    {
        /// <summary> 
        /// Required designer variable.
@@ -30,18 +30,18 @@
        {
            components = new Container();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            xhsProjectSimulationHydroCalcuFailedViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colMessage = new DevExpress.XtraGrid.Columns.GridColumn();
            xhsProjectSimulationCalcuFailedViewModelBindingSource = new BindingSource(components);
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)xhsProjectSimulationHydroCalcuFailedViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)xhsProjectSimulationCalcuFailedViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = xhsProjectSimulationHydroCalcuFailedViewModelBindingSource;
            gridControl1.DataSource = xhsProjectSimulationCalcuFailedViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
@@ -49,10 +49,6 @@
            gridControl1.Size = new Size(795, 562);
            gridControl1.TabIndex = 1;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // xhsProjectSimulationHydroCalcuFailedViewModelBindingSource
            // 
            xhsProjectSimulationHydroCalcuFailedViewModelBindingSource.DataSource = typeof(XhsProjectSimulationHydroCalcuFailedViewModel);
            // 
            // gridView1
            // 
@@ -77,16 +73,20 @@
            colMessage.Visible = true;
            colMessage.VisibleIndex = 1;
            // 
            // XhsProjectSimulationHydroCalcuFailedCtrl
            // xhsProjectSimulationCalcuFailedViewModelBindingSource
            // 
            xhsProjectSimulationCalcuFailedViewModelBindingSource.DataSource = typeof(XhsProjectSimulationCalcuFailedViewModel);
            // 
            // XhsProjectSimulationCalcuFailedCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Name = "XhsProjectSimulationHydroCalcuFailedCtrl";
            Name = "XhsProjectSimulationCalcuFailedCtrl";
            Size = new Size(795, 562);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)xhsProjectSimulationHydroCalcuFailedViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)xhsProjectSimulationCalcuFailedViewModelBindingSource).EndInit();
            ResumeLayout(false);
        }

@@ -96,6 +96,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn colCode;
        private DevExpress.XtraGrid.Columns.GridColumn colMessage;
        private BindingSource xhsProjectSimulationHydroCalcuFailedViewModelBindingSource;
        private BindingSource xhsProjectSimulationCalcuFailedViewModelBindingSource;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedCtrl.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
namespace HStation.WinFrmUI
{
    public partial class XhsProjectSimulationCalcuFailedCtrl : DevExpress.XtraEditors.XtraUserControl
    {
        public XhsProjectSimulationCalcuFailedCtrl()
        {
            InitializeComponent();
            this.gridView1.SetNormalView(30);
            this.gridView1.RegistCustomDrawRowIndicator(40);
        }


        private List<XhsProjectSimulationCalcuFailedViewModel> _allBindingList = null;

        /// <summary>
        /// ç»‘定数据
        /// </summary>
        public void SetBindingData(List<Yw.EPAnet.CalcuFailed> allFailedList)
        {
            _allBindingList = new List<XhsProjectSimulationCalcuFailedViewModel>();
            if (allFailedList != null && allFailedList.Count > 0)
            {
                foreach (var failed in allFailedList)
                {
                    var vm = new XhsProjectSimulationCalcuFailedViewModel(failed);
                    _allBindingList.Add(vm);
                }
            }
            this.xhsProjectSimulationCalcuFailedViewModelBindingSource.DataSource = _allBindingList;
            this.xhsProjectSimulationCalcuFailedViewModelBindingSource.ResetBindings(false);
        }





    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedCtrl.resx

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedCtrl.resx ÐÞ¸Ä
@@ -117,7 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="xhsProjectSimulationHydroCalcuFailedViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="xhsProjectSimulationCalcuFailedViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedDlg.Designer.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedDlg.Designer.cs ÐÞ¸Ä
@@ -1,6 +1,6 @@
namespace HStation.WinFrmUI
{
    partial class XhsProjectSimulationHydroCalcuFailedDlg
    partial class XhsProjectSimulationCalcuFailedDlg
    {
        /// <summary>
        /// Required designer variable.
@@ -28,7 +28,7 @@
        /// </summary>
        private void InitializeComponent()
        {
            xhsProjectSimulationHydroCalcuFailedCtrl1 = new XhsProjectSimulationHydroCalcuFailedCtrl();
            xhsProjectSimulationHydroCalcuFailedCtrl1 = new XhsProjectSimulationCalcuFailedCtrl();
            SuspendLayout();
            // 
            // xhsProjectSimulationHydroCalcuFailedCtrl1
@@ -52,6 +52,6 @@

        #endregion

        private XhsProjectSimulationHydroCalcuFailedCtrl xhsProjectSimulationHydroCalcuFailedCtrl1;
        private XhsProjectSimulationCalcuFailedCtrl xhsProjectSimulationHydroCalcuFailedCtrl1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedDlg.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedDlg.cs ÐÞ¸Ä
@@ -1,8 +1,8 @@
namespace HStation.WinFrmUI
{
    public partial class XhsProjectSimulationHydroCalcuFailedDlg : DevExpress.XtraEditors.XtraForm
    public partial class XhsProjectSimulationCalcuFailedDlg : DevExpress.XtraEditors.XtraForm
    {
        public XhsProjectSimulationHydroCalcuFailedDlg()
        public XhsProjectSimulationCalcuFailedDlg()
        {
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedDlg.resx

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationCalcuFailedViewModel.cs

ÎļþÃû´Ó WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedViewModel.cs ÐÞ¸Ä
@@ -3,17 +3,17 @@
    /// <summary>
    /// 
    /// </summary>
    public class XhsProjectSimulationHydroCalcuFailedViewModel
    public class XhsProjectSimulationCalcuFailedViewModel
    {
        /// <summary>
        /// 
        /// </summary>
        public XhsProjectSimulationHydroCalcuFailedViewModel() { }
        public XhsProjectSimulationCalcuFailedViewModel() { }

        /// <summary>
        /// 
        /// </summary>
        public XhsProjectSimulationHydroCalcuFailedViewModel(Yw.EPAnet.CalcuFailed rhs)
        public XhsProjectSimulationCalcuFailedViewModel(Yw.EPAnet.CalcuFailed rhs)
        {
            this.Code = rhs.Code;
            this.Message = rhs.Message;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/01-failed/XhsProjectSimulationHydroCalcuFailedCtrl.cs

ÎļþÒÑɾ³ý

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/02-prefix/00-core/XhsProjectSimulationCalcuPrefixDlg.Designer.cs

@@ -30,12 +30,17 @@
        {
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            xhsProjectSimulationCalcuPrefixCtrl1 = new XhsProjectSimulationCalcuPrefixCtrl();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(xhsProjectSimulationCalcuPrefixCtrl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
@@ -48,9 +53,27 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 10, 0, 10);
            Root.Size = new Size(1098, 565);
            Root.TextVisible = false;
            // 
            // xhsProjectSimulationCalcuPrefixCtrl1
            // 
            xhsProjectSimulationCalcuPrefixCtrl1.Location = new Point(12, 2);
            xhsProjectSimulationCalcuPrefixCtrl1.Name = "xhsProjectSimulationCalcuPrefixCtrl1";
            xhsProjectSimulationCalcuPrefixCtrl1.Size = new Size(1074, 551);
            xhsProjectSimulationCalcuPrefixCtrl1.TabIndex = 4;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = xhsProjectSimulationCalcuPrefixCtrl1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(1078, 555);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
            // XhsProjectSimulationCalcuPrefixDlg
            // 
@@ -62,7 +85,9 @@
            StartPosition = FormStartPosition.CenterParent;
            Text = "水力计算";
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ResumeLayout(false);
        }

@@ -70,5 +95,7 @@

        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private XhsProjectSimulationCalcuPrefixCtrl xhsProjectSimulationCalcuPrefixCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/03-calcu/02-prefix/00-core/XhsProjectSimulationCalcuPrefixDlg.cs

@@ -7,9 +7,21 @@
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
            this.layoutControl1.SetupLayoutControl();

            this.xhsProjectSimulationCalcuPrefixCtrl1.CancelEvent += XhsProjectSimulationCalcuPrefixCtrl1_CancelEvent;
            this.xhsProjectSimulationCalcuPrefixCtrl1.OkEvent += XhsProjectSimulationCalcuPrefixCtrl1_OkEvent;
        }

        private void XhsProjectSimulationCalcuPrefixCtrl1_OkEvent()
        {
            this.DialogResult = DialogResult.OK;
            this.Close();
        }


        private void XhsProjectSimulationCalcuPrefixCtrl1_CancelEvent()
        {
            this.DialogResult = DialogResult.Cancel;
            this.Close();
        }
    }
}

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

@@ -53,6 +53,7 @@
            barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -70,7 +71,6 @@
            hydroParterListCtrl1 = new HydroParterListCtrl();
            docPnlHydroCalcu = new DevExpress.XtraBars.Docking.DockPanel();
            controlContainer2 = new DevExpress.XtraBars.Docking.ControlContainer();
            xhsProjectSimulationHydroCalcuFailedCtrl1 = new XhsProjectSimulationHydroCalcuFailedCtrl();
            docPnlHydroCheck = new DevExpress.XtraBars.Docking.DockPanel();
            controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer();
            xhsProjectSimulationHydroCheckResultCtrl1 = new XhsProjectSimulationHydroCheckResultCtrl();
@@ -85,7 +85,7 @@
            xhsProjectSimulationSearchCtrl1 = new XhsProjectSimulationSearchCtrl();
            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
            rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
            pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            xhsProjectSimulationCalcuCtrl1 = new XhsProjectSimulationCalcuCtrl();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
@@ -291,6 +291,16 @@
            pageGroupMatching.Name = "pageGroupMatching";
            pageGroupMatching.Text = "匹配";
            // 
            // pageGroupModel
            // 
            pageGroupModel.ItemLinks.Add(barBtnShowHide);
            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
            pageGroupModel.ItemLinks.Add(barBtnSetList);
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
            pageGroupModel.Name = "pageGroupModel";
            pageGroupModel.Text = "模型";
            // 
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
@@ -433,19 +443,11 @@
            // 
            // controlContainer2
            // 
            controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1);
            controlContainer2.Controls.Add(xhsProjectSimulationCalcuCtrl1);
            controlContainer2.Location = new Point(3, 27);
            controlContainer2.Name = "controlContainer2";
            controlContainer2.Size = new Size(885, 54);
            controlContainer2.TabIndex = 0;
            // 
            // xhsProjectSimulationHydroCalcuFailedCtrl1
            // 
            xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1";
            xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(885, 54);
            xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0;
            // 
            // docPnlHydroCheck
            // 
@@ -587,15 +589,13 @@
            rmSet.Name = "rmSet";
            rmSet.Ribbon = ribbonControl1;
            // 
            // pageGroupModel
            // xhsProjectSimulationCalcuCtrl1
            // 
            pageGroupModel.ItemLinks.Add(barBtnShowHide);
            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
            pageGroupModel.ItemLinks.Add(barBtnSetList);
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
            pageGroupModel.Name = "pageGroupModel";
            pageGroupModel.Text = "模型";
            xhsProjectSimulationCalcuCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationCalcuCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationCalcuCtrl1.Name = "xhsProjectSimulationCalcuCtrl1";
            xhsProjectSimulationCalcuCtrl1.Size = new Size(885, 54);
            xhsProjectSimulationCalcuCtrl1.TabIndex = 0;
            // 
            // XhsProjectSimulationCorePage
            // 
@@ -670,7 +670,6 @@
        private DevExpress.XtraBars.Docking.ControlContainer controlContainer1;
        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroCalcu;
        private DevExpress.XtraBars.Docking.ControlContainer controlContainer2;
        private XhsProjectSimulationHydroCalcuFailedCtrl xhsProjectSimulationHydroCalcuFailedCtrl1;
        private DevExpress.XtraBars.Docking.DockPanel docPnlHydroParterList;
        private DevExpress.XtraBars.Docking.ControlContainer controlContainer3;
        private HydroParterListCtrl hydroParterListCtrl1;
@@ -699,5 +698,6 @@
        private XhsProjectSimulationSearchCtrl xhsProjectSimulationSearchCtrl1;
        private DevExpress.XtraBars.BarButtonItem barBtnSearch;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
        private XhsProjectSimulationCalcuCtrl xhsProjectSimulationCalcuCtrl1;
    }
}

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

@@ -17,6 +17,8 @@
            this.PageTitle.HeaderSvgImage = this.svgImg32[0];

            this.xhsProjectSimulationSearchCtrl1.ApplySearchEvent += XhsProjectSimulationSearchCtrl1_ApplySearchEvent;
            this.xhsProjectSimulationCalcuCtrl1.CancelEvent += XhsProjectSimulationCalcuCtrl1_CancelEvent;
            this.xhsProjectSimulationCalcuCtrl1.OkEvent += XhsProjectSimulationCalcuCtrl1_OkEvent;

            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
@@ -522,30 +524,60 @@
                return;
            }

            var dlg = new XhsProjectSimulationCalcuPrefixDlg();
            dlg.ShowDialog();

            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCheck.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlHydroParterList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlUnMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlMatchingList.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
            this.docPnlSearch.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;

            this.xhsProjectSimulationCalcuCtrl1.SetBindingData(_hydroInfo);
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            this.docPnlHydroCalcu.Height = 350;



            //var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
            //_calcuResult = netWork.Calcu();
            //if (_calcuResult.Succeed)
            //{
            //    ShowProperty();
            //    TipFormHelper.ShowSucceed("计算成功！");
            //}
            //else
            //{
            //    this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
            //    this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
            //    this.docPnlHydroCalcu.Height = 350;
            //}
            //await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
        }

        //取消
        private void XhsProjectSimulationCalcuCtrl1_CancelEvent()
        {
            this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
        }

        //确认
        private async void XhsProjectSimulationCalcuCtrl1_OkEvent()
        {
            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
            _calcuResult = netWork.Calcu();
            if (_calcuResult.Succeed)
            {
                this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
                ShowProperty();
                TipFormHelper.ShowSucceed("计算成功！");
                await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);
            }
            else
            {
                this.xhsProjectSimulationHydroCalcuFailedCtrl1.SetBindingData(_calcuResult.FailedList);
                this.xhsProjectSimulationCalcuCtrl1.SetBindingData(_calcuResult.FailedList);
                this.docPnlHydroCalcu.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
                this.docPnlHydroCalcu.Height = 350;
            }
            await this.xhsProjectSimulationBimfaceCtrl1.ShowCalcuCustomLabels(_calcuResult);

        }

        #endregion

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

@@ -214,7 +214,7 @@
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationHydroCalcuFailedDlg.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs">

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

@@ -64,7 +64,10 @@
    <Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionMgrCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationHydroCalcuFailedCtrl.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\00-core\XhsProjectSimulationCalcuCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\00-core\XhsProjectSimulationCalcuPrefixCtrl.cs">

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/DataSources/HStation.WinFrmUI.XhsProjectSimulationCalcuFailedViewModel.datasource

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
    This file is automatically generated by Visual Studio. It is 
    used to store generic object data source configuration information.  
    Renaming the file extension or editing the content of this file may   
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="XhsProjectSimulationCalcuFailedViewModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
  <TypeInfo>HStation.WinFrmUI.XhsProjectSimulationCalcuFailedViewModel, HStation.WinFrmUI.Xhs.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/Properties/DataSources/HStation.WinFrmUI.XhsProjectSimulationHydroCalcuFailedViewModel.datasource

ÎļþÒÑɾ³ý