From 299013bc2d9eb529a309b3ee63e22ed24f87aebe Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 18:45:39 +0800
Subject: [PATCH] 增减计算前提于切换
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 90 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 29bc659..4dba630 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -50,8 +50,10 @@
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
- ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ 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();
@@ -69,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();
@@ -84,7 +85,7 @@
xhsProjectSimulationSearchCtrl1 = new XhsProjectSimulationSearchCtrl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
- barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
+ xhsProjectSimulationCalcuCtrl1 = new XhsProjectSimulationCalcuCtrl();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
@@ -111,7 +112,6 @@
//
// ribbonControl1
//
- ribbonControl1.DrawGroupCaptions = DevExpress.Utils.DefaultBoolean.False;
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, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch });
@@ -123,7 +123,7 @@
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1166, 110);
+ ribbonControl1.Size = new Size(1166, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -270,27 +270,41 @@
barBtnFeatCurve.Name = "barBtnFeatCurve";
barBtnFeatCurve.ItemClick += barBtnFeatCurve_ItemClick;
//
+ // barBtnSearch
+ //
+ barBtnSearch.Caption = "鏌ヨ";
+ barBtnSearch.Id = 32;
+ barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
+ barBtnSearch.Name = "barBtnSearch";
+ barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+ //
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
- // ribbonPageGroup1
+ // pageGroupMatching
//
- ribbonPageGroup1.ItemLinks.Add(barBtnMatchingList);
- ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList);
- ribbonPageGroup1.ItemLinks.Add(barBtnShowHide);
- ribbonPageGroup1.ItemLinks.Add(barBtnSetList);
- ribbonPageGroup1.Name = "ribbonPageGroup1";
- ribbonPageGroup1.Text = "妯″瀷";
+ pageGroupMatching.ItemLinks.Add(barBtnMatchingList);
+ pageGroupMatching.ItemLinks.Add(barBtnUnMatchingList);
+ 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);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
- ribbonPageGroup2.ItemLinks.Add(barBtnHydroParterList);
- ribbonPageGroup2.ItemLinks.Add(barBtnHydroExportInp);
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "姘村姏";
//
@@ -298,7 +312,6 @@
//
ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(barBtnSearch);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -312,12 +325,12 @@
tabPane1.Controls.Add(pageBimface);
tabPane1.Controls.Add(pageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 110);
+ tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
- tabPane1.RegularSize = new Size(891, 183);
+ tabPane1.RegularSize = new Size(891, 165);
tabPane1.SelectedPage = pageBimface;
- tabPane1.Size = new Size(891, 183);
+ tabPane1.Size = new Size(891, 165);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -326,14 +339,14 @@
pageBimface.Caption = "涓夌淮妯″瀷";
pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
pageBimface.Name = "pageBimface";
- pageBimface.Size = new Size(891, 150);
+ pageBimface.Size = new Size(891, 132);
//
// xhsProjectSimulationBimfaceCtrl1
//
xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
- xhsProjectSimulationBimfaceCtrl1.Size = new Size(891, 150);
+ xhsProjectSimulationBimfaceCtrl1.Size = new Size(891, 132);
xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
@@ -364,10 +377,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(891, 110);
+ docPnlProperty.Location = new Point(891, 128);
docPnlProperty.Name = "docPnlProperty";
docPnlProperty.OriginalSize = new Size(275, 200);
- docPnlProperty.Size = new Size(275, 718);
+ docPnlProperty.Size = new Size(275, 700);
docPnlProperty.Text = "灞炴��";
//
// dockPanel1_Container
@@ -375,7 +388,7 @@
dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1);
dockPanel1_Container.Location = new Point(4, 26);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(268, 689);
+ dockPanel1_Container.Size = new Size(268, 671);
dockPanel1_Container.TabIndex = 0;
//
// xhsProjectSimulationPropertyCtrl1
@@ -383,7 +396,7 @@
xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill;
xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0);
xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1";
- xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 689);
+ xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 671);
xhsProjectSimulationPropertyCtrl1.TabIndex = 0;
//
// docPnlHydroParterList
@@ -430,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
//
@@ -584,13 +589,13 @@
rmSet.Name = "rmSet";
rmSet.Ribbon = ribbonControl1;
//
- // barBtnSearch
+ // xhsProjectSimulationCalcuCtrl1
//
- barBtnSearch.Caption = "鏌ヨ";
- barBtnSearch.Id = 32;
- barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
- barBtnSearch.Name = "barBtnSearch";
- barBtnSearch.ItemClick += barBtnSearch_ItemClick;
+ xhsProjectSimulationCalcuCtrl1.Dock = DockStyle.Fill;
+ xhsProjectSimulationCalcuCtrl1.Location = new Point(0, 0);
+ xhsProjectSimulationCalcuCtrl1.Name = "xhsProjectSimulationCalcuCtrl1";
+ xhsProjectSimulationCalcuCtrl1.Size = new Size(885, 54);
+ xhsProjectSimulationCalcuCtrl1.TabIndex = 0;
//
// XhsProjectSimulationCorePage
//
@@ -642,7 +647,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
- private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
@@ -665,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;
@@ -693,5 +697,7 @@
private DevExpress.XtraBars.Docking.ControlContainer controlContainer6;
private XhsProjectSimulationSearchCtrl xhsProjectSimulationSearchCtrl1;
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
+ private XhsProjectSimulationCalcuCtrl xhsProjectSimulationCalcuCtrl1;
}
}
--
Gitblit v1.9.3