From b4c867bf85d3edef5d084a3a26f13cbc6784bf58 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 16 十二月 2024 13:37:21 +0800
Subject: [PATCH] 提交
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
index 05e3ddc..0c27047 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
@@ -9,6 +9,7 @@
using DPumpHydr.WinFrmUI.RLT.Native;
using DPumpHydr.WinFrmUI.RLT.Docking.Crown;
using DPumpHydr.WinFrmUI.Volute.TempCtrl;
+using static DPumpHydr.WinFrmUI.RLT.Helper.CrownHelper;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -17,6 +18,7 @@
ParasInfoDockPanel _parasDockPanel = null;
LogListDockPanel _logListDockPanel = null;
LayersDockPanel _layersDockPanel = null;
+ SectAreaDockPanel _sectAreaDockPanel = null;
public MainViewPage()
{
InitializeComponent();
@@ -34,10 +36,11 @@
-
-
-
-
+ ThemeProvider.Theme.Colors.HeaderBackground = Color.SteelBlue;
+ ThemeProvider.Theme.Colors.GreyBackground = Color.White;
+ //ThemeProvider.Theme.Colors.DarkBackground = Color.White;
+ MainDockPanel.RightDockWidth = 320;
+ MainDockPanel.BottomDockHeight = 210;
}
@@ -52,10 +55,24 @@
_logListDockPanel = new LogListDockPanel();
_logListDockPanel.DefaultDockArea = DPumpHydr.WinFrmUI.RLT.Enum.Crown.DockArea.Bottom;
- _parasDockPanel = new ParasInfoDockPanel();
+ _sectAreaDockPanel = new SectAreaDockPanel();
+ _sectAreaDockPanel.DefaultDockArea = DPumpHydr.WinFrmUI.RLT.Enum.Crown.DockArea.Bottom;
+ _sectAreaDockPanel.OnRefreshSingleSectBundle += (bundle , selectedPointIndex) =>
+ {
+
+ this._ctrlSectionBundleInfo.RefreshSectPara(bundle, selectedPointIndex);
+ if(this._stepTreeDockPanel.CurrentStepID > this._stepTreeDockPanel.Step_ID_Section18_Full)
+ {
+ this._ctrlSectionShapeInfo18.RefreshSectPara(bundle.ToSectionShapePara(selectedPointIndex));
+ }
+ };
+
+
+ _parasDockPanel = new ParasInfoDockPanel();
_parasDockPanel.DefaultDockArea = DPumpHydr.WinFrmUI.RLT.Enum.Crown.DockArea.Right;
_layersDockPanel = new LayersDockPanel();
+ _layersDockPanel.InitialInfo();
_layersDockPanel.DefaultDockArea = DPumpHydr.WinFrmUI.RLT.Enum.Crown.DockArea.Left;
_stepTreeDockPanel = new StepTreeDockPanel();
@@ -90,36 +107,26 @@
MainDockPanel.AddContent(_logListDockPanel);
+ MainDockPanel.AddContent(_sectAreaDockPanel);
+
MainDockPanel.AddContent(_parasDockPanel);
MainDockPanel.AddContent(_layersDockPanel);
MainDockPanel.AddContent(_stepTreeDockPanel);
-
+
MainDockPanel.AddContent(_stepTreeDockPanel, _layersDockPanel.DockGroup);
+ MainDockPanel.AddContent(_sectAreaDockPanel, _logListDockPanel.DockGroup);
-
-
-
+ RBtn鍚庨��.Enabled = false;
+ Rbtn鍓嶈繘.Enabled = true;
Rbtn涓嬩竴姝�.Enabled = true;
Rbtn涓婁竴姝�.Enabled = false;
Rbtn瀹屾垚.Enabled = false;
- this._occDesign3dCtrl = new OccDesignCtrlDockPanel();
- this._occDesign3dCtrl.Size = new System.Drawing.Size(1000, 1000);
- this._occDesign3dCtrl.Name = "OccDesignCtrl";
- this._occDesign3dCtrl.Dock = DockStyle.Fill;
- this._occDesign3dCtrl.DockText = "涓夌淮璁捐";
- this._occDesign3dCtrl.Initial(true);
-
- this._occDesign2dCtrl = new OccDesignCtrlDockPanel();
- this._occDesign2dCtrl.Size = new System.Drawing.Size(1000, 1000);
- this._occDesign2dCtrl.Name = "OccDesignCtrl";
- this._occDesign2dCtrl.Dock = DockStyle.Fill;
- this._occDesign2dCtrl.DockText = "浜岀淮瑙嗗浘";
- this._occDesign2dCtrl.Initial(false );
+
+ InitialDesginPanel();
- MainDockPanel.AddContent(_occDesign2dCtrl);
- MainDockPanel.AddContent(_occDesign3dCtrl);
+
InitialStepNodes();
@@ -128,16 +135,16 @@
#region 姝ラ鎿嶄綔
//椤甸潰璺宠浆鍓�
- bool stepTreeListCtrl1_BeforeStepNodeChangedEvent(DPumpHydr.WinFrmUI.Base.TreeStepNode CurrentStepNode,
- DPumpHydr.WinFrmUI.Base.TreeStepNode NextStepNode)
+ bool stepTreeListCtrl1_BeforeStepNodeChangedEvent(DPumpHydr.WinFrmUI.Base.StepTreeNodePara CurrentStepNode,
+ DPumpHydr.WinFrmUI.Base.StepTreeNodePara NextStepNode)
{
return true;
}
//椤甸潰璺宠浆鍚�
- void stepTreeListCtrl1_SelectedStepNodeChangedEvent(DPumpHydr.WinFrmUI.Base.TreeStepNode BeforeStepNode,
- DPumpHydr.WinFrmUI.Base.TreeStepNode CurrentStepNode)
+ void stepTreeListCtrl1_SelectedStepNodeChangedEvent(DPumpHydr.WinFrmUI.Base.StepTreeNodePara BeforeStepNode,
+ DPumpHydr.WinFrmUI.Base.StepTreeNodePara CurrentStepNode)
{
//if (CurrentStepNode.Name == "StepHydParas")
//{
--
Gitblit v1.9.3