From 4812786898dc040fc236e9e00e21b9f4d08f57e3 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 24 十月 2024 19:10:08 +0800
Subject: [PATCH] 修改单个阀门匹配
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 212 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 136 insertions(+), 76 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..2208e0d 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
@@ -47,23 +47,29 @@
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();
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();
@@ -92,9 +98,9 @@
//
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, 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 = 40;
+ ribbonControl1.MaxItemId = 51;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -149,7 +155,7 @@
//
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 +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
//
@@ -240,29 +246,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 +278,93 @@
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";
//
// 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, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -330,28 +381,20 @@
pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnProperty);
+ pageGroupModel.ItemLinks.Add(barBtnSetMark);
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(barBtnParallelAnaly);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
ribbonPageGroup2.Name = "ribbonPageGroup2";
@@ -388,13 +431,13 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(931, 374);
+ tabPageBimface.Size = new Size(931, 401);
//
// tabPageQ3d
//
tabPageQ3d.Caption = "姘村姏妯″瀷";
tabPageQ3d.Name = "tabPageQ3d";
- tabPageQ3d.Size = new Size(692, 307);
+ tabPageQ3d.Size = new Size(931, 374);
//
// dockManager1
//
@@ -447,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
//
@@ -466,8 +520,8 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlBottom);
Controls.Add(docPnlRight);
+ Controls.Add(docPnlBottom);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
@@ -514,23 +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 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;
}
}
--
Gitblit v1.9.3