Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-11-03 28402b6df09de5e106422878246f7ac814d353b0

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs

@@ -55,7 +55,6 @@
            barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
            barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
            barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
            barBtnProperty = new DevExpress.XtraBars.BarButtonItem();
            barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
            barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
            barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
@@ -85,6 +84,7 @@
            controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
            rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
@@ -99,9 +99,9 @@
            // 
            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, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnProperty, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, 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, barButtonItem1 });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 51;
            ribbonControl1.MaxItemId = 52;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -114,7 +114,7 @@
            // 
            // barBtnHydroCheck
            // 
            barBtnHydroCheck.Caption = "校验";
            barBtnHydroCheck.Caption = "检查";
            barBtnHydroCheck.Id = 1;
            barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
            barBtnHydroCheck.Name = "barBtnHydroCheck";
@@ -251,7 +251,7 @@
            // 
            barBtnParallelAnaly.Caption = "并联分析";
            barBtnParallelAnaly.Id = 31;
            barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAnaly.ImageOptions.SvgImage");
            barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
            barBtnParallelAnaly.Name = "barBtnParallelAnaly";
            barBtnParallelAnaly.ItemClick += barBtnAnaly_ItemClick;
            // 
@@ -279,20 +279,13 @@
            barBtnGradingApply.Name = "barBtnGradingApply";
            barBtnGradingApply.ItemClick += barBtnGradingApply_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
            // 
            barBtnRefresh.Caption = "刷新";
            barBtnRefresh.Id = 39;
            barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
            barBtnRefresh.Name = "barBtnRefresh";
            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
            // 
            // barBtnSetMark
            // 
@@ -389,8 +382,8 @@
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
            pageGroupModel.ItemLinks.Add(barBtnSetList);
            pageGroupModel.ItemLinks.Add(barBtnProperty);
            pageGroupModel.ItemLinks.Add(barBtnSetMark);
            pageGroupModel.ItemLinks.Add(barButtonItem1);
            pageGroupModel.Name = "pageGroupModel";
            pageGroupModel.Text = "模型";
            // 
@@ -522,6 +515,13 @@
            rmSet.Ribbon = ribbonControl1;
            rmSet.BeforePopup += rmSet_BeforePopup;
            // 
            // barButtonItem1
            // 
            barButtonItem1.Caption = "barButtonItem1";
            barButtonItem1.Id = 51;
            barButtonItem1.Name = "barButtonItem1";
            barButtonItem1.ItemClick += barButtonItem1_ItemClick;
            // 
            // XhsProjectSimulationCorePage
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -589,7 +589,6 @@
        private DevExpress.XtraBars.BarButtonItem barBtnGradingSet;
        private DevExpress.XtraBars.BarButtonItem barBtnGradingApply;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private DevExpress.XtraBars.BarButtonItem barBtnProperty;
        private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
        private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
        private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
@@ -602,5 +601,6 @@
        private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
        private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
        private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
        private DevExpress.XtraBars.BarButtonItem barButtonItem1;
    }
}