From 935a8a4996853c51188402c57f905ee9c9eac898 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 22:51:50 +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 | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 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 ce061dd..ab775ea 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,16 +32,14 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
- DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ 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();
barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
barBtnVisualList = new DevExpress.XtraBars.BarButtonItem();
- barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
- barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetPumpList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetValveList = new DevExpress.XtraBars.BarButtonItem();
@@ -52,7 +50,7 @@
barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
- barBtnWorkingParallel = new DevExpress.XtraBars.BarButtonItem();
+ barBtnPumpAnaly = new DevExpress.XtraBars.BarButtonItem();
barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
barBtnSetGradingList = new DevExpress.XtraBars.BarButtonItem();
barBtnApplyGradingList = new DevExpress.XtraBars.BarButtonItem();
@@ -85,8 +83,8 @@
barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem();
+ barBtnPumpCurve = 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();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -122,9 +120,9 @@
//
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnWorkingParallel, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnPumpAnaly, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking, barBtnPumpCurve });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 81;
+ ribbonControl1.MaxItemId = 82;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
@@ -178,24 +176,6 @@
barBtnVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnVisualList.ImageOptions.SvgImage");
barBtnVisualList.Name = "barBtnVisualList";
barBtnVisualList.ItemClick += barBtnVisualList_ItemClick;
- //
- // barBtnMatchingList
- //
- barBtnMatchingList.Caption = "鑷姩鍖归厤";
- 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
- //
- barBtnUnMatchingList.Caption = "鏈尮閰嶅垪琛�";
- 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
//
@@ -269,14 +249,15 @@
barBtnSetJunctionList.Id = 30;
barBtnSetJunctionList.Name = "barBtnSetJunctionList";
//
- // barBtnWorkingParallel
+ // barBtnPumpAnaly
//
- 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;
+ barBtnPumpAnaly.Caption = "姘存车鍒嗘瀽";
+ barBtnPumpAnaly.Id = 31;
+ barBtnPumpAnaly.ImageOptions.Image = Xhs.Core.Properties.Resources.pump_run_32;
+ barBtnPumpAnaly.ImageOptions.LargeImage = Xhs.Core.Properties.Resources.pump_run_32;
+ barBtnPumpAnaly.Name = "barBtnPumpAnaly";
+ barBtnPumpAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnPumpAnaly.ItemClick += barBtnPumpAnaly_ItemClick;
//
// barBtnSearch
//
@@ -318,7 +299,6 @@
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
@@ -396,7 +376,6 @@
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
@@ -461,14 +440,14 @@
//
barBtnWorkingLossStatistics.Caption = "鎹熷け缁熻";
barBtnWorkingLossStatistics.Id = 70;
- barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossScale.ImageOptions.SvgImage");
+ barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossStatistics.ImageOptions.SvgImage");
barBtnWorkingLossStatistics.Name = "barBtnWorkingLossStatistics";
barBtnWorkingLossStatistics.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnWorkingLossStatistics.ItemClick += barBtnWorkingLossStatistics_ItemClick;
//
// barBtnWorkingPower
//
- barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
+ barBtnWorkingPower.Caption = "鑳借�楀垎鏋�";
barBtnWorkingPower.Id = 71;
barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
barBtnWorkingPower.Name = "barBtnWorkingPower";
@@ -490,6 +469,7 @@
barBtnPumpParallel.Id = 73;
barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpParallel.ImageOptions.SvgImage");
barBtnPumpParallel.Name = "barBtnPumpParallel";
+ barBtnPumpParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnPumpParallel.ItemClick += barBtnPumpParallel_ItemClick;
//
// barBtnRepair
@@ -499,9 +479,9 @@
barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
barBtnRepair.Name = "barBtnRepair";
barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
- superToolTip2.Items.Add(toolTipItem2);
- barBtnRepair.SuperTip = superToolTip2;
+ toolTipItem1.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+ superToolTip1.Items.Add(toolTipItem1);
+ barBtnRepair.SuperTip = superToolTip1;
barBtnRepair.ItemClick += barBtnRepair_ItemClick;
//
// barBtnWorkingEvaluation
@@ -542,18 +522,20 @@
barBtnAddWorking.Name = "barBtnAddWorking";
barBtnAddWorking.ItemClick += barBtnAddWorking_ItemClick;
//
+ // barBtnPumpCurve
+ //
+ barBtnPumpCurve.Caption = "鎬ц兘鏇茬嚎";
+ barBtnPumpCurve.Id = 81;
+ barBtnPumpCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpCurve.ImageOptions.SvgImage");
+ barBtnPumpCurve.Name = "barBtnPumpCurve";
+ barBtnPumpCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+ barBtnPumpCurve.ItemClick += barBtnPumpCurve_ItemClick;
+ //
// ribbonPage1
//
- ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
+ ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
ribbonPage1.Name = "ribbonPage1";
ribbonPage1.Text = "ribbonPage1";
- //
- // pageGroupMatching
- //
- pageGroupMatching.ItemLinks.Add(barBtnMatchingList);
- pageGroupMatching.ItemLinks.Add(barBtnUnMatchingList);
- pageGroupMatching.Name = "pageGroupMatching";
- pageGroupMatching.Text = "鍖归厤";
//
// pageGroupModel
//
@@ -592,6 +574,7 @@
//
// ribbonPageGroup5
//
+ ribbonPageGroup5.ItemLinks.Add(barBtnPumpCurve);
ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel);
ribbonPageGroup5.Name = "ribbonPageGroup5";
ribbonPageGroup5.Text = "姘存车";
@@ -608,8 +591,8 @@
//
// ribbonPageGroup9
//
+ ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
- ribbonPageGroup9.ItemLinks.Add(barBtnWorkingParallel);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
@@ -770,14 +753,12 @@
private DevExpress.XtraBars.BarButtonItem barBtnCheck;
private DevExpress.XtraBars.BarButtonItem barBtnCalcu;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
- private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
private DevExpress.XtraBars.BarButtonItem barBtnVisualList;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
- private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
private DevExpress.XtraBars.Navigation.TabPane tabPane1;
private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d;
@@ -796,7 +777,7 @@
private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
- private DevExpress.XtraBars.BarButtonItem barBtnWorkingParallel;
+ private DevExpress.XtraBars.BarButtonItem barBtnPumpAnaly;
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -816,7 +797,6 @@
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;
@@ -839,5 +819,6 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
private DevExpress.XtraBars.BarButtonItem barBtnAddWorking;
private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
+ private DevExpress.XtraBars.BarButtonItem barBtnPumpCurve;
}
}
--
Gitblit v1.9.3