From 4fa5e391fcb989f4687ba3398f84a5ab066d7285 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 20 十一月 2024 15:49:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 225 ++++++++++++++++++++++++++++---------------------------
1 files changed, 115 insertions(+), 110 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 6e4490f..4eb11ba 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,6 +32,8 @@
{
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();
barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
barBtnWorkingCalcu = new DevExpress.XtraBars.BarButtonItem();
@@ -51,7 +53,7 @@
barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
- barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
@@ -67,29 +69,27 @@
barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
- barBtnLoadFlowEffect = new DevExpress.XtraBars.BarButtonItem();
- barBtnUnloadFlowDirection = new DevExpress.XtraBars.BarButtonItem();
- barBtnClearMark = new DevExpress.XtraBars.BarButtonItem();
- batBtnCancelGradingApply = 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();
- barBtnWorkingCompare = new DevExpress.XtraBars.BarButtonItem();
barCkMark = new DevExpress.XtraBars.BarCheckItem();
barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
barCkGrading = new DevExpress.XtraBars.BarCheckItem();
- barCkCalcuResult = new DevExpress.XtraBars.BarCheckItem();
+ barCkCalcuLabels = new DevExpress.XtraBars.BarCheckItem();
barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
barBtnWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
- barBtnWorkingMulti = 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();
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();
ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -106,7 +106,6 @@
controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
- barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -122,9 +121,9 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, 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, barBtnLoadFlowEffect, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barBtnWorkingCompare, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuResult, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPower, barBtnWorkingMulti, barBtnParallel });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, barBtnSave, barBtnHydroVisualList, barBtnFastShowHidden, 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 });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 74;
+ ribbonControl1.MaxItemId = 77;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -148,7 +147,7 @@
//
barBtnWorkingCalcu.Caption = "宸ュ喌璁＄畻";
barBtnWorkingCalcu.Id = 2;
- barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCalcu.ImageOptions.SvgImage");
+ 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;
@@ -159,6 +158,7 @@
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
@@ -191,6 +191,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
@@ -199,6 +200,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
@@ -207,6 +209,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
@@ -272,13 +275,14 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnParallelAnaly
+ // barBtnWorkingParallel
//
- barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
- barBtnParallelAnaly.Id = 31;
- barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
- barBtnParallelAnaly.Name = "barBtnParallelAnaly";
- barBtnParallelAnaly.ItemClick += barBtnAnaly_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
//
@@ -286,6 +290,7 @@
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;
//
// barBtnGradingSet
@@ -302,6 +307,7 @@
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;
//
// barBtnRefresh
@@ -318,6 +324,7 @@
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
@@ -388,44 +395,13 @@
barBtnSetPressmeterList.Id = 50;
barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
//
- // barBtnLoadFlowEffect
- //
- barBtnLoadFlowEffect.Caption = "鍔犺浇";
- barBtnLoadFlowEffect.Id = 51;
- barBtnLoadFlowEffect.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnLoadFlowEffect.ImageOptions.SvgImage");
- barBtnLoadFlowEffect.Name = "barBtnLoadFlowEffect";
- barBtnLoadFlowEffect.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;
- //
// 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
@@ -434,22 +410,24 @@
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.AfterText;
+ barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
barCkMonitor.Id = 58;
barCkMonitor.Name = "barCkMonitor";
barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
//
// barEditCurrentWorking
//
- barEditCurrentWorking.Caption = "宸ュ喌";
+ barEditCurrentWorking.Caption = "褰撳墠宸ュ喌";
barEditCurrentWorking.Edit = repositoryItemImageComboBox1;
barEditCurrentWorking.Id = 63;
barEditCurrentWorking.Name = "barEditCurrentWorking";
+ barEditCurrentWorking.EditValueChanged += barEditCurrentWorking_EditValueChanged;
//
// repositoryItemImageComboBox1
//
@@ -457,25 +435,18 @@
repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
//
- // barBtnWorkingCompare
- //
- barBtnWorkingCompare.Caption = "宸ュ喌瀵规瘮";
- barBtnWorkingCompare.Id = 64;
- barBtnWorkingCompare.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCompare.ImageOptions.SvgImage");
- barBtnWorkingCompare.Name = "barBtnWorkingCompare";
- //
// barCkMark
//
barCkMark.Caption = "鏄剧ず";
- barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+ barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
barCkMark.Id = 65;
barCkMark.Name = "barCkMark";
barCkMark.CheckedChanged += barCkMark_CheckedChanged;
//
// barCkFlowEffect
//
- barCkFlowEffect.Caption = "鏄剧ず";
- barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+ barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
+ barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
barCkFlowEffect.Id = 66;
barCkFlowEffect.Name = "barCkFlowEffect";
barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
@@ -483,16 +454,18 @@
// barCkGrading
//
barCkGrading.Caption = "鏄剧ず";
- barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+ barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
barCkGrading.Id = 67;
barCkGrading.Name = "barCkGrading";
+ barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
//
- // barCkCalcuResult
+ // barCkCalcuLabels
//
- barCkCalcuResult.Caption = "鏄剧ず";
- barCkCalcuResult.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
- barCkCalcuResult.Id = 68;
- barCkCalcuResult.Name = "barCkCalcuResult";
+ barCkCalcuLabels.Caption = "璁＄畻鏍囩";
+ barCkCalcuLabels.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkCalcuLabels.Id = 68;
+ barCkCalcuLabels.Name = "barCkCalcuLabels";
+ barCkCalcuLabels.CheckedChanged += barCkCalcuLabels_CheckedChanged;
//
// barBtnWorkingLossCurve
//
@@ -500,6 +473,8 @@
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
//
@@ -507,24 +482,69 @@
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.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;
//
- // barBtnWorkingMulti
+ // barBtnWorkingAnaly
//
- barBtnWorkingMulti.Caption = "缁煎悎鍒嗘瀽";
- barBtnWorkingMulti.Id = 72;
- barBtnWorkingMulti.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingMulti.ImageOptions.SvgImage");
- barBtnWorkingMulti.Name = "barBtnWorkingMulti";
+ 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;
//
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup5, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
//
@@ -538,33 +558,24 @@
// pageGroupModel
//
pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
- pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
+ pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnSetList);
+ pageGroupModel.ItemLinks.Add(barCkFlowEffect);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
// ribbonPageGroup6
//
ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
- ribbonPageGroup6.ItemLinks.Add(barBtnClearMark);
ribbonPageGroup6.ItemLinks.Add(barCkMark);
ribbonPageGroup6.Name = "ribbonPageGroup6";
ribbonPageGroup6.Text = "鏍囨敞";
- //
- // ribbonPageGroup5
- //
- ribbonPageGroup5.ItemLinks.Add(barBtnLoadFlowEffect);
- ribbonPageGroup5.ItemLinks.Add(barBtnUnloadFlowDirection);
- ribbonPageGroup5.ItemLinks.Add(barCkFlowEffect);
- ribbonPageGroup5.Name = "ribbonPageGroup5";
- ribbonPageGroup5.Text = "娴佸悜";
//
// ribbonPageGroup1
//
ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
- ribbonPageGroup1.ItemLinks.Add(batBtnCancelGradingApply);
ribbonPageGroup1.ItemLinks.Add(barCkGrading);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
@@ -580,22 +591,24 @@
// ribbonPageGroup2
//
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(barCkCalcuResult);
+ 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(barBtnWorkingPower);
- ribbonPageGroup9.ItemLinks.Add(barBtnParallelAnaly);
- ribbonPageGroup9.ItemLinks.Add(barBtnWorkingMulti);
- ribbonPageGroup9.ItemLinks.Add(barBtnWorkingCompare);
+ ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
ribbonPageGroup9.Name = "ribbonPageGroup9";
ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
//
@@ -647,10 +660,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(1666, 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 = "灞炴��";
//
@@ -711,14 +727,6 @@
rmSet.Ribbon = ribbonControl1;
rmSet.BeforePopup += rmSet_BeforePopup;
//
- // barBtnParallel
- //
- barBtnParallel.Caption = "骞惰仈鍒嗘瀽";
- barBtnParallel.Id = 73;
- barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnalysis.ImageOptions.SvgImage");
- barBtnParallel.Name = "barBtnParallel";
- barBtnParallel.ItemClick += barBtnParallel_ItemClick;
- //
// XhsProjectSimulationCorePage
//
Appearance.BackColor = SystemColors.Control;
@@ -778,7 +786,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
- private DevExpress.XtraBars.BarButtonItem barBtnParallelAnaly;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -798,29 +806,26 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
- private DevExpress.XtraBars.BarButtonItem barBtnLoadFlowEffect;
- 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;
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.BarButtonItem barBtnWorkingCompare;
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 barCkCalcuResult;
+ private DevExpress.XtraBars.BarCheckItem barCkCalcuLabels;
private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossScale;
private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
- private DevExpress.XtraBars.BarButtonItem barBtnWorkingMulti;
+ 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;
}
}
--
Gitblit v1.9.3