冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

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

@@ -60,8 +60,7 @@
            ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
            pageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            xhsProjectSimulationBimfaceCtrl1 = new XhsProjectSimulationBimfaceCtrl();
            tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
            xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl();
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
@@ -72,10 +71,10 @@
            controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
            rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
            barBtnMark = new DevExpress.XtraBars.BarButtonItem();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
            pageBimface.SuspendLayout();
            pageQ3d.SuspendLayout();
            ((ISupportInitialize)dockManager1).BeginInit();
            docPnlProperty.SuspendLayout();
@@ -89,9 +88,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, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, barBtnShowHide, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnFeatCurve, barBtnSearch, barBtnMark });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 33;
            ribbonControl1.MaxItemId = 34;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -269,10 +268,11 @@
            // pageGroupModel
            // 
            pageGroupModel.ItemLinks.Add(barBtnShowHide);
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
            pageGroupModel.ItemLinks.Add(barBtnSetList);
            pageGroupModel.ItemLinks.Add(barBtnSearch);
            pageGroupModel.ItemLinks.Add(barBtnHydroExportInp);
            pageGroupModel.ItemLinks.Add(barBtnMark);
            pageGroupModel.Name = "pageGroupModel";
            pageGroupModel.Text = "模型";
            // 
@@ -285,8 +285,8 @@
            // 
            // ribbonPageGroup3
            // 
            ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
            ribbonPageGroup3.ItemLinks.Add(barBtnSave);
            ribbonPageGroup3.ItemLinks.Add(barBtnFeatCurve);
            ribbonPageGroup3.Name = "ribbonPageGroup3";
            ribbonPageGroup3.Text = "更多...";
            // 
@@ -297,34 +297,23 @@
            // 
            // tabPane1
            // 
            tabPane1.Controls.Add(pageBimface);
            tabPane1.Controls.Add(tabPageBimface);
            tabPane1.Controls.Add(pageQ3d);
            tabPane1.Dock = DockStyle.Fill;
            tabPane1.Location = new Point(0, 128);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d });
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, pageQ3d });
            tabPane1.RegularSize = new Size(692, 340);
            tabPane1.SelectedPage = pageBimface;
            tabPane1.SelectedPage = tabPageBimface;
            tabPane1.Size = new Size(692, 340);
            tabPane1.TabIndex = 1;
            tabPane1.Text = "tabPane1";
            // 
            // pageBimface
            // tabPageBimface
            // 
            pageBimface.Caption = "三维模型";
            pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1);
            pageBimface.Name = "pageBimface";
            pageBimface.Size = new Size(692, 307);
            // 
            // xhsProjectSimulationBimfaceCtrl1
            // 
            xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill;
            xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0);
            xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1";
            xhsProjectSimulationBimfaceCtrl1.Size = new Size(692, 307);
            xhsProjectSimulationBimfaceCtrl1.TabIndex = 0;
            xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent;
            xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent;
            tabPageBimface.Caption = "三维模型";
            tabPageBimface.Name = "tabPageBimface";
            tabPageBimface.Size = new Size(692, 307);
            // 
            // pageQ3d
            // 
@@ -414,6 +403,14 @@
            rmSet.Name = "rmSet";
            rmSet.Ribbon = ribbonControl1;
            // 
            // barBtnMark
            // 
            barBtnMark.Caption = "标注";
            barBtnMark.Id = 33;
            barBtnMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMark.ImageOptions.SvgImage");
            barBtnMark.Name = "barBtnMark";
            barBtnMark.ItemClick += barBtnMark_ItemClick;
            // 
            // XhsProjectSimulationCorePage
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -430,7 +427,6 @@
            ((ISupportInitialize)ribbonControl1).EndInit();
            ((ISupportInitialize)tabPane1).EndInit();
            tabPane1.ResumeLayout(false);
            pageBimface.ResumeLayout(false);
            pageQ3d.ResumeLayout(false);
            ((ISupportInitialize)dockManager1).EndInit();
            docPnlProperty.ResumeLayout(false);
@@ -458,12 +454,11 @@
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
        private DevExpress.XtraBars.BarButtonItem barBtnMatchingList;
        private DevExpress.XtraBars.Navigation.TabPane tabPane1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage pageBimface;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
        private DevExpress.XtraBars.Navigation.TabNavigationPage pageQ3d;
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
        private DevExpress.XtraBars.Docking.DockPanel docPnlProperty;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private XhsProjectSimulationBimfaceCtrl xhsProjectSimulationBimfaceCtrl1;
        private XhsProjectSimulationQ3dCtrl xhsProjectSimulationQ3dCtrl1;
        private XhsProjectSimulationPropertyCtrl xhsProjectSimulationPropertyCtrl1;
        private DevExpress.Utils.SvgImageCollection svgImg32;
@@ -484,5 +479,6 @@
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
        private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
        private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
        private DevExpress.XtraBars.BarButtonItem barBtnMark;
    }
}