From 1ecfbbf8b56f6c18f41cc1eead763c7fa93624ce Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期一, 13 一月 2025 09:26:49 +0800
Subject: [PATCH] 222
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
index 0c27047..012f18a 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage.cs
@@ -9,7 +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;
+//using static DPumpHydr.WinFrmUI.RLT.Helper.CrownHelper;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -19,6 +19,23 @@
LogListDockPanel _logListDockPanel = null;
LayersDockPanel _layersDockPanel = null;
SectAreaDockPanel _sectAreaDockPanel = null;
+
+ //鍙傛暟鎺т欢
+ ctrlHdrBaseInfo _ctrlHdrBaseInfo = null;
+ ctrlSectionBundleInfo _ctrlSectionBundleInfo = null;
+ ctrlSectionShapeInfo18 _ctrlSectionShapeInfo18 = null;
+ ctrlSetOutflowParas _ctrlSetOutflowParas = null;
+ ctrlSetOutflowType _ctrlSetOutflowType = null;
+ ctrlThicknessParas _ctrlThicknessParas = null;
+
+ //鍙傛暟
+ ViewModel.HdrBaseInfo _hdrBaseInfo = null;
+ ViewModel.GeomBaseInfo _geomBaseInfo = null;
+ ViewModel.SectionBundleInfo _sectionBundleInfo = null;
+ ViewModel.OtuflowParas _outflowParas = null;
+ ViewModel.eOutflowStyle _outflowType = ViewModel.eOutflowStyle.鏈煡;
+ private double _bodyThickness = 0;
+
public MainViewPage()
{
InitializeComponent();
@@ -36,10 +53,10 @@
- ThemeProvider.Theme.Colors.HeaderBackground = Color.SteelBlue;
- ThemeProvider.Theme.Colors.GreyBackground = Color.White;
+ DPumpHydr.WinFrmUI.RLT.Helper.CrownHelper.ThemeProvider.Theme.Colors.HeaderBackground = Color.SteelBlue;
+ DPumpHydr.WinFrmUI.RLT.Helper.CrownHelper.ThemeProvider.Theme.Colors.GreyBackground = Color.White;
//ThemeProvider.Theme.Colors.DarkBackground = Color.White;
- MainDockPanel.RightDockWidth = 320;
+ MainDockPanel.RightDockWidth = 335;
MainDockPanel.BottomDockHeight = 210;
}
@@ -57,14 +74,13 @@
_sectAreaDockPanel = new SectAreaDockPanel();
_sectAreaDockPanel.DefaultDockArea = DPumpHydr.WinFrmUI.RLT.Enum.Crown.DockArea.Bottom;
- _sectAreaDockPanel.OnRefreshSingleSectBundle += (bundle , selectedPointIndex) =>
+ _sectAreaDockPanel.OnRefreshSingleSectArea += (sect_index , sect_area) =>
{
-
- this._ctrlSectionBundleInfo.RefreshSectPara(bundle, selectedPointIndex);
- if(this._stepTreeDockPanel.CurrentStepID > this._stepTreeDockPanel.Step_ID_Section18_Full)
- {
- this._ctrlSectionShapeInfo18.RefreshSectPara(bundle.ToSectionShapePara(selectedPointIndex));
- }
+ this._ctrlSectionBundleInfo.RefreshSingleSectArea(sect_index, sect_area);
+ //if(this._stepTreeDockPanel.CurrentStepID > this._stepTreeDockPanel.Step_ID_Section18_Full)
+ //{
+ // this._ctrlSectionShapeInfo18.RefreshSectPara(bundle.ToSectionShapePara(selectedPointIndex));
+ //}
};
@@ -92,10 +108,11 @@
//
if (arg2 != null)
{
- this.SetParasCtrl(arg2.ID);
-
-
-
+ if(arg1 == null || arg1.ID < arg2.ID)
+ this.SetParasCtrl(arg2.ID, DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘);
+ else
+ this.SetParasCtrl(arg2.ID, DPumpHydr.ViewModel.eWizardStepDiretion.鍚庨��);
+
//
this._stepTreeDockPanel.SetFocusedNode(arg2.ID);
}
--
Gitblit v1.9.3