From 4efc8a05680652b9aa9eacefccbcd74383c11b29 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期四, 26 九月 2024 17:16:55 +0800 Subject: [PATCH] 修复部分丢失的控件 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 367 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 257 insertions(+), 110 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs index 50e4eeb..eddb617 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs @@ -37,13 +37,18 @@ barBtnSave = new DevExpress.XtraBars.BarButtonItem(); barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem(); barBtnShowHide = new DevExpress.XtraBars.BarButtonItem(); - barBtnMatching = new DevExpress.XtraBars.BarButtonItem(); - barBtnSingleMatching = new DevExpress.XtraBars.BarSubItem(); - barBtnPumpMatching = new DevExpress.XtraBars.BarButtonItem(); - barBtnValveMatching = new DevExpress.XtraBars.BarButtonItem(); - barBtnPipeMatching = new DevExpress.XtraBars.BarButtonItem(); - barBtn = 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(); + barBtnSetPipeList = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetElbowsList = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetThreelinkList = new DevExpress.XtraBars.BarButtonItem(); + barBtnFourlinkList = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem(); + barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem(); ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage(); ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); @@ -51,54 +56,68 @@ ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup(); tabPane1 = new DevExpress.XtraBars.Navigation.TabPane(); pageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage(); + xhsProjectSimulationBimfaceCtrl1 = new XhsProjectSimulationBimfaceCtrl(); pageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage(); + xhsProjectSimulationQ3dCtrl1 = new XhsProjectSimulationQ3dCtrl(); tabPageL3d = new DevExpress.XtraBars.Navigation.TabNavigationPage(); + xhsProjectSimulationL3dCtrl1 = new XhsProjectSimulationL3dCtrl(); dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components); docPnlProperty = new DevExpress.XtraBars.Docking.DockPanel(); dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer(); - docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel(); - controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer(); + xhsProjectSimulationPropertyCtrl1 = new XhsProjectSimulationPropertyCtrl(); docPnlHydroParterList = new DevExpress.XtraBars.Docking.DockPanel(); controlContainer3 = new DevExpress.XtraBars.Docking.ControlContainer(); hydroParterListCtrl1 = new HydroParterListCtrl(); docPnlHydroCalcu = new DevExpress.XtraBars.Docking.DockPanel(); controlContainer2 = new DevExpress.XtraBars.Docking.ControlContainer(); + xhsProjectSimulationHydroCalcuFailedCtrl1 = new XhsProjectSimulationHydroCalcuFailedCtrl(); docPnlHydroCheck = new DevExpress.XtraBars.Docking.DockPanel(); controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer(); + xhsProjectSimulationHydroCheckFailedCtrl1 = new XhsProjectSimulationHydroCheckFailedCtrl(); docPnlUnMatchingList = new DevExpress.XtraBars.Docking.DockPanel(); controlContainer4 = new DevExpress.XtraBars.Docking.ControlContainer(); - svgImg32 = new DevExpress.Utils.SvgImageCollection(components); - radialMenu1 = new DevExpress.XtraBars.Ribbon.RadialMenu(components); + xhsProjectSimulationUnMatchingListCtrl1 = new XhsProjectSimulationUnMatchingListCtrl(); + docPnlMatchingList = new DevExpress.XtraBars.Docking.DockPanel(); + controlContainer5 = new DevExpress.XtraBars.Docking.ControlContainer(); xhsProjectSimulationMatchingListCtrl1 = new Xhs.XhsProjectSimulationMatchingListCtrl(); + svgImg32 = new DevExpress.Utils.SvgImageCollection(components); + rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components); ((ISupportInitialize)ribbonControl1).BeginInit(); ((ISupportInitialize)tabPane1).BeginInit(); tabPane1.SuspendLayout(); + pageBimface.SuspendLayout(); + pageQ3d.SuspendLayout(); + tabPageL3d.SuspendLayout(); ((ISupportInitialize)dockManager1).BeginInit(); docPnlProperty.SuspendLayout(); - docPnlMatchingList.SuspendLayout(); - controlContainer5.SuspendLayout(); + dockPanel1_Container.SuspendLayout(); docPnlHydroParterList.SuspendLayout(); controlContainer3.SuspendLayout(); docPnlHydroCalcu.SuspendLayout(); + controlContainer2.SuspendLayout(); docPnlHydroCheck.SuspendLayout(); + controlContainer1.SuspendLayout(); docPnlUnMatchingList.SuspendLayout(); + controlContainer4.SuspendLayout(); + docPnlMatchingList.SuspendLayout(); + controlContainer5.SuspendLayout(); ((ISupportInitialize)svgImg32).BeginInit(); - ((ISupportInitialize)radialMenu1).BeginInit(); + ((ISupportInitialize)rmSet).BeginInit(); SuspendLayout(); // // ribbonControl1 // 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, barBtnMatching, barBtnSingleMatching, barBtnPumpMatching, barBtnValveMatching, barBtnPipeMatching, barBtn, barBtnUnMatchingList }); + 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 }); ribbonControl1.Location = new Point(0, 0); - ribbonControl1.MaxItemId = 21; + ribbonControl1.MaxItemId = 31; ribbonControl1.Name = "ribbonControl1"; ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 }); ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False; ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; - ribbonControl1.Size = new Size(1161, 101); + ribbonControl1.Size = new Size(1161, 128); ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // // barBtnHydroCheck @@ -149,49 +168,13 @@ barBtnShowHide.Name = "barBtnShowHide"; barBtnShowHide.ItemClick += barBtnShowHide_ItemClick; // - // barBtnMatching + // barBtnMatchingList // - barBtnMatching.Caption = "鑷姩鍖归厤"; - barBtnMatching.Id = 10; - barBtnMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatching.ImageOptions.SvgImage"); - barBtnMatching.Name = "barBtnMatching"; - barBtnMatching.ItemClick += barBtnMatching_ItemClick; - // - // barBtnSingleMatching - // - barBtnSingleMatching.Caption = "鏋勪欢閰嶇疆"; - barBtnSingleMatching.Id = 13; - barBtnSingleMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSingleMatching.ImageOptions.SvgImage"); - barBtnSingleMatching.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnPumpMatching), new DevExpress.XtraBars.LinkPersistInfo(barBtnValveMatching), new DevExpress.XtraBars.LinkPersistInfo(barBtnPipeMatching), new DevExpress.XtraBars.LinkPersistInfo(barBtn) }); - barBtnSingleMatching.Name = "barBtnSingleMatching"; - // - // barBtnPumpMatching - // - barBtnPumpMatching.Caption = "姘存车"; - barBtnPumpMatching.Id = 14; - barBtnPumpMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpMatching.ImageOptions.SvgImage"); - barBtnPumpMatching.Name = "barBtnPumpMatching"; - // - // barBtnValveMatching - // - barBtnValveMatching.Caption = "闃�闂�"; - barBtnValveMatching.Id = 15; - barBtnValveMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnValveMatching.ImageOptions.SvgImage"); - barBtnValveMatching.Name = "barBtnValveMatching"; - // - // barBtnPipeMatching - // - barBtnPipeMatching.Caption = "绠¢亾"; - barBtnPipeMatching.Id = 16; - barBtnPipeMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPipeMatching.ImageOptions.SvgImage"); - barBtnPipeMatching.Name = "barBtnPipeMatching"; - // - // barBtn - // - barBtn.Caption = "寮ご"; - barBtn.Id = 17; - barBtn.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtn.ImageOptions.SvgImage"); - barBtn.Name = "barBtn"; + barBtnMatchingList.Caption = "鑷姩鍖归厤"; + barBtnMatchingList.Id = 10; + barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage"); + barBtnMatchingList.Name = "barBtnMatchingList"; + barBtnMatchingList.ItemClick += barBtnMatching_ItemClick; // // barBtnUnMatchingList // @@ -201,6 +184,77 @@ barBtnUnMatchingList.Name = "barBtnUnMatchingList"; barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick; // + // barBtnSetList + // + barBtnSetList.Caption = "鎵归噺閰嶇疆"; + barBtnSetList.Id = 21; + barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage"); + barBtnSetList.Name = "barBtnSetList"; + barBtnSetList.ItemClick += barBtnSetList_ItemClick; + // + // barBtnSetPumpList + // + barBtnSetPumpList.Caption = "姘存车"; + barBtnSetPumpList.CloseRadialMenuOnItemClick = true; + barBtnSetPumpList.Id = 22; + barBtnSetPumpList.Name = "barBtnSetPumpList"; + // + // barBtnSetValveList + // + barBtnSetValveList.Caption = "闃�闂�"; + barBtnSetValveList.CloseRadialMenuOnItemClick = true; + barBtnSetValveList.Id = 23; + barBtnSetValveList.Name = "barBtnSetValveList"; + // + // barBtnSetPipeList + // + barBtnSetPipeList.Caption = "绠¢亾"; + barBtnSetPipeList.CloseRadialMenuOnItemClick = true; + barBtnSetPipeList.Id = 24; + barBtnSetPipeList.Name = "barBtnSetPipeList"; + // + // barBtnSetElbowsList + // + barBtnSetElbowsList.Caption = "寮ご"; + barBtnSetElbowsList.CloseRadialMenuOnItemClick = true; + barBtnSetElbowsList.Id = 25; + barBtnSetElbowsList.Name = "barBtnSetElbowsList"; + // + // barBtnSetThreelinkList + // + barBtnSetThreelinkList.Caption = "涓夐��"; + barBtnSetThreelinkList.CloseRadialMenuOnItemClick = true; + barBtnSetThreelinkList.Id = 26; + barBtnSetThreelinkList.Name = "barBtnSetThreelinkList"; + // + // barBtnFourlinkList + // + barBtnFourlinkList.Caption = "鍥涢��"; + barBtnFourlinkList.CloseRadialMenuOnItemClick = true; + barBtnFourlinkList.Id = 27; + barBtnFourlinkList.Name = "barBtnFourlinkList"; + // + // barBtnSetTranslationList + // + barBtnSetTranslationList.Caption = "杩囨浮浠�"; + barBtnSetTranslationList.CloseRadialMenuOnItemClick = true; + barBtnSetTranslationList.Id = 28; + barBtnSetTranslationList.Name = "barBtnSetTranslationList"; + // + // barBtnSetExchangerList + // + barBtnSetExchangerList.Caption = "鎹㈢儹鍣�"; + barBtnSetExchangerList.CloseRadialMenuOnItemClick = true; + barBtnSetExchangerList.Id = 29; + barBtnSetExchangerList.Name = "barBtnSetExchangerList"; + // + // barBtnSetJunctionList + // + barBtnSetJunctionList.Caption = "杩炴帴鑺傜偣"; + barBtnSetJunctionList.CloseRadialMenuOnItemClick = true; + barBtnSetJunctionList.Id = 30; + barBtnSetJunctionList.Name = "barBtnSetJunctionList"; + // // ribbonPage1 // ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 }); @@ -209,10 +263,10 @@ // // ribbonPageGroup1 // - ribbonPageGroup1.ItemLinks.Add(barBtnMatching); + ribbonPageGroup1.ItemLinks.Add(barBtnMatchingList); ribbonPageGroup1.ItemLinks.Add(barBtnUnMatchingList); - ribbonPageGroup1.ItemLinks.Add(barBtnSingleMatching); ribbonPageGroup1.ItemLinks.Add(barBtnShowHide); + ribbonPageGroup1.ItemLinks.Add(barBtnSetList); ribbonPageGroup1.Name = "ribbonPageGroup1"; ribbonPageGroup1.Text = "妯″瀷"; // @@ -242,37 +296,66 @@ tabPane1.Controls.Add(pageQ3d); tabPane1.Controls.Add(tabPageL3d); tabPane1.Dock = DockStyle.Fill; - tabPane1.Location = new Point(0, 101); + tabPane1.Location = new Point(0, 128); tabPane1.Name = "tabPane1"; tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { pageBimface, pageQ3d, tabPageL3d }); - tabPane1.RegularSize = new Size(886, 245); + tabPane1.RegularSize = new Size(886, 182); tabPane1.SelectedPage = pageBimface; - tabPane1.Size = new Size(886, 245); + tabPane1.Size = new Size(886, 182); tabPane1.TabIndex = 1; tabPane1.Text = "tabPane1"; // // pageBimface // pageBimface.Caption = "涓夌淮妯″瀷"; + pageBimface.Controls.Add(xhsProjectSimulationBimfaceCtrl1); pageBimface.Name = "pageBimface"; - pageBimface.Size = new Size(886, 212); + pageBimface.Size = new Size(886, 149); + // + // xhsProjectSimulationBimfaceCtrl1 + // + xhsProjectSimulationBimfaceCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationBimfaceCtrl1.Location = new Point(0, 0); + xhsProjectSimulationBimfaceCtrl1.Name = "xhsProjectSimulationBimfaceCtrl1"; + xhsProjectSimulationBimfaceCtrl1.Size = new Size(886, 149); + xhsProjectSimulationBimfaceCtrl1.TabIndex = 0; + xhsProjectSimulationBimfaceCtrl1.HydroClickEvent += xhsProjectSimulationBimfaceCtrl1_HydroClickEvent; + xhsProjectSimulationBimfaceCtrl1.LoadCompletedEvent += xhsProjectSimulationBimfaceCtrl1_LoadCompletedEvent; // // pageQ3d // pageQ3d.Caption = "姘村姏妯″瀷"; + pageQ3d.Controls.Add(xhsProjectSimulationQ3dCtrl1); pageQ3d.Name = "pageQ3d"; pageQ3d.Size = new Size(886, 185); + // + // xhsProjectSimulationQ3dCtrl1 + // + xhsProjectSimulationQ3dCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationQ3dCtrl1.Location = new Point(0, 0); + xhsProjectSimulationQ3dCtrl1.Name = "xhsProjectSimulationQ3dCtrl1"; + xhsProjectSimulationQ3dCtrl1.Size = new Size(886, 185); + xhsProjectSimulationQ3dCtrl1.TabIndex = 0; // // tabPageL3d // tabPageL3d.Caption = "L3d"; + tabPageL3d.Controls.Add(xhsProjectSimulationL3dCtrl1); tabPageL3d.Name = "tabPageL3d"; tabPageL3d.Size = new Size(886, 185); + // + // xhsProjectSimulationL3dCtrl1 + // + xhsProjectSimulationL3dCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationL3dCtrl1.Location = new Point(0, 0); + xhsProjectSimulationL3dCtrl1.Name = "xhsProjectSimulationL3dCtrl1"; + xhsProjectSimulationL3dCtrl1.Size = new Size(886, 185); + xhsProjectSimulationL3dCtrl1.TabIndex = 0; // // dockManager1 // dockManager1.Form = this; - dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlMatchingList, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList }); + dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlProperty, docPnlHydroParterList, docPnlHydroCalcu, docPnlHydroCheck, docPnlUnMatchingList, docPnlMatchingList }); dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" }); // // docPnlProperty @@ -280,38 +363,27 @@ docPnlProperty.Controls.Add(dockPanel1_Container); docPnlProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; docPnlProperty.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18"); - docPnlProperty.Location = new Point(886, 101); + docPnlProperty.Location = new Point(886, 128); docPnlProperty.Name = "docPnlProperty"; docPnlProperty.OriginalSize = new Size(275, 200); - docPnlProperty.Size = new Size(275, 638); + docPnlProperty.Size = new Size(275, 611); docPnlProperty.Text = "灞炴��"; // // dockPanel1_Container // + dockPanel1_Container.Controls.Add(xhsProjectSimulationPropertyCtrl1); dockPanel1_Container.Location = new Point(4, 26); dockPanel1_Container.Name = "dockPanel1_Container"; - dockPanel1_Container.Size = new Size(268, 609); + dockPanel1_Container.Size = new Size(268, 582); dockPanel1_Container.TabIndex = 0; // - // docPnlMatchingList + // xhsProjectSimulationPropertyCtrl1 // - docPnlMatchingList.Controls.Add(controlContainer5); - docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; - docPnlMatchingList.FloatVertical = true; - docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a"); - docPnlMatchingList.Location = new Point(0, 597); - docPnlMatchingList.Name = "docPnlMatchingList"; - docPnlMatchingList.OriginalSize = new Size(200, 59); - docPnlMatchingList.Size = new Size(886, 59); - docPnlMatchingList.Text = "鍖归厤鍒楄〃"; - // - // controlContainer5 - // - controlContainer5.Controls.Add(xhsProjectSimulationMatchingListCtrl1); - controlContainer5.Location = new Point(3, 27); - controlContainer5.Name = "controlContainer5"; - controlContainer5.Size = new Size(880, 29); - controlContainer5.TabIndex = 0; + xhsProjectSimulationPropertyCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationPropertyCtrl1.Location = new Point(0, 0); + xhsProjectSimulationPropertyCtrl1.Name = "xhsProjectSimulationPropertyCtrl1"; + xhsProjectSimulationPropertyCtrl1.Size = new Size(268, 582); + xhsProjectSimulationPropertyCtrl1.TabIndex = 0; // // docPnlHydroParterList // @@ -319,7 +391,7 @@ docPnlHydroParterList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; docPnlHydroParterList.FloatVertical = true; docPnlHydroParterList.ID = new Guid("facc1bde-3cf7-455c-b59c-8377daa6b90e"); - docPnlHydroParterList.Location = new Point(0, 518); + docPnlHydroParterList.Location = new Point(0, 660); docPnlHydroParterList.Name = "docPnlHydroParterList"; docPnlHydroParterList.OriginalSize = new Size(200, 79); docPnlHydroParterList.Size = new Size(886, 79); @@ -349,7 +421,7 @@ docPnlHydroCalcu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; docPnlHydroCalcu.FloatVertical = true; docPnlHydroCalcu.ID = new Guid("ac7055c0-e9fe-40c2-bf51-83dde5710cd4"); - docPnlHydroCalcu.Location = new Point(0, 434); + docPnlHydroCalcu.Location = new Point(0, 576); docPnlHydroCalcu.Name = "docPnlHydroCalcu"; docPnlHydroCalcu.OriginalSize = new Size(200, 84); docPnlHydroCalcu.Size = new Size(886, 84); @@ -357,17 +429,27 @@ // // controlContainer2 // + controlContainer2.Controls.Add(xhsProjectSimulationHydroCalcuFailedCtrl1); controlContainer2.Location = new Point(3, 27); controlContainer2.Name = "controlContainer2"; controlContainer2.Size = new Size(880, 54); controlContainer2.TabIndex = 0; // + // xhsProjectSimulationHydroCalcuFailedCtrl1 + // + xhsProjectSimulationHydroCalcuFailedCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationHydroCalcuFailedCtrl1.Location = new Point(0, 0); + xhsProjectSimulationHydroCalcuFailedCtrl1.Name = "xhsProjectSimulationHydroCalcuFailedCtrl1"; + xhsProjectSimulationHydroCalcuFailedCtrl1.Size = new Size(880, 54); + xhsProjectSimulationHydroCalcuFailedCtrl1.TabIndex = 0; + // // docPnlHydroCheck // docPnlHydroCheck.Controls.Add(controlContainer1); docPnlHydroCheck.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; + docPnlHydroCheck.FloatVertical = true; docPnlHydroCheck.ID = new Guid("dee18895-8b3d-44cd-9001-28bee516095d"); - docPnlHydroCheck.Location = new Point(0, 346); + docPnlHydroCheck.Location = new Point(0, 488); docPnlHydroCheck.Name = "docPnlHydroCheck"; docPnlHydroCheck.OriginalSize = new Size(200, 88); docPnlHydroCheck.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; @@ -377,17 +459,27 @@ // // controlContainer1 // + controlContainer1.Controls.Add(xhsProjectSimulationHydroCheckFailedCtrl1); controlContainer1.Location = new Point(3, 27); controlContainer1.Name = "controlContainer1"; controlContainer1.Size = new Size(880, 58); controlContainer1.TabIndex = 0; // + // xhsProjectSimulationHydroCheckFailedCtrl1 + // + xhsProjectSimulationHydroCheckFailedCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationHydroCheckFailedCtrl1.Location = new Point(0, 0); + xhsProjectSimulationHydroCheckFailedCtrl1.Name = "xhsProjectSimulationHydroCheckFailedCtrl1"; + xhsProjectSimulationHydroCheckFailedCtrl1.Size = new Size(880, 58); + xhsProjectSimulationHydroCheckFailedCtrl1.TabIndex = 0; + // // docPnlUnMatchingList // docPnlUnMatchingList.Controls.Add(controlContainer4); docPnlUnMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; + docPnlUnMatchingList.FloatVertical = true; docPnlUnMatchingList.ID = new Guid("fdc5c4e2-7bd3-4114-90a6-3cd0ed365103"); - docPnlUnMatchingList.Location = new Point(0, 346); + docPnlUnMatchingList.Location = new Point(0, 405); docPnlUnMatchingList.Name = "docPnlUnMatchingList"; docPnlUnMatchingList.OriginalSize = new Size(200, 83); docPnlUnMatchingList.Size = new Size(886, 83); @@ -395,28 +487,71 @@ // // controlContainer4 // + controlContainer4.Controls.Add(xhsProjectSimulationUnMatchingListCtrl1); controlContainer4.Location = new Point(3, 27); controlContainer4.Name = "controlContainer4"; controlContainer4.Size = new Size(880, 53); controlContainer4.TabIndex = 0; // - // svgImg32 + // xhsProjectSimulationUnMatchingListCtrl1 // - svgImg32.ImageSize = new Size(32, 32); - svgImg32.Add("calculatesheet", "image://svgimages/spreadsheet/calculatesheet.svg"); + xhsProjectSimulationUnMatchingListCtrl1.Dock = DockStyle.Fill; + xhsProjectSimulationUnMatchingListCtrl1.HidePageWhenListIsNull = true; + xhsProjectSimulationUnMatchingListCtrl1.Location = new Point(0, 0); + xhsProjectSimulationUnMatchingListCtrl1.Name = "xhsProjectSimulationUnMatchingListCtrl1"; + xhsProjectSimulationUnMatchingListCtrl1.Size = new Size(880, 53); + xhsProjectSimulationUnMatchingListCtrl1.TabIndex = 0; + xhsProjectSimulationUnMatchingListCtrl1.HydroClickEvent += xhsProjectSimulationUnMatchingListCtrl1_HydroClickEvent; + xhsProjectSimulationUnMatchingListCtrl1.ViewModelEvent += xhsProjectSimulationUnMatchingListCtrl1_ViewModelEvent; // - // radialMenu1 + // docPnlMatchingList // - radialMenu1.Name = "radialMenu1"; - radialMenu1.Ribbon = ribbonControl1; + docPnlMatchingList.Controls.Add(controlContainer5); + docPnlMatchingList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom; + docPnlMatchingList.FloatVertical = true; + docPnlMatchingList.ID = new Guid("19fbbff8-5202-46bc-b9f4-472249e3c49a"); + docPnlMatchingList.Location = new Point(0, 310); + docPnlMatchingList.Name = "docPnlMatchingList"; + docPnlMatchingList.OriginalSize = new Size(200, 95); + docPnlMatchingList.Size = new Size(886, 95); + docPnlMatchingList.Text = "鍖归厤鍒楄〃"; + // + // controlContainer5 + // + controlContainer5.Controls.Add(xhsProjectSimulationMatchingListCtrl1); + controlContainer5.Location = new Point(3, 27); + controlContainer5.Name = "controlContainer5"; + controlContainer5.Size = new Size(880, 65); + controlContainer5.TabIndex = 0; // // xhsProjectSimulationMatchingListCtrl1 // xhsProjectSimulationMatchingListCtrl1.Dock = DockStyle.Fill; xhsProjectSimulationMatchingListCtrl1.Location = new Point(0, 0); xhsProjectSimulationMatchingListCtrl1.Name = "xhsProjectSimulationMatchingListCtrl1"; - xhsProjectSimulationMatchingListCtrl1.Size = new Size(880, 29); + xhsProjectSimulationMatchingListCtrl1.Size = new Size(880, 65); xhsProjectSimulationMatchingListCtrl1.TabIndex = 0; + // + // svgImg32 + // + svgImg32.ImageSize = new Size(32, 32); + svgImg32.Add("calculatesheet", "image://svgimages/spreadsheet/calculatesheet.svg"); + // + // rmSet + // + rmSet.AllowGlyphSkinning = true; + rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph"); + rmSet.ItemLinks.Add(barBtnSetPumpList); + rmSet.ItemLinks.Add(barBtnSetValveList); + rmSet.ItemLinks.Add(barBtnSetPipeList); + rmSet.ItemLinks.Add(barBtnSetElbowsList); + rmSet.ItemLinks.Add(barBtnSetThreelinkList); + rmSet.ItemLinks.Add(barBtnFourlinkList); + rmSet.ItemLinks.Add(barBtnSetTranslationList); + rmSet.ItemLinks.Add(barBtnSetExchangerList); + rmSet.ItemLinks.Add(barBtnSetJunctionList); + rmSet.Name = "rmSet"; + rmSet.Ribbon = ribbonControl1; // // XhsProjectSimulationCorePage // @@ -425,12 +560,12 @@ AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(tabPane1); + Controls.Add(docPnlMatchingList); + Controls.Add(docPnlUnMatchingList); Controls.Add(docPnlHydroCheck); Controls.Add(docPnlHydroCalcu); Controls.Add(docPnlHydroParterList); - Controls.Add(docPnlMatchingList); Controls.Add(docPnlProperty); - Controls.Add(docPnlUnMatchingList); Controls.Add(ribbonControl1); Margin = new Padding(2); Name = "XhsProjectSimulationCorePage"; @@ -438,17 +573,24 @@ ((ISupportInitialize)ribbonControl1).EndInit(); ((ISupportInitialize)tabPane1).EndInit(); tabPane1.ResumeLayout(false); + pageBimface.ResumeLayout(false); + pageQ3d.ResumeLayout(false); + tabPageL3d.ResumeLayout(false); ((ISupportInitialize)dockManager1).EndInit(); docPnlProperty.ResumeLayout(false); - docPnlMatchingList.ResumeLayout(false); - controlContainer5.ResumeLayout(false); + dockPanel1_Container.ResumeLayout(false); docPnlHydroParterList.ResumeLayout(false); controlContainer3.ResumeLayout(false); docPnlHydroCalcu.ResumeLayout(false); + controlContainer2.ResumeLayout(false); docPnlHydroCheck.ResumeLayout(false); + controlContainer1.ResumeLayout(false); docPnlUnMatchingList.ResumeLayout(false); + controlContainer4.ResumeLayout(false); + docPnlMatchingList.ResumeLayout(false); + controlContainer5.ResumeLayout(false); ((ISupportInitialize)svgImg32).EndInit(); - ((ISupportInitialize)radialMenu1).EndInit(); + ((ISupportInitialize)rmSet).EndInit(); ResumeLayout(false); PerformLayout(); } @@ -467,12 +609,7 @@ private DevExpress.XtraBars.BarButtonItem barBtnShowHide; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4; private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3; - private DevExpress.XtraBars.BarButtonItem barBtnMatching; - private DevExpress.XtraBars.BarSubItem barBtnSingleMatching; - private DevExpress.XtraBars.BarButtonItem barBtnPumpMatching; - private DevExpress.XtraBars.BarButtonItem barBtnValveMatching; - private DevExpress.XtraBars.BarButtonItem barBtnPipeMatching; - private DevExpress.XtraBars.BarButtonItem barBtn; + private DevExpress.XtraBars.BarButtonItem barBtnMatchingList; private DevExpress.XtraBars.Navigation.TabPane tabPane1; private DevExpress.XtraBars.Navigation.TabNavigationPage pageBimface; private DevExpress.XtraBars.Navigation.TabNavigationPage pageQ3d; @@ -498,9 +635,19 @@ private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageL3d; private DevExpress.XtraBars.Docking.DockPanel docPnlMatchingList; private DevExpress.XtraBars.Docking.ControlContainer controlContainer5; - private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1; + private XhsProjectSimulationUnMatchingListCtrl xhsProjectSimulationUnMatchingListCtrl1; private XhsProjectSimulationL3dCtrl xhsProjectSimulationL3dCtrl1; - private DevExpress.XtraBars.Ribbon.RadialMenu radialMenu1; + private DevExpress.XtraBars.Ribbon.RadialMenu rmSet; private Xhs.XhsProjectSimulationMatchingListCtrl xhsProjectSimulationMatchingListCtrl1; + private DevExpress.XtraBars.BarButtonItem barBtnSetList; + private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList; + private DevExpress.XtraBars.BarButtonItem barBtnSetValveList; + private DevExpress.XtraBars.BarButtonItem barBtnSetPipeList; + private DevExpress.XtraBars.BarButtonItem barBtnSetElbowsList; + private DevExpress.XtraBars.BarButtonItem barBtnSetThreelinkList; + private DevExpress.XtraBars.BarButtonItem barBtnFourlinkList; + private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList; + private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList; + private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList; } } -- Gitblit v1.9.3