From c0be7c001375f73e2c3b49a1b1d447b6fc297bdd Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 21 三月 2025 13:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/00-core/ModelEditPage.Designer.cs | 154 +++++++++++++++++++++++++--------------------------
1 files changed, 76 insertions(+), 78 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/ModelEditPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/00-core/ModelEditPage.Designer.cs
similarity index 86%
rename from WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/ModelEditPage.Designer.cs
rename to WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/00-core/ModelEditPage.Designer.cs
index 775bc2a..098b949 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/ModelEditPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/04-model-edit/00-core/ModelEditPage.Designer.cs
@@ -38,9 +38,6 @@
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(ModelEditPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
- barBtnAddModelTemplate = new DevExpress.XtraBars.BarButtonItem();
- barBtnEditModelTemplate = new DevExpress.XtraBars.BarButtonItem();
- barBtnDeleteModelTemplate = new DevExpress.XtraBars.BarButtonItem();
barBtnAddBaseMap = new DevExpress.XtraBars.BarButtonItem();
barBtnSetBaseMap = new DevExpress.XtraBars.BarButtonItem();
barCekBaseMapVisible = new DevExpress.XtraBars.BarCheckItem();
@@ -53,6 +50,11 @@
barBtnFrontView = new DevExpress.XtraBars.BarButtonItem();
barBtnImportInp = new DevExpress.XtraBars.BarButtonItem();
barBtnSaveModelTemplate = new DevExpress.XtraBars.BarButtonItem();
+ barBtnModelTemplate = new DevExpress.XtraBars.BarButtonItem();
+ barBtnConnectivityCheck = new DevExpress.XtraBars.BarButtonItem();
+ barBtnVerticalPipeDiameter = new DevExpress.XtraBars.BarButtonItem();
+ barBtnHorizontalPipeDiameter = new DevExpress.XtraBars.BarButtonItem();
+ barBtnElevationTranslation = new DevExpress.XtraBars.BarButtonItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -81,10 +83,8 @@
toolTipController1 = new ToolTipController(components);
panelControl1 = new PanelControl();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanelModelTemplate = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
- modelTemplateTreeListCtrl1 = new ModelTemplateTreeListCtrl();
dockPanelModelProperty = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
dockPanel3 = new DevExpress.XtraBars.Docking.DockPanel();
@@ -92,9 +92,7 @@
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
((ISupportInitialize)dockManager1).BeginInit();
- dockPanel2.SuspendLayout();
dockPanelModelTemplate.SuspendLayout();
- dockPanel1_Container.SuspendLayout();
dockPanelModelProperty.SuspendLayout();
SuspendLayout();
//
@@ -103,10 +101,10 @@
ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAddModelTemplate, barBtnEditModelTemplate, barBtnDeleteModelTemplate, barBtnAddBaseMap, barBtnSetBaseMap, barCekBaseMapVisible, barBtnClearBaseMap, barBtnFullView, barBtnDefaultView, barBtnResetView, barBtnTopView, barBtnSaveView, barBtnFrontView, barBtnImportInp, barBtnSaveModelTemplate });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAddBaseMap, barBtnSetBaseMap, barCekBaseMapVisible, barBtnClearBaseMap, barBtnFullView, barBtnDefaultView, barBtnResetView, barBtnTopView, barBtnSaveView, barBtnFrontView, barBtnImportInp, barBtnSaveModelTemplate, barBtnModelTemplate, barBtnConnectivityCheck, barBtnVerticalPipeDiameter, barBtnHorizontalPipeDiameter, barBtnElevationTranslation });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.Margin = new Padding(3, 4, 3, 4);
- ribbonControl1.MaxItemId = 56;
+ ribbonControl1.MaxItemId = 61;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
@@ -115,30 +113,6 @@
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
ribbonControl1.Size = new Size(1007, 157);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
- //
- // barBtnAddModelTemplate
- //
- barBtnAddModelTemplate.Caption = "娣诲姞";
- barBtnAddModelTemplate.Id = 40;
- barBtnAddModelTemplate.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAddModelTemplate.ImageOptions.SvgImage");
- barBtnAddModelTemplate.Name = "barBtnAddModelTemplate";
- barBtnAddModelTemplate.ItemClick += barBtnAddModelTemplate_ItemClick;
- //
- // barBtnEditModelTemplate
- //
- barBtnEditModelTemplate.Caption = "缂栬緫";
- barBtnEditModelTemplate.Id = 41;
- barBtnEditModelTemplate.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEditModelTemplate.ImageOptions.SvgImage");
- barBtnEditModelTemplate.Name = "barBtnEditModelTemplate";
- barBtnEditModelTemplate.ItemClick += barBtnEditModelTemplate_ItemClick;
- //
- // barBtnDeleteModelTemplate
- //
- barBtnDeleteModelTemplate.Caption = "鍒犻櫎";
- barBtnDeleteModelTemplate.Id = 42;
- barBtnDeleteModelTemplate.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDeleteModelTemplate.ImageOptions.SvgImage");
- barBtnDeleteModelTemplate.Name = "barBtnDeleteModelTemplate";
- barBtnDeleteModelTemplate.ItemClick += barBtnDeleteModelTemplate_ItemClick;
//
// barBtnAddBaseMap
//
@@ -238,6 +212,46 @@
barBtnSaveModelTemplate.Name = "barBtnSaveModelTemplate";
barBtnSaveModelTemplate.ItemClick += barBtnSaveModelTemplate_ItemClick;
//
+ // barBtnModelTemplate
+ //
+ barBtnModelTemplate.Caption = "妯″瀷妯℃澘";
+ barBtnModelTemplate.Id = 56;
+ barBtnModelTemplate.ImageOptions.SvgImage = Properties.Resources.connector;
+ barBtnModelTemplate.Name = "barBtnModelTemplate";
+ barBtnModelTemplate.ItemClick += barBtnModelTemplate_ItemClick;
+ //
+ // barBtnConnectivityCheck
+ //
+ barBtnConnectivityCheck.Caption = "鑱旈�氭�ф鏌�";
+ barBtnConnectivityCheck.Id = 57;
+ barBtnConnectivityCheck.ImageOptions.SvgImage = Properties.Resources.actions_checkcircled;
+ barBtnConnectivityCheck.Name = "barBtnConnectivityCheck";
+ barBtnConnectivityCheck.ItemClick += barBtnConnectivityCheck_ItemClick;
+ //
+ // barBtnVerticalPipeDiameter
+ //
+ barBtnVerticalPipeDiameter.Caption = "绔嬬鍙ｅ緞";
+ barBtnVerticalPipeDiameter.Id = 58;
+ barBtnVerticalPipeDiameter.ImageOptions.SvgImage = Properties.Resources.flipimage_horizontal;
+ barBtnVerticalPipeDiameter.Name = "barBtnVerticalPipeDiameter";
+ barBtnVerticalPipeDiameter.ItemClick += barBtnVerticalPipeDiameter_ItemClick;
+ //
+ // barBtnHorizontalPipeDiameter
+ //
+ barBtnHorizontalPipeDiameter.Caption = "妯鍙ｅ緞";
+ barBtnHorizontalPipeDiameter.Id = 59;
+ barBtnHorizontalPipeDiameter.ImageOptions.SvgImage = Properties.Resources.flipimage_vertical;
+ barBtnHorizontalPipeDiameter.Name = "barBtnHorizontalPipeDiameter";
+ barBtnHorizontalPipeDiameter.ItemClick += barBtnHorizontalPipeDiameter_ItemClick;
+ //
+ // barBtnElevationTranslation
+ //
+ barBtnElevationTranslation.Caption = "鏍囬珮骞崇Щ";
+ barBtnElevationTranslation.Id = 60;
+ barBtnElevationTranslation.ImageOptions.SvgImage = Properties.Resources.tableproperties;
+ barBtnElevationTranslation.Name = "barBtnElevationTranslation";
+ barBtnElevationTranslation.ItemClick += barBtnElevationTranslation_ItemClick;
+ //
// ribbonPage
//
ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3, ribbonPageGroup4 });
@@ -246,11 +260,13 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barBtnAddModelTemplate, true);
- ribbonPageGroup1.ItemLinks.Add(barBtnEditModelTemplate);
- ribbonPageGroup1.ItemLinks.Add(barBtnDeleteModelTemplate);
+ ribbonPageGroup1.ItemLinks.Add(barBtnModelTemplate);
+ ribbonPageGroup1.ItemLinks.Add(barBtnConnectivityCheck, true);
+ ribbonPageGroup1.ItemLinks.Add(barBtnVerticalPipeDiameter);
+ ribbonPageGroup1.ItemLinks.Add(barBtnHorizontalPipeDiameter);
+ ribbonPageGroup1.ItemLinks.Add(barBtnElevationTranslation);
ribbonPageGroup1.Name = "ribbonPageGroup1";
- ribbonPageGroup1.Text = "妯″瀷妯℃澘";
+ ribbonPageGroup1.Text = "蹇�熷缓妯�";
//
// ribbonPageGroup2
//
@@ -269,6 +285,7 @@
ribbonPageGroup3.ItemLinks.Add(barBtnFrontView);
ribbonPageGroup3.ItemLinks.Add(barBtnResetView, true);
ribbonPageGroup3.ItemLinks.Add(barBtnSaveView);
+ ribbonPageGroup3.ItemsLayout = DevExpress.XtraBars.Ribbon.RibbonPageGroupItemsLayout.TwoRows;
ribbonPageGroup3.Name = "ribbonPageGroup3";
ribbonPageGroup3.Text = "瑙嗗浘";
//
@@ -472,21 +489,10 @@
//
dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
- dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel2 });
+ dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanelModelTemplate });
+ dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanelModelProperty });
dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
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" });
- //
- // dockPanel2
- //
- dockPanel2.Controls.Add(dockPanelModelTemplate);
- dockPanel2.Controls.Add(dockPanelModelProperty);
- dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
- dockPanel2.ID = new Guid("00b0d59d-81f4-40c6-b0bf-a2b1c596b96d");
- dockPanel2.Location = new Point(807, 157);
- dockPanel2.Name = "dockPanel2";
- dockPanel2.OriginalSize = new Size(200, 200);
- dockPanel2.Size = new Size(200, 719);
- dockPanel2.Text = "panelContainer1";
//
// dockPanelModelTemplate
//
@@ -497,45 +503,39 @@
dockPanelModelTemplate.Name = "dockPanelModelTemplate";
dockPanelModelTemplate.OriginalSize = new Size(200, 248);
dockPanelModelTemplate.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
- dockPanelModelTemplate.SavedIndex = 1;
- dockPanelModelTemplate.SavedSizeFactor = 1.00139D;
- dockPanelModelTemplate.SavedTabbed = true;
+ dockPanelModelTemplate.SavedIndex = 0;
+ dockPanelModelTemplate.SavedParent = dockPanelModelProperty;
+ dockPanelModelTemplate.SavedSizeFactor = 1.00209D;
dockPanelModelTemplate.Size = new Size(200, 360);
dockPanelModelTemplate.Text = "妯″瀷妯℃澘";
+ dockPanelModelTemplate.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
//
// dockPanel1_Container
//
- dockPanel1_Container.Controls.Add(modelTemplateTreeListCtrl1);
dockPanel1_Container.Location = new Point(1, 28);
dockPanel1_Container.Name = "dockPanel1_Container";
dockPanel1_Container.Size = new Size(199, 332);
dockPanel1_Container.TabIndex = 0;
//
- // modelTemplateTreeListCtrl1
- //
- modelTemplateTreeListCtrl1.Dock = DockStyle.Fill;
- modelTemplateTreeListCtrl1.Location = new Point(0, 0);
- modelTemplateTreeListCtrl1.Margin = new Padding(3, 4, 3, 4);
- modelTemplateTreeListCtrl1.Name = "modelTemplateTreeListCtrl1";
- modelTemplateTreeListCtrl1.Size = new Size(199, 332);
- modelTemplateTreeListCtrl1.TabIndex = 0;
- //
// dockPanelModelProperty
//
dockPanelModelProperty.Controls.Add(dockPanel2_Container);
- dockPanelModelProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+ dockPanelModelProperty.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
dockPanelModelProperty.ID = new Guid("af41a874-3629-4a50-927c-2b2441ca77bf");
- dockPanelModelProperty.Location = new Point(0, 360);
+ dockPanelModelProperty.Location = new Point(807, 157);
dockPanelModelProperty.Name = "dockPanelModelProperty";
- dockPanelModelProperty.OriginalSize = new Size(200, 248);
- dockPanelModelProperty.Size = new Size(200, 359);
+ dockPanelModelProperty.OriginalSize = new Size(200, 200);
+ dockPanelModelProperty.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+ dockPanelModelProperty.SavedIndex = 0;
+ dockPanelModelProperty.SavedSizeFactor = 0.9993D;
+ dockPanelModelProperty.Size = new Size(200, 719);
dockPanelModelProperty.Text = "妯″瀷灞炴��";
//
// dockPanel2_Container
//
- dockPanel2_Container.Location = new Point(1, 29);
+ dockPanel2_Container.Location = new Point(1, 28);
dockPanel2_Container.Name = "dockPanel2_Container";
- dockPanel2_Container.Size = new Size(199, 330);
+ dockPanel2_Container.Size = new Size(199, 691);
dockPanel2_Container.TabIndex = 0;
//
// dockPanel3
@@ -567,7 +567,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(panelControl1);
Controls.Add(toolboxControlDraw);
- Controls.Add(dockPanel2);
+ Controls.Add(dockPanelModelProperty);
Controls.Add(ribbonControl1);
Margin = new Padding(3, 5, 3, 5);
Name = "ModelEditPage";
@@ -575,9 +575,7 @@
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)panelControl1).EndInit();
((ISupportInitialize)dockManager1).EndInit();
- dockPanel2.ResumeLayout(false);
dockPanelModelTemplate.ResumeLayout(false);
- dockPanel1_Container.ResumeLayout(false);
dockPanelModelProperty.ResumeLayout(false);
ResumeLayout(false);
PerformLayout();
@@ -586,7 +584,6 @@
#endregion
private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage;
- private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
private DevExpress.XtraToolbox.ToolboxControl toolboxControlDraw;
private DevExpress.XtraToolbox.ToolboxGroup toolboxGroupOperate;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemSelect;
@@ -598,9 +595,6 @@
private DevExpress.XtraToolbox.ToolboxItem toolboxItemAddWaterMeter;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemAddTank;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemAddReservoir;
- private DevExpress.XtraBars.BarButtonItem barBtnAddModelTemplate;
- private DevExpress.XtraBars.BarButtonItem barBtnEditModelTemplate;
- private DevExpress.XtraBars.BarButtonItem barBtnDeleteModelTemplate;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemCopy;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemDelete;
private DevExpress.XtraToolbox.ToolboxItem toolboxItemPaste;
@@ -631,10 +625,14 @@
private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
private DevExpress.XtraBars.Docking.DockPanel dockPanelModelProperty;
private DevExpress.XtraBars.Docking.ControlContainer dockPanel2_Container;
- private ModelTemplateTreeListCtrl modelTemplateTreeListCtrl1;
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
private ToolTipController toolTipController1;
private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
- private DevExpress.XtraBars.Docking.DockPanel dockPanel2;
+ private DevExpress.XtraBars.BarButtonItem barBtnModelTemplate;
+ private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
+ private DevExpress.XtraBars.BarButtonItem barBtnConnectivityCheck;
+ private DevExpress.XtraBars.BarButtonItem barBtnVerticalPipeDiameter;
+ private DevExpress.XtraBars.BarButtonItem barBtnHorizontalPipeDiameter;
+ private DevExpress.XtraBars.BarButtonItem barBtnElevationTranslation;
}
}
--
Gitblit v1.9.3