From c8552b21551b7fccd19e5dac28c05092fcde29cb Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期四, 13 二月 2025 17:40:23 +0800
Subject: [PATCH] 优化导入XML
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs | 117 ++++++++----------
WinFrmUI/DPumpHydr.WinFrmUI.Volute/基本参数/ctrlHdrBaseInfo.cs | 18 +-
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_截面18.cs | 31 +++--
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowParas.cs | 5
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 29 ----
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_出口_水体.cs | 86 ++++++++-----
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/参数控件/SetOutflowParasCtrl1.Designer.cs | 4
WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeNode.cs | 6
WinFrmUI/DPumpHydr.WinFrmUI.Volute/断面设计/ctrlSectionBundleInfo.cs | 13 +-
9 files changed, 148 insertions(+), 161 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
index 56c441b..2b4e6f6 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
@@ -100,8 +100,9 @@
this._occDesign3dCtrl.ClearAll();
#region 绗竴姝�
- if (_hdrBaseInfo != null )
- {
+ if (_hdrBaseInfo == null)
+ return;
+
if (_ctrlHdrBaseInfo == null)
{
_ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
@@ -110,86 +111,74 @@
_ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
_ctrlHdrBaseInfo.SetBindingData(_geomBaseInfo);
_ctrlHdrBaseInfo.SaveHistoryParas(_hdrBaseInfo, _geomBaseInfo);
- }
+ _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Hdr_Base_Info);
#endregion
-
#region 绗�2姝� 鏂潰鎬昏
- if (_sectionBundleInfo != null)
- {
- if (_ctrlSectionBundleInfo == null)
- {
- _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
- _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
- _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
- _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
- }
+ if (_sectionBundleInfo == null)
+ return;
+ CreateSectionStepCtrl();
+ DockStepParaCtrl(_ctrlSectionBundleInfo);
- _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
- DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘,true);
- _ctrlSectionBundleInfo.RefreshAllSectPara(_sectionBundleInfo);
- RefreshSectShapeWhole18(_sectionBundleInfo);
- }
+ _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
+ DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘, true);
+ _ctrlSectionBundleInfo.RefreshAllSectPara(_sectionBundleInfo);
+ RefreshSectShapeWhole18(_sectionBundleInfo);
+ _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Section18_Full);
#endregion
-
- #region 鍑烘按闈㈢被鍨嬮�夋嫨
- //if (_outflowType != ViewModel.eOutflowStyle.鏈煡)
- //{
- // if (_ctrlSetOutflowType == null)
- // {
- // _ctrlSetOutflowType = new ctrlSetOutflowType();
- // _ctrlSetOutflowType.Name = "ctrlSetOutflowDim";
- // }
- // this._ctrlSetOutflowType.SetBindingData(_outflowType);
- //}
- #endregion
#region 鍑烘按闈㈠弬鏁�
- if (_outflowParas != null)
- {
- if (_ctrlSetOutflowParas == null)
- {
- _ctrlSetOutflowParas = new ctrlSetOutflowParas();
- _ctrlSetOutflowParas.Name = "ctrlSetOutflowStyle";
- _ctrlSetOutflowParas.OnRefreshShape2D += RefreshWaterBody2D;
- _ctrlSetOutflowParas.OnRefreshShape3D += RefreshWaterBody3D;
- _ctrlSetOutflowParas.InitialParas( _hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
- }
- //CreateWaterBody2D(_outflowParas);
- RefreshWaterBody3D(_outflowParas);
-
+ if (_outflowParas == null)
+ return;
+ CreateOutflowStepCtrl();
- _ctrlSetOutflowParas.SetBindingData( _outflowParas);
+ DockStepParaCtrl(_ctrlSetOutflowParas);
- #region 鍔犲帤
- if (_bodyThickness>0)
- {
- Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
- Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
+ InitilOutflowStepCtrl(this._stepTreeDockPanel.Step_ID_Section18_Full);
- if (_ctrlThicknessParas == null)
- {
- _ctrlThicknessParas = new ctrlThicknessParas();
- _ctrlThicknessParas.Name = "ctrlThicknessParas";
- _ctrlThicknessParas.OnRefreshShape += (houdu) => {
- this._bodyThickness = houdu;
- this._occDesign3dCtrl.BuildThicknessBody(houdu);
- };
- _ctrlThicknessParas.InitialParas(_bodyThickness);
- this._occDesign3dCtrl.BuildThicknessBody(_bodyThickness);
- }
-
- }
- #endregion
- }
+ this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
+ this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
+
+ _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Outflow_Paras);
#endregion
+ #region 鍔犲帤
+ if (_bodyThickness < 1)
+ return;
+ CreateThicknessStepCtrl();
+
+
+ InitilThicknessStepCtrl(this._stepTreeDockPanel.Step_ID_Outflow_Paras);
+
+
+ DockStepParaCtrl(_ctrlThicknessParas);
+ _stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_jiahout);
+ //{
+ // Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
+ // Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
+
+ // if (_ctrlThicknessParas == null)
+ // {
+ // _ctrlThicknessParas = new ctrlThicknessParas();
+ // _ctrlThicknessParas.Name = "ctrlThicknessParas";
+ // _ctrlThicknessParas.OnRefreshShape += (houdu) =>
+ // {
+ // this._bodyThickness = houdu;
+ // this._occDesign3dCtrl.BuildThicknessBody(houdu);
+ // };
+ // _ctrlThicknessParas.InitialParas(_bodyThickness);
+ // this._occDesign3dCtrl.BuildThicknessBody(_bodyThickness);
+ // }
+
+ //}
+ #endregion
}
}
+
/// <summary>
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index c9ad350..e346cd4 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -172,36 +172,9 @@
{
if (_sectionBundleInfo == null)
return;
- Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
- Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
- this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
- this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
+ EnterStep4(last_step_id);
- if (_ctrlThicknessParas == null)
- {
- _ctrlThicknessParas = new ctrlThicknessParas();
- _ctrlThicknessParas.Name = "ctrlThicknessParas";
- _ctrlThicknessParas.OnRefreshShape += (houdu) =>
- {
- this._bodyThickness = houdu;
- this._occDesign3dCtrl.BuildThicknessBody(houdu);
- };
- this._bodyThickness = _ctrlThicknessParas.InitialParas(_hdrBaseInfo, _geomBaseInfo, _outflowParas);
- this._occDesign3dCtrl.BuildThicknessBody(_bodyThickness);
- }
-
-
-
- _ctrlThicknessParas.ShowPage();
-
- this._occDesign3dCtrl.setWaterBodyOpacity(
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.R,
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.G,
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.B, 60);
- this._occDesign3dCtrl.SetThicknessBodyVisible(true);
-
- DockStepParaCtrl(_ctrlThicknessParas);
return;
}
#endregion
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\345\207\272\345\217\243_\346\260\264\344\275\223.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\345\207\272\345\217\243_\346\260\264\344\275\223.cs"
index 62d1054..fa38d72 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\345\207\272\345\217\243_\346\260\264\344\275\223.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\345\207\272\345\217\243_\346\260\264\344\275\223.cs"
@@ -4,9 +4,7 @@
using System.IO;
using System.Text;
using System.Linq;
-using HydrEngineCSharp;
-using System.Net.NetworkInformation;
-using DPumpHydr.WinFrmUI.Volute.ViewModel;
+using HydrEngineCSharp;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -36,12 +34,59 @@
this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
-
+
+
+ CreateOutflowStepCtrl();
+
+
+
+ InitilOutflowStepCtrl(last_step_id);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="last_step_id"></param>
+ private void InitilOutflowStepCtrl(long last_step_id)
+ {
+ _ctrlSetOutflowParas.InitialParas(_hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
+ _ctrlSetOutflowParas.SetSect9Posi(_sect9Posi);
+ _ctrlSetOutflowParas.SetSect10Posi(_sect10Posi);
+
+
+
+ DPumpHydr.ViewModel.eWizardStepDiretion step_direction = DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘;
+ if (last_step_id > this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ step_direction = DPumpHydr.ViewModel.eWizardStepDiretion.鍚庨��;
+ _ctrlSetOutflowParas.ShowPage(step_direction);
+
+
+
+
+ this._sectAreaDockPanel.RefreshControl();
+ this._sectAreaDockPanel.Visible = true;
+ DockStepParaCtrl(_ctrlSetOutflowParas);
+ string error = "";
+ _outflowParas = _ctrlSetOutflowParas.GetBindingData(out error);
+
+
+ this._occDesign3dCtrl.setWaterBodyOpacity(
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.R,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.G,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.B, 256);
+ this._occDesign3dCtrl.SetThicknessBodyVisible(false);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ private void CreateOutflowStepCtrl()
+ {
if (_ctrlSetOutflowParas == null)
{
_ctrlSetOutflowParas = new ctrlSetOutflowParas();
_ctrlSetOutflowParas.Name = "ctrlSetOutflowStyle";
- _ctrlSetOutflowParas.OnRefreshShape2D += RefreshWaterBody2D ;
+ _ctrlSetOutflowParas.OnRefreshShape2D += RefreshWaterBody2D;
_ctrlSetOutflowParas.OnRefreshShape3D += RefreshWaterBody3D;
_ctrlSetOutflowParas.OnNextStep += () =>
{
@@ -89,37 +134,10 @@
// }
//}
//_ctrlSetOutflowParas.SetBindingData(_outflowType, _hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
-
-
+
+
}
- _ctrlSetOutflowParas.InitialParas(_hdrBaseInfo, _geomBaseInfo, _sectionBundleInfo);
- _ctrlSetOutflowParas.SetSect9Posi(_sect9Posi);
- _ctrlSetOutflowParas.SetSect10Posi(_sect10Posi);
-
-
- DPumpHydr.ViewModel.eWizardStepDiretion step_direction = DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘;
- if (last_step_id > this._stepTreeDockPanel.Step_ID_Outflow_Paras)
- step_direction = DPumpHydr.ViewModel.eWizardStepDiretion.鍚庨��;
-
-
- _ctrlSetOutflowParas.ShowPage(step_direction);
-
-
- this._sectAreaDockPanel.RefreshControl();
- this._sectAreaDockPanel.Visible = true;
- DockStepParaCtrl(_ctrlSetOutflowParas);
- string error = "";
- _outflowParas = _ctrlSetOutflowParas.GetBindingData(out error);
-
-
- this._occDesign3dCtrl.setWaterBodyOpacity(
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.R,
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.G,
- DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.B, 256);
- this._occDesign3dCtrl.SetThicknessBodyVisible(false);
}
-
-
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\346\210\252\351\235\24218.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\346\210\252\351\235\24218.cs"
index bd11ef6..9ba42c4 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\346\210\252\351\235\24218.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_\346\210\252\351\235\24218.cs"
@@ -56,20 +56,12 @@
this._occDesign3dCtrl.FitView();
-
+ CreateSectionStepCtrl();
+
+
_isHaveCreateWaterBody3d = false;
- if (_ctrlSectionBundleInfo == null)
- {
- _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
- _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
- _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
- _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
- _ctrlSectionBundleInfo.OnNextStep += () =>
- {
- GoNextStep();
- };
- }
+
DPumpHydr.ViewModel.eWizardStepDiretion step_direction = DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘;
if (last_step_id > this._stepTreeDockPanel.Step_ID_Section18_Full)
@@ -85,7 +77,20 @@
this._sectAreaDockPanel.RefreshControl();
this._sectAreaDockPanel.Visible = true;
}
-
+ private void CreateSectionStepCtrl()
+ {
+ if (_ctrlSectionBundleInfo == null)
+ {
+ _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
+ _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
+ _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
+ _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
+ _ctrlSectionBundleInfo.OnNextStep += () =>
+ {
+ GoNextStep();
+ };
+ }
+ }
/// <summary>
/// 鏇存柊1-8
/// </summary>
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeNode.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeNode.cs
index f1e0864..59409d6 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeNode.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/StepInfo/StepTreeNode.cs
@@ -26,10 +26,10 @@
#region Event Region
- public event EventHandler<ObservableListModified<StepTreeNode>> ItemsAdded;
- public event EventHandler<ObservableListModified<StepTreeNode>> ItemsRemoved;
+ //public event EventHandler<ObservableListModified<StepTreeNode>> ItemsAdded;
+ //public event EventHandler<ObservableListModified<StepTreeNode>> ItemsRemoved;
- public event EventHandler TextChanged;
+ //public event EventHandler TextChanged;
public event Action<StepTreeNode> NodeExpanded;
public event Action<StepTreeNode> NodeCollapsed;
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
index 100926c..eb1dc53 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/ctrlSetOutflowParas.cs"
@@ -193,7 +193,10 @@
{
if (paras == null)
return;
-
+ if(_sectionBundleInfo == null)
+ {
+ throw new Exception("鏈垵濮嬪寲ctrlSetOutflowParas鎺т欢");
+ }
this._sharp_type = paras.ShapeStyle;
var paras1 = new ViewModel.OutflowParas(paras);
var paras2 = new ViewModel.OutflowParas(paras);
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/\345\217\202\346\225\260\346\216\247\344\273\266/SetOutflowParasCtrl1.Designer.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/\345\217\202\346\225\260\346\216\247\344\273\266/SetOutflowParasCtrl1.Designer.cs"
index e9bf1f1..eab9b84 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/\345\217\202\346\225\260\346\216\247\344\273\266/SetOutflowParasCtrl1.Designer.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\207\272\346\260\264\350\256\276\350\256\241/\345\217\202\346\225\260\346\216\247\344\273\266/SetOutflowParasCtrl1.Designer.cs"
@@ -763,8 +763,6 @@
private RLT.Controls.CrownLabel crownLabel鍙充笂鍒囩嚎缂╂斁閲�;
private RLT.Controls.CrownLabel crownLabel宸︿笅鍒囩嚎缂╂斁閲�;
private RLT.Controls.CrownLabel crownLabel宸︿笂鍒囩嚎缂╂斁閲�;
- private RLT.Controls.ThunderGroupBox thunderGroupBox1;
- private RLT.Controls.RibbonRadioButton RBtn涓績鍑哄彛;
- private RLT.Controls.RibbonRadioButton RBtn渚ч潰鍑哄彛鏇茬嚎;
+ private RLT.Controls.ThunderGroupBox thunderGroupBox1;
}
}
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.cs"
index bddb1c2..818e02b 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\345\237\272\346\234\254\345\217\202\346\225\260/ctrlHdrBaseInfo.cs"
@@ -387,30 +387,30 @@
mTextBoxEdit鍩哄渾鐩村緞D3.Text = D3.ToString();
//璁＄畻骞惰缃瓼AIO
- double FAI0 = 0, FAI0min, FAI0max;
+ double FAI0 = 0;//, FAI0min, FAI0max;
if (ns < 100)
{
FAI0 = 25 + (int)(ns / 20);
- FAI0min = 25.0;
- FAI0max = 30.0;
+ // FAI0min = 25.0;
+ // FAI0max = 30.0;
}
if (ns >= 100 && ns < 200)
{
FAI0 = 30 + (int)((ns - 100) / 12.5);
- FAI0min = 30.0;
- FAI0max = 38.0;
+ // FAI0min = 30.0;
+ // FAI0max = 38.0;
}
if (ns >= 200 && ns < 300)
{
FAI0 = 38 + (int)((ns - 200) / 50);
- FAI0min = 38.0;
- FAI0max = 40.0;
+ // FAI0min = 38.0;
+ // FAI0max = 40.0;
}
if (ns > 300)
{
FAI0 = 42;
- FAI0min = 40.0;
- FAI0max = 45.0;
+ // FAI0min = 40.0;
+ // FAI0max = 45.0;
}
mTextBoxEdit闅旇垖瀹夋斁瑙�.Text = FAI0.ToString();
diff --git "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs" "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
index 2b20b1f..3a2c8b8 100644
--- "a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
+++ "b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/\346\226\255\351\235\242\350\256\276\350\256\241/ctrlSectionBundleInfo.cs"
@@ -173,7 +173,7 @@
public void ShowPage(
ViewModel.HdrBaseInfo base_info,
ViewModel.GeomBaseInfo geom_info,
- DPumpHydr.ViewModel.eWizardStepDiretion step_direction,bool isxml)
+ DPumpHydr.ViewModel.eWizardStepDiretion step_direction,bool isRefreshModel = true)
{
if (step_direction == DPumpHydr.ViewModel.eWizardStepDiretion.鍚庨��)
{
@@ -181,10 +181,7 @@
}
this._hdrBaseInfo = base_info;
this._geomBaseInfo = geom_info;
- if (isxml)
- {
- return;
- }
+
if (_sectionBundleInfo == null)
{
_sectionBundleInfo = new ViewModel.SectionBundleInfo();
@@ -206,9 +203,13 @@
}
}
-
RefreshAllSectPara(_sectionBundleInfo);
+ if (isRefreshModel == false)
+ {
+ return;
+ }
+
RefreshShape(_sectionBundleInfo);
}
private void pictureBoxRefreshK3_Click(object sender, EventArgs e)
--
Gitblit v1.9.3