冲突

Shuxia Ning

2024-11-09 4999c3c3884084c10c8a4bb2426e92cb63600166

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

@@ -37,7 +37,7 @@
            barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
            barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
            barBtnSave = new DevExpress.XtraBars.BarButtonItem();
            barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
            barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
            barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
            barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
            barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
@@ -104,7 +104,7 @@
            // 
            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, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnLoadFlowDirection, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, 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, barBtnLoadFlowDirection, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 55;
            ribbonControl1.Name = "ribbonControl1";
@@ -149,13 +149,13 @@
            barBtnSave.Name = "barBtnSave";
            barBtnSave.ItemClick += barBtnSave_ItemClick;
            // 
            // barBtnHydroParterList
            // barBtnHydroVisualList
            // 
            barBtnHydroParterList.Caption = "构件明细";
            barBtnHydroParterList.Id = 8;
            barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
            barBtnHydroParterList.Name = "barBtnHydroParterList";
            barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
            barBtnHydroVisualList.Caption = "构件明细";
            barBtnHydroVisualList.Id = 8;
            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
            barBtnHydroVisualList.Name = "barBtnHydroVisualList";
            barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
            // 
            // barBtnFastShowHidden
            // 
@@ -417,7 +417,7 @@
            // 
            pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
            pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
            pageGroupModel.ItemLinks.Add(barBtnSetList);
            pageGroupModel.Name = "pageGroupModel";
            pageGroupModel.Text = "模型";
@@ -473,9 +473,9 @@
            tabPane1.Location = new Point(0, 128);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
            tabPane1.RegularSize = new Size(1136, 467);
            tabPane1.RegularSize = new Size(1053, 407);
            tabPane1.SelectedPage = tabPageBimface;
            tabPane1.Size = new Size(1136, 467);
            tabPane1.Size = new Size(1053, 407);
            tabPane1.TabIndex = 1;
            tabPane1.Text = "tabPane1";
            // 
@@ -483,7 +483,7 @@
            // 
            tabPageBimface.Caption = "三维模型";
            tabPageBimface.Name = "tabPageBimface";
            tabPageBimface.Size = new Size(1053, 420);
            tabPageBimface.Size = new Size(1053, 374);
            // 
            // tabPageQ3d
            // 
@@ -502,17 +502,17 @@
            docPnlRight.Controls.Add(controlContainerRight);
            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
            docPnlRight.Location = new Point(1136, 128);
            docPnlRight.Location = new Point(1053, 128);
            docPnlRight.Name = "docPnlRight";
            docPnlRight.OriginalSize = new Size(275, 200);
            docPnlRight.Size = new Size(192, 572);
            docPnlRight.Size = new Size(275, 572);
            docPnlRight.Text = "属性";
            // 
            // controlContainerRight
            // 
            controlContainerRight.Location = new Point(4, 26);
            controlContainerRight.Name = "controlContainerRight";
            controlContainerRight.Size = new Size(185, 543);
            controlContainerRight.Size = new Size(268, 543);
            controlContainerRight.TabIndex = 0;
            // 
            // docPnlBottom
@@ -520,17 +520,17 @@
            docPnlBottom.Controls.Add(controlContainerBottom);
            docPnlBottom.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
            docPnlBottom.ID = new Guid("2baf4268-45b9-4b56-9f84-98580a0109e5");
            docPnlBottom.Location = new Point(0, 595);
            docPnlBottom.Location = new Point(0, 535);
            docPnlBottom.Name = "docPnlBottom";
            docPnlBottom.OriginalSize = new Size(200, 165);
            docPnlBottom.Size = new Size(1136, 105);
            docPnlBottom.Size = new Size(1053, 165);
            docPnlBottom.Text = "底部功能面板";
            // 
            // controlContainerBottom
            // 
            controlContainerBottom.Location = new Point(3, 27);
            controlContainerBottom.Name = "controlContainerBottom";
            controlContainerBottom.Size = new Size(1130, 75);
            controlContainerBottom.Size = new Size(1047, 135);
            controlContainerBottom.TabIndex = 0;
            // 
            // svgImg32
@@ -572,10 +572,10 @@
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(tabPane1);
            Controls.Add(docPnlRight);
            Controls.Add(docPnlBottom);
            Controls.Add(docPnlRight);
            Controls.Add(ribbonControl1);
            Margin = new Padding(2, 2, 2, 2);
            Margin = new Padding(2);
            Name = "XhsProjectSimulationCorePage";
            Size = new Size(1328, 700);
            ((ISupportInitialize)ribbonControl1).EndInit();
@@ -600,7 +600,7 @@
        private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
        private DevExpress.XtraBars.BarButtonItem barBtnSave;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
        private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
        private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
        private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;