From 7fa5235e0368153db3a9e97a1e92042177ce3075 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期三, 23 十月 2024 09:52:01 +0800
Subject: [PATCH] 提交
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index cf21ed7..6b1457b 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -5,6 +5,7 @@
using System.IO;
using System.Text;
using System.Linq;
+using DPumpHydr.WinFrmUI.Volute.ViewModel;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -54,6 +55,11 @@
return GoPrevStepCore();
}
ViewModel.HdrBaseInfo _hdrBaseInfo = null;
+ ViewModel.GeomBaseInfo _geomBaseInfo = null;
+ /// <summary>
+ /// 涓嬩竴姝ユ牳蹇�
+ /// </summary>
+ /// <returns></returns>
private bool GoNextStepCore()
{
var next_step = (from x in _allStepNodes
@@ -71,13 +77,44 @@
MessageBox.Show(error_info);
return false;
}
+ hdrBaseInfo.CalcNs();
_hdrBaseInfo = hdrBaseInfo;
+ if(_geomBaseInfo == null)
+ {
+ _geomBaseInfo = new ViewModel.GeomBaseInfo();
+ }
+ _geomBaseInfo.Calc(hdrBaseInfo);
}
+ if (_currentStepID == Step_ID_Geom_Base_Info)
+ {
+ string error_info;
+ var geomBaseInfo = _ctrlGeomBaseInfo.GetBindingData(out error_info);
+ if (geomBaseInfo == null)
+ {
+ MessageBox.Show(error_info);
+ return false;
+ }
+ _geomBaseInfo = geomBaseInfo;
+ }
+ //if (_currentStepID == Step_ID_Section18_Base)
+ //{
+ // string error_info;
+ // var geomBaseInfo = _ctrlGeomBaseInfo.GetBindingData(out error_info);
+ // if (geomBaseInfo == null)
+ // {
+ // MessageBox.Show(error_info);
+ // return false;
+ // }
+ // _geomBaseInfo = geomBaseInfo;
+ //}
SetParasCtrl(next_step.ID);
return true;
}
-
+ /// <summary>
+ /// 涓婁竴姝ユ牳蹇�
+ /// </summary>
+ /// <returns></returns>
private bool GoPrevStepCore()
{
if (_currentStepID == Step_ID_Hdr_Base_Info)
@@ -94,7 +131,10 @@
return true;
}
-
+ /// <summary>
+ /// 鐢熸垚绗嚑姝ユ帶浠�
+ /// </summary>
+ /// <param name="step_id"></param>
private void SetParasCtrl(long step_id)
{
if (step_id == Step_ID_Hdr_Base_Info)
@@ -103,7 +143,9 @@
_ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
this.panelParas.Controls.Clear();
this.panelParas.Controls.Add(_ctrlHdrBaseInfo);
+ _ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
}
+
if (step_id == Step_ID_Geom_Base_Info)
{
if (_ctrlGeomBaseInfo == null)
@@ -112,9 +154,9 @@
_ctrlGeomBaseInfo.Name = "ctrlGeomBaseInfo";
_ctrlGeomBaseInfo.Dock = DockStyle.Right;
}
-
this.panelParas.Controls.Clear();
this.panelParas.Controls.Add(_ctrlGeomBaseInfo);
+ _ctrlGeomBaseInfo.SetBindingData(_geomBaseInfo);
}
--
Gitblit v1.9.3