From 2bbfc173c71bdd549a42bf31eee81b9432c2dbed Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 29 十月 2024 21:30:30 +0800
Subject: [PATCH] 优化计算控件
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 249 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 194 insertions(+), 55 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 0e91982..b6e087c 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
@@ -38,7 +38,7 @@
barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
- barBtnShowHide = new DevExpress.XtraBars.BarButtonItem();
+ barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -47,16 +47,30 @@
barBtnSetPipeList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetElbowsList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetThreelinkList = new DevExpress.XtraBars.BarButtonItem();
- barBtnFourlinkList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetFourlinkList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
- barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
+ barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
- barBtnMark = new DevExpress.XtraBars.BarButtonItem();
+ barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
+ barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
+ barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetTankList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetWaterboxList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetBluntheadList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetNozzleList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetHydrantList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetMeterList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -84,22 +98,22 @@
//
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, barBtnMark });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 34;
+ ribbonControl1.MaxItemId = 51;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(967, 101);
+ ribbonControl1.Size = new Size(1206, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnHydroCheck
//
- barBtnHydroCheck.Caption = "鏍￠獙";
+ barBtnHydroCheck.Caption = "妫�鏌�";
barBtnHydroCheck.Id = 1;
barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
barBtnHydroCheck.Name = "barBtnHydroCheck";
@@ -137,13 +151,13 @@
barBtnHydroParterList.Name = "barBtnHydroParterList";
barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
//
- // barBtnShowHide
+ // barBtnFastShowHidden
//
- barBtnShowHide.Caption = "涓�閿樉闅�";
- barBtnShowHide.Id = 9;
- barBtnShowHide.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
- barBtnShowHide.Name = "barBtnShowHide";
- barBtnShowHide.ItemClick += barBtnShowHide_ItemClick;
+ barBtnFastShowHidden.Caption = "涓�閿樉闅�";
+ barBtnFastShowHidden.Id = 9;
+ barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
+ barBtnFastShowHidden.Name = "barBtnFastShowHidden";
+ barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
//
// barBtnMatchingList
//
@@ -204,12 +218,12 @@
barBtnSetThreelinkList.Id = 26;
barBtnSetThreelinkList.Name = "barBtnSetThreelinkList";
//
- // barBtnFourlinkList
+ // barBtnSetFourlinkList
//
- barBtnFourlinkList.Caption = "鍥涢��";
- barBtnFourlinkList.CloseRadialMenuOnItemClick = true;
- barBtnFourlinkList.Id = 27;
- barBtnFourlinkList.Name = "barBtnFourlinkList";
+ barBtnSetFourlinkList.Caption = "鍥涢��";
+ barBtnSetFourlinkList.CloseRadialMenuOnItemClick = true;
+ barBtnSetFourlinkList.Id = 27;
+ barBtnSetFourlinkList.Name = "barBtnSetFourlinkList";
//
// barBtnSetTranslationList
//
@@ -232,33 +246,125 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnFeatCurve
+ // barBtnParallelAnaly
//
- barBtnFeatCurve.Caption = "鎬ц兘鏇茬嚎";
- barBtnFeatCurve.Id = 31;
- barBtnFeatCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
- barBtnFeatCurve.Name = "barBtnFeatCurve";
- barBtnFeatCurve.ItemClick += barBtnFeatCurve_ItemClick;
+ barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
+ barBtnParallelAnaly.Id = 31;
+ barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
+ barBtnParallelAnaly.Name = "barBtnParallelAnaly";
+ barBtnParallelAnaly.ItemClick += barBtnAnaly_ItemClick;
//
// barBtnSearch
//
- barBtnSearch.Caption = "鏌ヨ";
+ barBtnSearch.Caption = "鏋勪欢鏌ヨ";
barBtnSearch.Id = 32;
barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
barBtnSearch.Name = "barBtnSearch";
barBtnSearch.ItemClick += barBtnSearch_ItemClick;
//
- // barBtnMark
+ // barBtnGradingSet
//
- barBtnMark.Caption = "鏍囨敞";
- barBtnMark.Id = 33;
- barBtnMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMark.ImageOptions.SvgImage");
- barBtnMark.Name = "barBtnMark";
- barBtnMark.ItemClick += barBtnMark_ItemClick;
+ barBtnGradingSet.Caption = "閰嶇疆";
+ barBtnGradingSet.Id = 34;
+ barBtnGradingSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingSet.ImageOptions.SvgImage");
+ barBtnGradingSet.Name = "barBtnGradingSet";
+ barBtnGradingSet.ItemClick += barBtnGradingSet_ItemClick;
+ //
+ // barBtnGradingApply
+ //
+ barBtnGradingApply.Caption = "搴旂敤";
+ barBtnGradingApply.Id = 35;
+ barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
+ barBtnGradingApply.Name = "barBtnGradingApply";
+ barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
+ //
+ // barBtnRefresh
+ //
+ barBtnRefresh.Caption = "鍒锋柊";
+ barBtnRefresh.Id = 39;
+ barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
+ barBtnRefresh.Name = "barBtnRefresh";
+ barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
+ //
+ // barBtnSetMark
+ //
+ barBtnSetMark.Caption = "璁剧疆鏍囨敞";
+ barBtnSetMark.Id = 40;
+ barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
+ barBtnSetMark.Name = "barBtnSetMark";
+ barBtnSetMark.ItemClick += barBtnSetMark_ItemClick;
+ //
+ // barBtnSetReservoirList
+ //
+ barBtnSetReservoirList.Caption = "姘村簱";
+ barBtnSetReservoirList.CloseRadialMenuOnItemClick = true;
+ barBtnSetReservoirList.Id = 41;
+ barBtnSetReservoirList.Name = "barBtnSetReservoirList";
+ //
+ // barBtnSetTankList
+ //
+ barBtnSetTankList.Caption = "姘存睜";
+ barBtnSetTankList.CloseRadialMenuOnItemClick = true;
+ barBtnSetTankList.Id = 42;
+ barBtnSetTankList.Name = "barBtnSetTankList";
+ //
+ // barBtnSetWaterboxList
+ //
+ barBtnSetWaterboxList.Caption = "姘寸";
+ barBtnSetWaterboxList.CloseRadialMenuOnItemClick = true;
+ barBtnSetWaterboxList.Id = 43;
+ barBtnSetWaterboxList.Name = "barBtnSetWaterboxList";
+ //
+ // barBtnSetBluntheadList
+ //
+ barBtnSetBluntheadList.Caption = "闂峰ご";
+ barBtnSetBluntheadList.CloseRadialMenuOnItemClick = true;
+ barBtnSetBluntheadList.Id = 44;
+ barBtnSetBluntheadList.Name = "barBtnSetBluntheadList";
+ //
+ // barBtnSetNozzleList
+ //
+ barBtnSetNozzleList.Caption = "鍠峰槾";
+ barBtnSetNozzleList.CloseRadialMenuOnItemClick = true;
+ barBtnSetNozzleList.Id = 45;
+ barBtnSetNozzleList.Name = "barBtnSetNozzleList";
+ //
+ // barBtnSetHydrantList
+ //
+ barBtnSetHydrantList.Caption = "娑堢伀鏍�";
+ barBtnSetHydrantList.Id = 46;
+ barBtnSetHydrantList.Name = "barBtnSetHydrantList";
+ //
+ // barBtnSetMeterList
+ //
+ barBtnSetMeterList.Caption = "姘磋〃";
+ barBtnSetMeterList.CloseRadialMenuOnItemClick = true;
+ barBtnSetMeterList.Id = 47;
+ barBtnSetMeterList.Name = "barBtnSetMeterList";
+ //
+ // barBtnSetCompressorList
+ //
+ barBtnSetCompressorList.Caption = "绌哄帇鏈�";
+ barBtnSetCompressorList.CloseRadialMenuOnItemClick = true;
+ barBtnSetCompressorList.Id = 48;
+ barBtnSetCompressorList.Name = "barBtnSetCompressorList";
+ //
+ // barBtnSetFlowmeterList
+ //
+ barBtnSetFlowmeterList.Caption = "娴侀噺璁�";
+ barBtnSetFlowmeterList.CloseRadialMenuOnItemClick = true;
+ barBtnSetFlowmeterList.Id = 49;
+ barBtnSetFlowmeterList.Name = "barBtnSetFlowmeterList";
+ //
+ // barBtnSetPressmeterList
+ //
+ barBtnSetPressmeterList.Caption = "鍘嬪姏琛�";
+ barBtnSetPressmeterList.Id = 50;
+ barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
//
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup2, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -271,17 +377,24 @@
//
// pageGroupModel
//
- pageGroupModel.ItemLinks.Add(barBtnShowHide);
+ pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
- pageGroupModel.ItemLinks.Add(barBtnMark);
+ pageGroupModel.ItemLinks.Add(barBtnSetMark);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
+ // ribbonPageGroup1
+ //
+ ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
+ ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+ ribbonPageGroup1.Name = "ribbonPageGroup1";
+ ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
+ //
// ribbonPageGroup2
//
+ ribbonPageGroup2.ItemLinks.Add(barBtnParallelAnaly);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -290,7 +403,8 @@
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
+ ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
+ ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -304,12 +418,12 @@
tabPane1.Controls.Add(tabPageBimface);
tabPane1.Controls.Add(tabPageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 101);
+ tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(692, 367);
+ tabPane1.RegularSize = new Size(931, 407);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(692, 367);
+ tabPane1.Size = new Size(931, 407);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -317,13 +431,13 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(692, 334);
+ tabPageBimface.Size = new Size(931, 374);
//
// tabPageQ3d
//
tabPageQ3d.Caption = "姘村姏妯″瀷";
tabPageQ3d.Name = "tabPageQ3d";
- tabPageQ3d.Size = new Size(692, 307);
+ tabPageQ3d.Size = new Size(931, 374);
//
// dockManager1
//
@@ -336,17 +450,17 @@
docPnlRight.Controls.Add(controlContainerRight);
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(692, 101);
+ docPnlRight.Location = new Point(931, 128);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
- docPnlRight.Size = new Size(275, 532);
+ docPnlRight.Size = new Size(275, 572);
docPnlRight.Text = "灞炴��";
//
// controlContainerRight
//
controlContainerRight.Location = new Point(4, 26);
controlContainerRight.Name = "controlContainerRight";
- controlContainerRight.Size = new Size(268, 503);
+ controlContainerRight.Size = new Size(268, 543);
controlContainerRight.TabIndex = 0;
//
// docPnlBottom
@@ -354,17 +468,17 @@
docPnlBottom.Controls.Add(controlContainerBottom);
docPnlBottom.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
docPnlBottom.ID = new Guid("2baf4268-45b9-4b56-9f84-98580a0109e5");
- docPnlBottom.Location = new Point(0, 468);
+ docPnlBottom.Location = new Point(0, 535);
docPnlBottom.Name = "docPnlBottom";
docPnlBottom.OriginalSize = new Size(200, 165);
- docPnlBottom.Size = new Size(692, 165);
+ docPnlBottom.Size = new Size(931, 165);
docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
//
// controlContainerBottom
//
controlContainerBottom.Location = new Point(3, 27);
controlContainerBottom.Name = "controlContainerBottom";
- controlContainerBottom.Size = new Size(686, 135);
+ controlContainerBottom.Size = new Size(925, 135);
controlContainerBottom.TabIndex = 0;
//
// svgImg32
@@ -376,17 +490,28 @@
//
rmSet.AllowGlyphSkinning = true;
rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph");
+ rmSet.ItemLinks.Add(barBtnSetReservoirList);
+ rmSet.ItemLinks.Add(barBtnSetTankList);
+ rmSet.ItemLinks.Add(barBtnSetWaterboxList);
rmSet.ItemLinks.Add(barBtnSetPumpList);
rmSet.ItemLinks.Add(barBtnSetValveList);
rmSet.ItemLinks.Add(barBtnSetPipeList);
+ rmSet.ItemLinks.Add(barBtnSetNozzleList);
+ rmSet.ItemLinks.Add(barBtnSetHydrantList);
+ rmSet.ItemLinks.Add(barBtnSetBluntheadList);
rmSet.ItemLinks.Add(barBtnSetElbowsList);
rmSet.ItemLinks.Add(barBtnSetThreelinkList);
- rmSet.ItemLinks.Add(barBtnFourlinkList);
+ rmSet.ItemLinks.Add(barBtnSetFourlinkList);
+ rmSet.ItemLinks.Add(barBtnSetMeterList);
+ rmSet.ItemLinks.Add(barBtnSetFlowmeterList);
+ rmSet.ItemLinks.Add(barBtnSetPressmeterList);
rmSet.ItemLinks.Add(barBtnSetTranslationList);
rmSet.ItemLinks.Add(barBtnSetExchangerList);
+ rmSet.ItemLinks.Add(barBtnSetCompressorList);
rmSet.ItemLinks.Add(barBtnSetJunctionList);
rmSet.Name = "rmSet";
rmSet.Ribbon = ribbonControl1;
+ rmSet.BeforePopup += rmSet_BeforePopup;
//
// XhsProjectSimulationCorePage
//
@@ -395,12 +520,12 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlRight);
Controls.Add(docPnlBottom);
+ Controls.Add(docPnlRight);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(967, 633);
+ Size = new Size(1206, 700);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -424,7 +549,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
- private DevExpress.XtraBars.BarButtonItem barBtnShowHide;
+ private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
@@ -443,15 +568,29 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetPipeList;
private DevExpress.XtraBars.BarButtonItem barBtnSetElbowsList;
private DevExpress.XtraBars.BarButtonItem barBtnSetThreelinkList;
- private DevExpress.XtraBars.BarButtonItem barBtnFourlinkList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetFourlinkList;
private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
- private DevExpress.XtraBars.BarButtonItem barBtnFeatCurve;
+ private DevExpress.XtraBars.BarButtonItem barBtnParallelAnaly;
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
- private DevExpress.XtraBars.BarButtonItem barBtnMark;
+ private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
+ private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+ private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetTankList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetWaterboxList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetBluntheadList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetNozzleList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetHydrantList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetMeterList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
}
}
--
Gitblit v1.9.3