From 366e8053d77db67dee65a31e3510d14901f14e11 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 16 十一月 2024 15:46:28 +0800
Subject: [PATCH] 解决水流动画显示问题，之后关于水流动画应该不会再更新了
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 43 +++++--------------------------------------
1 files changed, 5 insertions(+), 38 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 e9bfb25..097fc15 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
@@ -69,8 +69,6 @@
barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
- barBtnLoadFlowEffect = new DevExpress.XtraBars.BarButtonItem();
- batBtnCancelGradingApply = new DevExpress.XtraBars.BarButtonItem();
barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem();
barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem();
barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
@@ -91,7 +89,6 @@
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();
@@ -123,7 +120,7 @@
//
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, batBtnCancelGradingApply, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barBtnWorkingCompare, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuResult, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPowerAnalysis, barBtnWorkingMulti, barBtnParallel, barBtnRepair });
+ 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, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barBtnWorkingCompare, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcuResult, barBtnWorkingLossCurve, barBtnWorkingLossScale, barBtnWorkingPowerAnalysis, barBtnWorkingMulti, barBtnParallel, barBtnRepair });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.MaxItemId = 75;
ribbonControl1.Name = "ribbonControl1";
@@ -185,7 +182,6 @@
barBtnFastShowHidden.Id = 9;
barBtnFastShowHidden.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnFastShowHidden.ImageOptions.SvgImage");
barBtnFastShowHidden.Name = "barBtnFastShowHidden";
- barBtnFastShowHidden.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnFastShowHidden.ItemClick += barBtnFastShowHidden_ItemClick;
//
// barBtnMatchingList
@@ -302,7 +298,6 @@
barBtnGradingSet.Id = 34;
barBtnGradingSet.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingSet.ImageOptions.SvgImage");
barBtnGradingSet.Name = "barBtnGradingSet";
- barBtnGradingSet.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnGradingSet.ItemClick += barBtnGradingSet_ItemClick;
//
// barBtnGradingApply
@@ -399,24 +394,6 @@
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.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
- barBtnLoadFlowEffect.ItemClick += barBtnLoadFlowDirection_ItemClick;
- //
- // batBtnCancelGradingApply
- //
- batBtnCancelGradingApply.Caption = "鍙栨秷";
- batBtnCancelGradingApply.Id = 54;
- batBtnCancelGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("batBtnCancelGradingApply.ImageOptions.SvgImage");
- batBtnCancelGradingApply.Name = "batBtnCancelGradingApply";
- batBtnCancelGradingApply.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- batBtnCancelGradingApply.ItemClick += batBtnCancelGradingApply_ItemClick;
- //
// barBtnSetMonitor
//
barBtnSetMonitor.Caption = "鐩戞祴鐐�";
@@ -474,7 +451,7 @@
//
// barCkFlowEffect
//
- barCkFlowEffect.Caption = "鏄剧ず";
+ barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
barCkFlowEffect.Id = 66;
barCkFlowEffect.Name = "barCkFlowEffect";
@@ -549,7 +526,7 @@
//
// 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";
//
@@ -563,9 +540,10 @@
// pageGroupModel
//
pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
+ pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
pageGroupModel.ItemLinks.Add(barBtnSearch);
pageGroupModel.ItemLinks.Add(barBtnSetList);
- pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
+ pageGroupModel.ItemLinks.Add(barCkFlowEffect);
pageGroupModel.Name = "pageGroupModel";
pageGroupModel.Text = "妯″瀷";
//
@@ -576,18 +554,10 @@
ribbonPageGroup6.Name = "ribbonPageGroup6";
ribbonPageGroup6.Text = "鏍囨敞";
//
- // ribbonPageGroup5
- //
- ribbonPageGroup5.ItemLinks.Add(barBtnLoadFlowEffect);
- 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 = "棰滆壊鍒嗙骇";
@@ -814,11 +784,8 @@
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;
public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
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;
--
Gitblit v1.9.3