From c0a8df94a97281d7ed5a38550dd6fcf73e9cf0c8 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 09 十一月 2024 13:53:43 +0800
Subject: [PATCH] 核心修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 294 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 206 insertions(+), 88 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 edeb645..16bc8dc 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
@@ -37,7 +37,7 @@
barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
- barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
@@ -47,22 +47,34 @@
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();
- barBtnAnaly = new DevExpress.XtraBars.BarButtonItem();
+ barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
- barBtnMarkSet = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
- barBtnGradingCancel = new DevExpress.XtraBars.BarButtonItem();
- barBtnMarkCancel = new DevExpress.XtraBars.BarButtonItem();
- barBtnProperty = 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();
+ barBtnLoadFlowDirection = new DevExpress.XtraBars.BarButtonItem();
+ barBtnUnloadFlowDirection = new DevExpress.XtraBars.BarButtonItem();
+ barBtnClearMark = new DevExpress.XtraBars.BarButtonItem();
+ batBtnCancelGradingApply = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -92,22 +104,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, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnAnaly, barBtnSearch, barBtnMarkSet, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnMarkCancel, barBtnProperty, barBtnRefresh });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroVisualList, 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, barBtnLoadFlowDirection, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 40;
+ ribbonControl1.MaxItemId = 55;
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(1206, 128);
+ ribbonControl1.Size = new Size(1328, 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,19 +149,19 @@
barBtnSave.Name = "barBtnSave";
barBtnSave.ItemClick += barBtnSave_ItemClick;
//
- // barBtnHydroParterList
+ // barBtnHydroVisualList
//
- barBtnHydroParterList.Caption = "鏋勪欢鏄庣粏";
- barBtnHydroParterList.Id = 8;
- barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
- barBtnHydroParterList.Name = "barBtnHydroParterList";
- barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
+ barBtnHydroVisualList.Caption = "鏋勪欢鏄庣粏";
+ barBtnHydroVisualList.Id = 8;
+ barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
+ barBtnHydroVisualList.Name = "barBtnHydroVisualList";
+ barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
//
// barBtnFastShowHidden
//
barBtnFastShowHidden.Caption = "涓�閿樉闅�";
barBtnFastShowHidden.Id = 9;
- barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnShowHide.ImageOptions.SvgImage");
+ barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
barBtnFastShowHidden.Name = "barBtnFastShowHidden";
barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
//
@@ -212,12 +224,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
//
@@ -240,29 +252,21 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnAnaly
+ // barBtnParallelAnaly
//
- barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
- barBtnAnaly.Id = 31;
- barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
- barBtnAnaly.Name = "barBtnAnaly";
- barBtnAnaly.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;
- //
- // barBtnMarkSet
- //
- barBtnMarkSet.Caption = "搴旂敤";
- barBtnMarkSet.Id = 33;
- barBtnMarkSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkSet.ImageOptions.SvgImage");
- barBtnMarkSet.Name = "barBtnMarkSet";
- barBtnMarkSet.ItemClick += barBtnMarkSet_ItemClick;
//
// barBtnGradingSet
//
@@ -280,40 +284,125 @@
barBtnGradingApply.Name = "barBtnGradingApply";
barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
//
- // barBtnGradingCancel
- //
- barBtnGradingCancel.Caption = "鍙栨秷";
- barBtnGradingCancel.Id = 36;
- barBtnGradingCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingCancel.ImageOptions.SvgImage");
- barBtnGradingCancel.Name = "barBtnGradingCancel";
- barBtnGradingCancel.ItemClick += barBtnGradingCancel_ItemClick;
- //
- // barBtnMarkCancel
- //
- barBtnMarkCancel.Caption = "鍙栨秷";
- barBtnMarkCancel.Id = 37;
- barBtnMarkCancel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMarkCancel.ImageOptions.SvgImage");
- barBtnMarkCancel.Name = "barBtnMarkCancel";
- barBtnMarkCancel.ItemClick += barBtnMarkCancel_ItemClick;
- //
- // barBtnProperty
- //
- barBtnProperty.Caption = "灞炴�ч潰鏉�";
- barBtnProperty.Id = 38;
- barBtnProperty.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnProperty.ImageOptions.SvgImage");
- barBtnProperty.Name = "barBtnProperty";
- barBtnProperty.ItemClick += barBtnProperty_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";
+ //
+ // barBtnLoadFlowDirection
+ //
+ barBtnLoadFlowDirection.Caption = "鍔犺浇";
+ barBtnLoadFlowDirection.Id = 51;
+ barBtnLoadFlowDirection.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnLoadFlowDirection.ImageOptions.SvgImage");
+ barBtnLoadFlowDirection.Name = "barBtnLoadFlowDirection";
+ barBtnLoadFlowDirection.ItemClick += barBtnLoadFlowDirection_ItemClick;
+ //
+ // barBtnUnloadFlowDirection
+ //
+ barBtnUnloadFlowDirection.Caption = "鍗歌浇";
+ barBtnUnloadFlowDirection.Id = 52;
+ barBtnUnloadFlowDirection.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnloadFlowDirection.ImageOptions.SvgImage");
+ barBtnUnloadFlowDirection.Name = "barBtnUnloadFlowDirection";
+ barBtnUnloadFlowDirection.ItemClick += barBtnUnloadFlowDirection_ItemClick;
+ //
+ // barBtnClearMark
+ //
+ barBtnClearMark.Caption = "娓呴櫎";
+ barBtnClearMark.Id = 53;
+ barBtnClearMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnClearMark.ImageOptions.SvgImage");
+ barBtnClearMark.Name = "barBtnClearMark";
+ barBtnClearMark.ItemClick += barBtnClearMark_ItemClick;
+ //
+ // batBtnCancelGradingApply
+ //
+ batBtnCancelGradingApply.Caption = "鍙栨秷";
+ batBtnCancelGradingApply.Id = 54;
+ batBtnCancelGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("batBtnCancelGradingApply.ImageOptions.SvgImage");
+ batBtnCancelGradingApply.Name = "batBtnCancelGradingApply";
+ batBtnCancelGradingApply.ItemClick += batBtnCancelGradingApply_ItemClick;
//
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -328,30 +417,36 @@
//
pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
pageGroupModel.ItemLinks.Add(barBtnSearch);
- pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
+ pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnProperty);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
+ // ribbonPageGroup6
+ //
+ ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+ ribbonPageGroup6.ItemLinks.Add(barBtnClearMark);
+ ribbonPageGroup6.Name = "ribbonPageGroup6";
+ ribbonPageGroup6.Text = "鏍囨敞";
+ //
// ribbonPageGroup5
//
- ribbonPageGroup5.ItemLinks.Add(barBtnMarkSet);
- ribbonPageGroup5.ItemLinks.Add(barBtnMarkCancel);
+ ribbonPageGroup5.ItemLinks.Add(barBtnLoadFlowDirection);
+ ribbonPageGroup5.ItemLinks.Add(barBtnUnloadFlowDirection);
ribbonPageGroup5.Name = "ribbonPageGroup5";
- ribbonPageGroup5.Text = "鏍囨敞";
+ ribbonPageGroup5.Text = "娴佸悜";
//
// ribbonPageGroup1
//
ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
- ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
+ ribbonPageGroup1.ItemLinks.Add(batBtnCancelGradingApply);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
//
// ribbonPageGroup2
//
- ribbonPageGroup2.ItemLinks.Add(barBtnAnaly);
+ ribbonPageGroup2.ItemLinks.Add(barBtnParallelAnaly);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -378,9 +473,9 @@
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(931, 407);
+ tabPane1.RegularSize = new Size(1053, 407);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(931, 407);
+ tabPane1.Size = new Size(1053, 407);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -388,13 +483,13 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(931, 374);
+ tabPageBimface.Size = new Size(1053, 374);
//
// tabPageQ3d
//
tabPageQ3d.Caption = "姘村姏妯″瀷";
tabPageQ3d.Name = "tabPageQ3d";
- tabPageQ3d.Size = new Size(692, 307);
+ tabPageQ3d.Size = new Size(931, 374);
//
// dockManager1
//
@@ -407,7 +502,7 @@
docPnlRight.Controls.Add(controlContainerRight);
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(931, 128);
+ docPnlRight.Location = new Point(1053, 128);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
docPnlRight.Size = new Size(275, 572);
@@ -428,14 +523,14 @@
docPnlBottom.Location = new Point(0, 535);
docPnlBottom.Name = "docPnlBottom";
docPnlBottom.OriginalSize = new Size(200, 165);
- docPnlBottom.Size = new Size(931, 165);
+ docPnlBottom.Size = new Size(1053, 165);
docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
//
// controlContainerBottom
//
controlContainerBottom.Location = new Point(3, 27);
controlContainerBottom.Name = "controlContainerBottom";
- controlContainerBottom.Size = new Size(925, 135);
+ controlContainerBottom.Size = new Size(1047, 135);
controlContainerBottom.TabIndex = 0;
//
// svgImg32
@@ -447,17 +542,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
//
@@ -471,7 +577,7 @@
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1206, 700);
+ Size = new Size(1328, 700);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
@@ -494,7 +600,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
- private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
+ private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
@@ -506,7 +612,6 @@
private DevExpress.XtraBars.Docking.DockPanel docPnlRight;
private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight;
private DevExpress.Utils.SvgImageCollection svgImg32;
- private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
private DevExpress.XtraBars.BarButtonItem barBtnSetList;
private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
@@ -514,23 +619,36 @@
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 barBtnAnaly;
+ 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 barBtnMarkSet;
private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
- private DevExpress.XtraBars.BarButtonItem barBtnGradingCancel;
- private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
- private DevExpress.XtraBars.BarButtonItem barBtnMarkCancel;
- private DevExpress.XtraBars.BarButtonItem barBtnProperty;
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;
+ private DevExpress.XtraBars.BarButtonItem barBtnLoadFlowDirection;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
+ private DevExpress.XtraBars.BarButtonItem barBtnUnloadFlowDirection;
+ public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
+ private DevExpress.XtraBars.BarButtonItem barBtnClearMark;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6;
+ private DevExpress.XtraBars.BarButtonItem batBtnCancelGradingApply;
}
}
--
Gitblit v1.9.3