From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 564 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 437 insertions(+), 127 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 9797565..0e93ddb 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
@@ -32,13 +32,14 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
- barBtnHydroCheck = new DevExpress.XtraBars.BarButtonItem();
- barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
- barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
+ barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingCalcu = new DevExpress.XtraBars.BarButtonItem();
+ barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
- barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
- barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
+ barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
@@ -47,25 +48,53 @@
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();
+ barBtnWorkingParallel = 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();
+ barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem();
+ barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
+ barEditCurrentWorking = new DevExpress.XtraBars.BarEditItem();
+ repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
+ barCkMark = new DevExpress.XtraBars.BarCheckItem();
+ barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
+ barCkGrading = new DevExpress.XtraBars.BarCheckItem();
+ barCkCalcuLabels = new DevExpress.XtraBars.BarCheckItem();
+ barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
+ barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
+ barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingList = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem();
+ barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
+ barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
- ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+ ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
@@ -79,6 +108,7 @@
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
((ISupportInitialize)ribbonControl1).BeginInit();
+ ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
tabPane1.SuspendLayout();
((ISupportInitialize)dockManager1).BeginInit();
@@ -92,42 +122,45 @@
//
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, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, barBtnSave, barBtnHydroVisualList, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnWorkingParallel, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuLabels, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingAnaly, barBtnParallel, barBtnRepair, barBtnWorkingList, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 40;
+ ribbonControl1.MaxItemId = 79;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
+ ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
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(1464, 128);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
- // barBtnHydroCheck
+ // barBtnCheck
//
- barBtnHydroCheck.Caption = "鏍￠獙";
- barBtnHydroCheck.Id = 1;
- barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
- barBtnHydroCheck.Name = "barBtnHydroCheck";
- barBtnHydroCheck.ItemClick += barBtnHydroCheck_ItemClick;
+ barBtnCheck.Caption = "姘村姏妫�鏌�";
+ barBtnCheck.Id = 1;
+ barBtnCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCheck.ImageOptions.SvgImage");
+ barBtnCheck.Name = "barBtnCheck";
+ barBtnCheck.ItemClick += barBtnCheck_ItemClick;
//
- // barBtnHydroCalcu
+ // barBtnWorkingCalcu
//
- barBtnHydroCalcu.Caption = "璁＄畻";
- barBtnHydroCalcu.Id = 2;
- barBtnHydroCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCalcu.ImageOptions.SvgImage");
- barBtnHydroCalcu.Name = "barBtnHydroCalcu";
- barBtnHydroCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
+ barBtnWorkingCalcu.Caption = "宸ュ喌璁＄畻";
+ barBtnWorkingCalcu.Id = 2;
+ barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCalcu.ImageOptions.SvgImage");
+ barBtnWorkingCalcu.Name = "barBtnWorkingCalcu";
+ barBtnWorkingCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ barBtnWorkingCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
//
- // barBtnHydroExportInp
+ // barBtnExportInp
//
- barBtnHydroExportInp.Caption = "瀵煎嚭Inp";
- barBtnHydroExportInp.Id = 4;
- barBtnHydroExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroExportInp.ImageOptions.SvgImage");
- barBtnHydroExportInp.Name = "barBtnHydroExportInp";
- barBtnHydroExportInp.ItemClick += barBtnHydroExportInp_ItemClick;
+ barBtnExportInp.Caption = "瀵煎嚭Inp鏂囦欢";
+ barBtnExportInp.Id = 4;
+ barBtnExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportInp.ImageOptions.SvgImage");
+ barBtnExportInp.Name = "barBtnExportInp";
+ barBtnExportInp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnExportInp.ItemClick += barBtnExportInp_ItemClick;
//
// barBtnSave
//
@@ -137,21 +170,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;
- //
- // barBtnFastShowHidden
- //
- barBtnFastShowHidden.Caption = "涓�閿樉闅�";
- barBtnFastShowHidden.Id = 9;
- barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
- barBtnFastShowHidden.Name = "barBtnFastShowHidden";
- barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
+ barBtnHydroVisualList.Caption = "鏋勪欢鏄庣粏";
+ barBtnHydroVisualList.Id = 8;
+ barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroVisualList.ImageOptions.SvgImage");
+ barBtnHydroVisualList.Name = "barBtnHydroVisualList";
+ barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
//
// barBtnMatchingList
//
@@ -159,6 +184,7 @@
barBtnMatchingList.Id = 10;
barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage");
barBtnMatchingList.Name = "barBtnMatchingList";
+ barBtnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnMatchingList.ItemClick += barBtnMatchingList_ItemClick;
//
// barBtnUnMatchingList
@@ -167,6 +193,7 @@
barBtnUnMatchingList.Id = 19;
barBtnUnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnMatchingList.ImageOptions.SvgImage");
barBtnUnMatchingList.Name = "barBtnUnMatchingList";
+ barBtnUnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick;
//
// barBtnSetList
@@ -175,6 +202,7 @@
barBtnSetList.Id = 21;
barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage");
barBtnSetList.Name = "barBtnSetList";
+ barBtnSetList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnSetList.ItemClick += barBtnSetList_ItemClick;
//
// barBtnSetPumpList
@@ -212,12 +240,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,13 +268,14 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnAnaly
+ // barBtnWorkingParallel
//
- barBtnAnaly.Caption = "缁煎悎鍒嗘瀽";
- barBtnAnaly.Id = 31;
- barBtnAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
- barBtnAnaly.Name = "barBtnAnaly";
- barBtnAnaly.ItemClick += barBtnFeatCurve_ItemClick;
+ barBtnWorkingParallel.Caption = "骞惰仈鍒嗘瀽";
+ barBtnWorkingParallel.Id = 31;
+ barBtnWorkingParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingParallel.ImageOptions.SvgImage");
+ barBtnWorkingParallel.Name = "barBtnWorkingParallel";
+ barBtnWorkingParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingParallel.ItemClick += barBtnAnaly_ItemClick;
//
// barBtnSearch
//
@@ -254,15 +283,8 @@
barBtnSearch.Id = 32;
barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
barBtnSearch.Name = "barBtnSearch";
+ barBtnSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
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
//
@@ -278,31 +300,8 @@
barBtnGradingApply.Id = 35;
barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
barBtnGradingApply.Name = "barBtnGradingApply";
+ barBtnGradingApply.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
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
//
@@ -310,10 +309,255 @@
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.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ 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";
+ //
+ // barBtnSetMonitor
+ //
+ barBtnSetMonitor.Caption = "鐩戞祴鐐�";
+ barBtnSetMonitor.Id = 56;
+ barBtnSetMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitor.ImageOptions.SvgImage");
+ barBtnSetMonitor.Name = "barBtnSetMonitor";
+ barBtnSetMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnSetMonitor.ItemClick += barBtnSetMonitor_ItemClick;
+ //
+ // barBtnSetMonitorValue
+ //
+ barBtnSetMonitorValue.Caption = "鐩戞祴鍊�";
+ barBtnSetMonitorValue.Id = 57;
+ barBtnSetMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitorValue.ImageOptions.SvgImage");
+ barBtnSetMonitorValue.Name = "barBtnSetMonitorValue";
+ barBtnSetMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnSetMonitorValue.ItemClick += barBtnSetMonitorValue_ItemClick;
+ //
+ // barCkMonitor
+ //
+ barCkMonitor.Caption = "鏄剧ず";
+ barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkMonitor.Id = 58;
+ barCkMonitor.Name = "barCkMonitor";
+ barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
+ //
+ // barEditCurrentWorking
+ //
+ barEditCurrentWorking.Caption = "褰撳墠宸ュ喌";
+ barEditCurrentWorking.Edit = repositoryItemImageComboBox1;
+ barEditCurrentWorking.Id = 63;
+ barEditCurrentWorking.Name = "barEditCurrentWorking";
+ barEditCurrentWorking.EditValueChanged += barEditCurrentWorking_EditValueChanged;
+ //
+ // repositoryItemImageComboBox1
+ //
+ repositoryItemImageComboBox1.AutoHeight = false;
+ repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
+ repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
+ //
+ // barCkMark
+ //
+ barCkMark.Caption = "鏄剧ず";
+ barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkMark.Id = 65;
+ barCkMark.Name = "barCkMark";
+ barCkMark.CheckedChanged += barCkMark_CheckedChanged;
+ //
+ // barCkFlowEffect
+ //
+ barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
+ barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkFlowEffect.Id = 66;
+ barCkFlowEffect.Name = "barCkFlowEffect";
+ barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
+ //
+ // barCkGrading
+ //
+ barCkGrading.Caption = "鏄剧ず";
+ barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkGrading.Id = 67;
+ barCkGrading.Name = "barCkGrading";
+ barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
+ //
+ // barCkCalcuLabels
+ //
+ barCkCalcuLabels.Caption = "璁＄畻鏍囩";
+ barCkCalcuLabels.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkCalcuLabels.Id = 68;
+ barCkCalcuLabels.Name = "barCkCalcuLabels";
+ barCkCalcuLabels.CheckedChanged += barCkCalcuLabels_CheckedChanged;
+ //
+ // barBtnWorkingLossCurve
+ //
+ barBtnWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
+ barBtnWorkingLossCurve.Id = 69;
+ barBtnWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossCurve.ImageOptions.SvgImage");
+ barBtnWorkingLossCurve.Name = "barBtnWorkingLossCurve";
+ barBtnWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingLossCurve.ItemClick += barBtnWorkingLossCurve_ItemClick;
+ //
+ // barBtnWorkingLossScale
+ //
+ barBtnWorkingLossScale.Caption = "鎹熷け姣斾緥";
+ barBtnWorkingLossScale.Id = 70;
+ barBtnWorkingLossScale.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossScale.ImageOptions.SvgImage");
+ barBtnWorkingLossScale.Name = "barBtnWorkingLossScale";
+ barBtnWorkingLossScale.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingLossScale.ItemClick += barBtnWorkingLossScale_ItemClick;
+ //
+ // barBtnWorkingPower
+ //
+ barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
+ barBtnWorkingPower.Id = 71;
+ barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
+ barBtnWorkingPower.Name = "barBtnWorkingPower";
+ barBtnWorkingPower.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingPower.ItemClick += barBtnWorkingPower_ItemClick;
+ //
+ // barBtnWorkingAnaly
+ //
+ barBtnWorkingAnaly.Caption = "缁煎悎鍒嗘瀽";
+ barBtnWorkingAnaly.Id = 72;
+ barBtnWorkingAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingAnaly.ImageOptions.SvgImage");
+ barBtnWorkingAnaly.Name = "barBtnWorkingAnaly";
+ barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick;
+ //
+ // barBtnParallel
+ //
+ barBtnParallel.Caption = "骞惰仈璁＄畻";
+ barBtnParallel.Id = 73;
+ barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage");
+ barBtnParallel.Name = "barBtnParallel";
+ barBtnParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnParallel.ItemClick += barBtnParallel_ItemClick;
+ //
+ // barBtnRepair
+ //
+ barBtnRepair.Caption = "绠＄綉淇";
+ barBtnRepair.Id = 74;
+ barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
+ barBtnRepair.Name = "barBtnRepair";
+ barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ toolTipItem1.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+ superToolTip1.Items.Add(toolTipItem1);
+ barBtnRepair.SuperTip = superToolTip1;
+ barBtnRepair.ItemClick += barBtnRepair_ItemClick;
+ //
+ // barBtnWorkingList
+ //
+ barBtnWorkingList.Caption = "宸ュ喌鍒楄〃";
+ barBtnWorkingList.Id = 75;
+ barBtnWorkingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingList.ImageOptions.SvgImage");
+ barBtnWorkingList.Name = "barBtnWorkingList";
+ barBtnWorkingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingList.ItemClick += barBtnWorkingList_ItemClick;
+ //
+ // barBtnWorkingEvaluation
+ //
+ barBtnWorkingEvaluation.Caption = "绮惧害璇勪及";
+ barBtnWorkingEvaluation.Id = 76;
+ barBtnWorkingEvaluation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingEvaluation.ImageOptions.SvgImage");
+ barBtnWorkingEvaluation.Name = "barBtnWorkingEvaluation";
+ barBtnWorkingEvaluation.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnWorkingEvaluation.ItemClick += barBtnWorkingEvaluation_ItemClick;
+ //
+ // barBtnSetVisualVisible
+ //
+ barBtnSetVisualVisible.Caption = "鏋勪欢鏄剧ず";
+ barBtnSetVisualVisible.Id = 77;
+ barBtnSetVisualVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetVisualVisible.ImageOptions.SvgImage");
+ barBtnSetVisualVisible.Name = "barBtnSetVisualVisible";
+ barBtnSetVisualVisible.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnSetVisualVisible.ItemClick += barBtnSetVisualVisible_ItemClick;
+ //
+ // barCkDecorator
+ //
+ barCkDecorator.BindableChecked = true;
+ barCkDecorator.Caption = "涓�閿樉闅�";
+ barCkDecorator.Checked = true;
+ barCkDecorator.Id = 78;
+ barCkDecorator.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDecorator.ImageOptions.SvgImage");
+ barCkDecorator.Name = "barCkDecorator";
+ barCkDecorator.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barCkDecorator.CheckedChanged += barCkDecorator_CheckedChanged;
//
// 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, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -326,41 +570,65 @@
//
// pageGroupModel
//
- pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
+ pageGroupModel.ItemLinks.Add(barCkDecorator);
+ pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
+ pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
pageGroupModel.ItemLinks.Add(barBtnSearch);
- pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnProperty);
+ pageGroupModel.ItemLinks.Add(barCkFlowEffect);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
- // ribbonPageGroup5
+ // ribbonPageGroup6
//
- ribbonPageGroup5.ItemLinks.Add(barBtnMarkSet);
- ribbonPageGroup5.ItemLinks.Add(barBtnMarkCancel);
- ribbonPageGroup5.Name = "ribbonPageGroup5";
- ribbonPageGroup5.Text = "鏍囨敞";
+ ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+ ribbonPageGroup6.ItemLinks.Add(barCkMark);
+ ribbonPageGroup6.Name = "ribbonPageGroup6";
+ ribbonPageGroup6.Text = "鏍囨敞";
//
// ribbonPageGroup1
//
ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
- ribbonPageGroup1.ItemLinks.Add(barBtnGradingCancel);
+ ribbonPageGroup1.ItemLinks.Add(barCkGrading);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
//
+ // ribbonPageGroup7
+ //
+ ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitor);
+ ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue);
+ ribbonPageGroup7.ItemLinks.Add(barCkMonitor);
+ ribbonPageGroup7.Name = "ribbonPageGroup7";
+ ribbonPageGroup7.Text = "鐩戞祴";
+ //
// ribbonPageGroup2
//
- ribbonPageGroup2.ItemLinks.Add(barBtnAnaly);
- ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
- ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
+ ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
+ ribbonPageGroup2.ItemLinks.Add(barBtnRepair);
+ ribbonPageGroup2.ItemLinks.Add(barBtnParallel);
+ ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
+ ribbonPageGroup2.ItemLinks.Add(barBtnWorkingCalcu);
ribbonPageGroup2.Name = "ribbonPageGroup2";
- ribbonPageGroup2.Text = "姘村姏";
+ ribbonPageGroup2.Text = "姘村姏璁＄畻";
+ //
+ // ribbonPageGroup9
+ //
+ ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingList);
+ ribbonPageGroup9.ItemLinks.Add(barCkCalcuLabels);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossScale);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
+ ribbonPageGroup9.Name = "ribbonPageGroup9";
+ ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
//
// ribbonPageGroup3
//
ribbonPageGroup3.ItemLinks.Add(barBtnSave);
- ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "鏇村...";
@@ -378,9 +646,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(1189, 407);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(931, 407);
+ tabPane1.Size = new Size(1189, 407);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -388,13 +656,13 @@
//
tabPageBimface.Caption = "涓夌淮妯″瀷";
tabPageBimface.Name = "tabPageBimface";
- tabPageBimface.Size = new Size(931, 374);
+ tabPageBimface.Size = new Size(1189, 374);
//
// tabPageQ3d
//
tabPageQ3d.Caption = "姘村姏妯″瀷";
tabPageQ3d.Name = "tabPageQ3d";
- tabPageQ3d.Size = new Size(692, 307);
+ tabPageQ3d.Size = new Size(931, 374);
//
// dockManager1
//
@@ -406,10 +674,13 @@
//
docPnlRight.Controls.Add(controlContainerRight);
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ docPnlRight.FloatVertical = true;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(931, 128);
+ docPnlRight.Location = new Point(1189, 128);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
+ docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ docPnlRight.SavedIndex = 0;
docPnlRight.Size = new Size(275, 572);
docPnlRight.Text = "灞炴��";
//
@@ -428,14 +699,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(1189, 165);
docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
//
// controlContainerBottom
//
controlContainerBottom.Location = new Point(3, 27);
controlContainerBottom.Name = "controlContainerBottom";
- controlContainerBottom.Size = new Size(925, 135);
+ controlContainerBottom.Size = new Size(1183, 135);
controlContainerBottom.TabIndex = 0;
//
// svgImg32
@@ -447,17 +718,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,8 +753,9 @@
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
- Size = new Size(1206, 700);
+ Size = new Size(1464, 700);
((ISupportInitialize)ribbonControl1).EndInit();
+ ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
((ISupportInitialize)tabPane1).EndInit();
tabPane1.ResumeLayout(false);
((ISupportInitialize)dockManager1).EndInit();
@@ -487,15 +770,14 @@
#endregion
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
- private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
- private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
+ private DevExpress.XtraBars.BarButtonItem barBtnCheck;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingCalcu;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
- private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
+ private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
- private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
- private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
+ private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
@@ -506,7 +788,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 +795,52 @@
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 barBtnWorkingParallel;
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;
+ public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup7;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetMonitor;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetMonitorValue;
+ private DevExpress.XtraBars.BarCheckItem barCkMonitor;
+ private DevExpress.XtraBars.BarEditItem barEditCurrentWorking;
+ private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9;
+ private DevExpress.XtraBars.BarCheckItem barCkMark;
+ private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
+ private DevExpress.XtraBars.BarCheckItem barCkGrading;
+ private DevExpress.XtraBars.BarCheckItem barCkCalcuLabels;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
+ private DevExpress.XtraBars.BarButtonItem barBtnParallel;
+ private DevExpress.XtraBars.BarButtonItem barBtnRepair;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingList;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation;
+ private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible;
+ private DevExpress.XtraBars.BarCheckItem barCkDecorator;
}
}
--
Gitblit v1.9.3