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 | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 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 cf74987..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();
@@ -67,9 +67,15 @@
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();
ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -98,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, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
+ 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 = 51;
+ 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";
@@ -143,13 +149,13 @@
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
//
@@ -288,7 +294,7 @@
//
// barBtnSetMark
//
- barBtnSetMark.Caption = "璁剧疆鏍囨敞";
+ barBtnSetMark.Caption = "璁剧疆";
barBtnSetMark.Id = 40;
barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
barBtnSetMark.Name = "barBtnSetMark";
@@ -362,9 +368,41 @@
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, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -379,16 +417,30 @@
//
pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
pageGroupModel.ItemLinks.Add(barBtnSearch);
- pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
+ pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnSetMark);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
+ //
+ // ribbonPageGroup6
+ //
+ ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+ ribbonPageGroup6.ItemLinks.Add(barBtnClearMark);
+ ribbonPageGroup6.Name = "ribbonPageGroup6";
+ ribbonPageGroup6.Text = "鏍囨敞";
+ //
+ // ribbonPageGroup5
+ //
+ ribbonPageGroup5.ItemLinks.Add(barBtnLoadFlowDirection);
+ ribbonPageGroup5.ItemLinks.Add(barBtnUnloadFlowDirection);
+ ribbonPageGroup5.Name = "ribbonPageGroup5";
+ ribbonPageGroup5.Text = "娴佸悜";
//
// ribbonPageGroup1
//
ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+ ribbonPageGroup1.ItemLinks.Add(batBtnCancelGradingApply);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
//
@@ -421,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";
//
@@ -431,7 +483,7 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(931, 374);
+ tabPageBimface.Size = new Size(1053, 374);
//
// tabPageQ3d
//
@@ -450,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);
@@ -471,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
@@ -525,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);
@@ -548,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;
@@ -560,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;
@@ -592,5 +643,12 @@
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