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 | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 78 insertions(+), 73 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 1b2acbf..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
@@ -53,7 +53,7 @@
barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
- barBtnCurrentWorkingParallelAnalysis = new DevExpress.XtraBars.BarButtonItem();
+ barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
@@ -77,14 +77,15 @@
barCkMark = new DevExpress.XtraBars.BarCheckItem();
barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
barCkGrading = new DevExpress.XtraBars.BarCheckItem();
- barCkCurrentWorkingCalcuResult = new DevExpress.XtraBars.BarCheckItem();
- barBtnCurrentWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
- barBtnCurrentWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
- barBtnCurrentWorkingPowerAnalysis = new DevExpress.XtraBars.BarButtonItem();
- barBtnCurrentWorkingMultiAnalysis = new DevExpress.XtraBars.BarButtonItem();
+ 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();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -105,7 +106,6 @@
controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
- dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
((ISupportInitialize)tabPane1).BeginInit();
@@ -121,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, barBtnCurrentWorkingParallelAnalysis, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCurrentWorkingCalcuResult, barBtnCurrentWorkingLossCurve, barBtnCurrentWorkingLossScale, barBtnCurrentWorkingPowerAnalysis, barBtnCurrentWorkingMultiAnalysis, barBtnParallel, barBtnRepair, barBtnWorkingList });
+ 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 = 76;
+ ribbonControl1.MaxItemId = 77;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -275,14 +275,14 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnCurrentWorkingParallelAnalysis
+ // barBtnWorkingParallel
//
- barBtnCurrentWorkingParallelAnalysis.Caption = "骞惰仈鍒嗘瀽";
- barBtnCurrentWorkingParallelAnalysis.Id = 31;
- barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage");
- barBtnCurrentWorkingParallelAnalysis.Name = "barBtnCurrentWorkingParallelAnalysis";
- barBtnCurrentWorkingParallelAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- barBtnCurrentWorkingParallelAnalysis.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
//
@@ -416,7 +416,7 @@
// 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;
@@ -438,7 +438,7 @@
// 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;
@@ -446,7 +446,7 @@
// barCkFlowEffect
//
barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
- barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+ barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
barCkFlowEffect.Id = 66;
barCkFlowEffect.Name = "barCkFlowEffect";
barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
@@ -454,49 +454,54 @@
// 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;
//
- // barCkCurrentWorkingCalcuResult
+ // barCkCalcuLabels
//
- barCkCurrentWorkingCalcuResult.Caption = "璁＄畻缁撴灉";
- barCkCurrentWorkingCalcuResult.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
- barCkCurrentWorkingCalcuResult.Id = 68;
- barCkCurrentWorkingCalcuResult.Name = "barCkCurrentWorkingCalcuResult";
+ barCkCalcuLabels.Caption = "璁＄畻鏍囩";
+ barCkCalcuLabels.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
+ barCkCalcuLabels.Id = 68;
+ barCkCalcuLabels.Name = "barCkCalcuLabels";
+ barCkCalcuLabels.CheckedChanged += barCkCalcuLabels_CheckedChanged;
//
- // barBtnCurrentWorkingLossCurve
+ // barBtnWorkingLossCurve
//
- barBtnCurrentWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
- barBtnCurrentWorkingLossCurve.Id = 69;
- barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage");
- barBtnCurrentWorkingLossCurve.Name = "barBtnCurrentWorkingLossCurve";
- barBtnCurrentWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ 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;
//
- // barBtnCurrentWorkingLossScale
+ // barBtnWorkingLossScale
//
- barBtnCurrentWorkingLossScale.Caption = "鎹熷け姣斾緥";
- barBtnCurrentWorkingLossScale.Id = 70;
- barBtnCurrentWorkingLossScale.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossScale.ImageOptions.SvgImage");
- barBtnCurrentWorkingLossScale.Name = "barBtnCurrentWorkingLossScale";
- barBtnCurrentWorkingLossScale.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ 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;
//
- // barBtnCurrentWorkingPowerAnalysis
+ // barBtnWorkingPower
//
- barBtnCurrentWorkingPowerAnalysis.Caption = "鑳芥晥鍒嗘瀽";
- barBtnCurrentWorkingPowerAnalysis.Id = 71;
- barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage");
- barBtnCurrentWorkingPowerAnalysis.Name = "barBtnCurrentWorkingPowerAnalysis";
- barBtnCurrentWorkingPowerAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ 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;
//
- // barBtnCurrentWorkingMultiAnalysis
+ // barBtnWorkingAnaly
//
- barBtnCurrentWorkingMultiAnalysis.Caption = "缁煎悎鍒嗘瀽";
- barBtnCurrentWorkingMultiAnalysis.Id = 72;
- barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage");
- barBtnCurrentWorkingMultiAnalysis.Name = "barBtnCurrentWorkingMultiAnalysis";
- barBtnCurrentWorkingMultiAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+ 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
//
@@ -525,7 +530,17 @@
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
//
@@ -586,13 +601,14 @@
// ribbonPageGroup9
//
ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
- ribbonPageGroup9.ItemLinks.Add(barCkCurrentWorkingCalcuResult);
- ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingParallelAnalysis);
- ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossCurve);
- ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossScale);
- ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingPowerAnalysis);
- ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingMultiAnalysis);
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 = "宸ュ喌鍒嗘瀽";
//
@@ -711,17 +727,6 @@
rmSet.Ribbon = ribbonControl1;
rmSet.BeforePopup += rmSet_BeforePopup;
//
- // dockPanel2
- //
- dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
- dockPanel2.ID = new Guid("9e1401bf-eba9-4e65-8e3e-50e08d389108");
- dockPanel2.Location = new Point(1666, 128);
- dockPanel2.Name = "dockPanel2";
- dockPanel2.OriginalSize = new Size(275, 200);
- dockPanel2.Size = new Size(275, 572);
- dockPanel2.Tabbed = true;
- dockPanel2.Text = "panelContainer1";
- //
// XhsProjectSimulationCorePage
//
Appearance.BackColor = SystemColors.Control;
@@ -781,7 +786,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
- private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingParallelAnalysis;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -813,14 +818,14 @@
private DevExpress.XtraBars.BarCheckItem barCkMark;
private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
private DevExpress.XtraBars.BarCheckItem barCkGrading;
- private DevExpress.XtraBars.BarCheckItem barCkCurrentWorkingCalcuResult;
- private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossCurve;
- private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossScale;
- private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingPowerAnalysis;
- private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingMultiAnalysis;
+ 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.Docking.DockPanel dockPanel2;
+ private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation;
}
}
--
Gitblit v1.9.3