From 6a07c4c846ffbb1e93afdf0260e123e4c145f419 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 22 十月 2024 10:00:27 +0800
Subject: [PATCH] 添加viewModel
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index 462d525..854879d 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -34,7 +34,7 @@
private List<DPumpHydr.WinFrmUI.Volute.TreeStepNode> _allStepNodes = null;
private long _currentStepID = 0;
-
+
/// <summary>
/// 涓嬩竴姝�
/// </summary>
@@ -52,7 +52,7 @@
{
return GoPrevStepCore();
}
-
+ ViewModel.HdrBaseInfo _hdrBaseInfo = null;
private bool GoNextStepCore()
{
var next_step = (from x in _allStepNodes
@@ -61,7 +61,17 @@
select x).FirstOrDefault();
if (next_step == null)
return false;
-
+ if(_currentStepID == Step_ID_Hdr_Base_Info)
+ {
+ string error_info;
+ var hdrBaseInfo = _ctrlHdrBaseInfo.GetBindingData(out error_info);
+ if(hdrBaseInfo == null)
+ {
+ MessageBox.Show(error_info);
+ return false;
+ }
+ _hdrBaseInfo = hdrBaseInfo;
+ }
SetParasCtrl(next_step.ID);
return true;
@@ -90,15 +100,20 @@
{
if (_ctrlHdrBaseInfo == null)
_ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlHdrBaseInfo);
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlHdrBaseInfo);
}
if (step_id == Step_ID_Geom_Base_Info)
{
if (_ctrlGeomBaseInfo == null)
+ {
_ctrlGeomBaseInfo = new ctrlGeomBaseInfo();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlGeomBaseInfo);
+ _ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo";
+ _ctrlGeomBaseInfo.Dock = DockStyle.Fill;
+ }
+
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlGeomBaseInfo);
}
@@ -107,16 +122,27 @@
if (step_id == Step_ID_Section18_Base)
{
if (_ctrlSectionBaseInfo == null)
- _ctrlSectionBaseInfo = new ctrlSectionBaseInfo();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlSectionBaseInfo);
+ {
+ _ctrlSectionBaseInfo = new ctrlSectionBaseInfo();
+ _ctrlSectionBaseInfo.Name = "ctrlSectionBaseInfo";
+ _ctrlSectionBaseInfo.Dock = DockStyle.Fill;
+ }
+
+
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlSectionBaseInfo);
}
if (step_id == Step_ID_Section18_Dim)
{
if (_ctrlSectionShapeInfo18 == null)
+ {
_ctrlSectionShapeInfo18 = new ctrlSectionShapeInfo18();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlSectionShapeInfo18);
+ _ctrlSectionShapeInfo18.Name = "ctrlSectionShapeInfo18";
+ _ctrlSectionShapeInfo18.Dock = DockStyle.Fill;
+ }
+
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlSectionShapeInfo18);
}
@@ -125,16 +151,16 @@
{
if (_ctrlSetOutflowStyle == null)
_ctrlSetOutflowStyle = new ctrlSetOutflowStyle();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlSetOutflowStyle);
-
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlSetOutflowStyle);
+
}
if (step_id == Step_ID_Outflow_Dim)
{
if (_ctrlSetOutflowDim == null)
_ctrlSetOutflowDim = new ctrlSetOutflowDim();
- // dockPanel2.Controls.Clear();
- // dockPanel2.Controls.Add(_ctrlSetOutflowDim);
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlSetOutflowDim);
}
@@ -252,9 +278,6 @@
#endregion
-
-
-
#region 鍑烘按浣�
var stepGroup_鍑烘按浣� = new DPumpHydr.WinFrmUI.Volute.TreeStepNode()
@@ -301,6 +324,23 @@
#endregion
+ ViewModel.HdrBaseInfo hdrBaseInfo = new ViewModel.HdrBaseInfo();
+ hdrBaseInfo.Q = 200;
+ hdrBaseInfo.H = 50;
+ hdrBaseInfo.n = 2900;
+ hdrBaseInfo.D2 = 220;
+ hdrBaseInfo.B2 = 20;
+
+ if (_ctrlHdrBaseInfo == null)
+ {
+ _ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
+ _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo";
+ _ctrlHdrBaseInfo.Dock = DockStyle.Right;
+ _ctrlHdrBaseInfo.SetBindingData(hdrBaseInfo);
+ }
+ this.panelParas.Controls.Clear();
+ this.panelParas.Controls.Add(_ctrlHdrBaseInfo);
+ this._currentStepID = Step_ID_Hdr_Base_Info;
//this.stepTreeListCtrl.SetStepSource(_allStepNodes, 1);
}
--
Gitblit v1.9.3