From bc8d900f5ca26216dae0e1be243ab6237790873b Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 21 十月 2024 10:56:42 +0800
Subject: [PATCH] 部分调试升级
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 165 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 122 insertions(+), 43 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 440f07c..edeb645 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();
@@ -51,12 +51,20 @@
barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
- barBtnFeatCurve = new DevExpress.XtraBars.BarButtonItem();
+ barBtnAnaly = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
- barBtnMark = 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();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = 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();
ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -84,16 +92,16 @@
//
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, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnAnaly, barBtnSearch, barBtnMarkSet, barBtnGradingSet, barBtnGradingApply, barBtnGradingCancel, barBtnMarkCancel, barBtnProperty, barBtnRefresh });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 34;
+ ribbonControl1.MaxItemId = 40;
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, 128);
+ ribbonControl1.Size = new Size(1206, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -137,13 +145,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("barBtnShowHide.ImageOptions.SvgImage");
+ barBtnFastShowHidden.Name = "barBtnFastShowHidden";
+ barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
//
// barBtnMatchingList
//
@@ -232,13 +240,13 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnFeatCurve
+ // barBtnAnaly
//
- barBtnFeatCurve.Caption = "鎬ц兘鏇茬嚎";
- barBtnFeatCurve.Id = 31;
- barBtnFeatCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFeatCurve.ImageOptions.SvgImage");
- barBtnFeatCurve.Name = "barBtnFeatCurve";
- barBtnFeatCurve.ItemClick += barBtnFeatCurve_ItemClick;
+ barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
+ barBtnAnaly.Id = 31;
+ barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
+ barBtnAnaly.Name = "barBtnAnaly";
+ barBtnAnaly.ItemClick += barBtnFeatCurve_ItemClick;
//
// barBtnSearch
//
@@ -248,17 +256,64 @@
barBtnSearch.Name = "barBtnSearch";
barBtnSearch.ItemClick += barBtnSearch_ItemClick;
//
- // barBtnMark
+ // barBtnMarkSet
//
- barBtnMark.Caption = "鏍囨敞";
- barBtnMark.Id = 33;
- barBtnMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMark.ImageOptions.SvgImage");
- barBtnMark.Name = "barBtnMark";
- barBtnMark.ItemClick += barBtnMark_ItemClick;
+ 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
+ //
+ 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;
+ //
+ // 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";
//
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup2, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -271,17 +326,32 @@
//
// 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(barBtnProperty);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
+ // ribbonPageGroup5
+ //
+ ribbonPageGroup5.ItemLinks.Add(barBtnMarkSet);
+ ribbonPageGroup5.ItemLinks.Add(barBtnMarkCancel);
+ ribbonPageGroup5.Name = "ribbonPageGroup5";
+ ribbonPageGroup5.Text = "鏍囨敞";
+ //
+ // ribbonPageGroup1
+ //
+ ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
+ ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+ ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
+ ribbonPageGroup1.Name = "ribbonPageGroup1";
+ ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
+ //
// ribbonPageGroup2
//
+ ribbonPageGroup2.ItemLinks.Add(barBtnAnaly);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -290,7 +360,8 @@
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
+ ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
+ ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
//
@@ -307,9 +378,9 @@
tabPane1.Location = new Point(0, 128);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(692, 340);
+ tabPane1.RegularSize = new Size(931, 407);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(692, 340);
+ tabPane1.Size = new Size(931, 407);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -317,7 +388,7 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(692, 334);
+ tabPageBimface.Size = new Size(931, 374);
//
// tabPageQ3d
//
@@ -336,17 +407,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, 128);
+ docPnlRight.Location = new Point(931, 128);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
- docPnlRight.Size = new Size(275, 505);
+ docPnlRight.Size = new Size(275, 572);
docPnlRight.Text = "灞炴��";
//
// controlContainerRight
//
controlContainerRight.Location = new Point(4, 26);
controlContainerRight.Name = "controlContainerRight";
- controlContainerRight.Size = new Size(268, 476);
+ controlContainerRight.Size = new Size(268, 543);
controlContainerRight.TabIndex = 0;
//
// docPnlBottom
@@ -354,17 +425,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
@@ -395,12 +466,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 +495,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;
@@ -447,11 +518,19 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
- private DevExpress.XtraBars.BarButtonItem barBtnFeatCurve;
+ private DevExpress.XtraBars.BarButtonItem barBtnAnaly;
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 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;
}
}
--
Gitblit v1.9.3