From e15fa3fb9193f6635b7f4ddec526c061a8ee03ed Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期五, 21 二月 2025 17:10:07 +0800
Subject: [PATCH] 添加了矩形断面 对于r的判断条件
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs | 153 +++++++++++++++++++++++++++-----------------------
1 files changed, 83 insertions(+), 70 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
index 2e57bf5..5c3c710 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
@@ -4,10 +4,7 @@
using System.IO;
using System.Text;
using System.Drawing;
-using HydrEngineCSharp;
-using DPumpHydr.WinFrmUI.RLT.Native;
-using DPumpHydr.WinFrmUI.RLT.Docking.Crown;
-using DPumpHydr.WinFrmUI.Volute.TempCtrl;
+using HydrEngineCSharp;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -23,9 +20,9 @@
// MessageBox.Show("鎮ㄨ繕娌℃湁瀹屾垚瀹氫箟鍙傛暟锛佽瀹氫箟瀹屾垚鍚庡湪杩涜瀵煎嚭锛侊紙鑷冲皯瀹屾垚绗笁姝ワ級");
// return;
//}
+ var currentStepID = this._stepTreeDockPanel.CurrentStepID;
if (_hdrBaseInfo == null)
{
- var currentStepID = this._stepTreeDockPanel.CurrentStepID;
if (currentStepID == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
{
if (!SaveParaStep1())
@@ -33,10 +30,34 @@
MessageBox.Show("鎮ㄨ繕娌℃湁瀹屾垚瀹氫箟鍙傛暟锛佽璇ョ晫闈㈠叏閮ㄨ緭鍏ュ畬鎴愬悗鍦ㄨ繘琛屽鍑猴紒");
return;
}
-
+ if (_sectionBundleInfo == null)
+ {
+ _sectionBundleInfo = new ViewModel.SectionBundleInfo();
+
+ _sectionBundleInfo.BaseWidth = _geomBaseInfo.B3;
+ _sectionBundleInfo.BaseCircleRadius = _geomBaseInfo.D3 / 2;
+
+ _sectionBundleInfo.ResetAllParas(_hdrBaseInfo, _geomBaseInfo);
+ }
}
}
-
+ #region 鏆傛椂闇�瑕佸鍑虹洰鍓嶉〉闈㈢殑鍊硷紝骞舵病鏈夎繘琛屽垽鏂紝娴嬭瘯浣跨敤
+ if (currentStepID == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
+ {
+ if (!SaveParaStep1())
+ return ;
+ }
+ else if (currentStepID == this._stepTreeDockPanel.Step_ID_Section18_Full)
+ {
+ if (!SaveParaStep2())
+ return ;
+ }
+ else if (currentStepID == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ {
+ if (!SaveParaStep3())
+ return ;
+ }
+ #endregion
SaveFileDialog dlg = new SaveFileDialog();
dlg.Title = "瀵煎嚭铚楀３淇℃伅";
dlg.FileName = "铚楀３淇℃伅.xml";
@@ -76,8 +97,9 @@
this._occDesign3dCtrl.ClearAll();
#region 绗竴姝�
- if (_hdrBaseInfo != null )
- {
+ if (_hdrBaseInfo == null)
+ return;
+
if (_ctrlHdrBaseInfo == null)
{
_ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
@@ -86,86 +108,77 @@
_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 (_sectionBundleInfo == null)
+ return;
+ CreateSectionStepCtrl();
+ DockStepParaCtrl(_ctrlSectionBundleInfo);
+ if(_ctrlSectionBundleInfo != null)
{
- if (_ctrlSectionBundleInfo == null)
- {
- _ctrlSectionBundleInfo = new ctrlSectionBundleInfo();
- _ctrlSectionBundleInfo.Name = "ctrlSectionBaseInfo";
- _ctrlSectionBundleInfo.OnRefreshShape += RefreshSectShapeWhole18;
- _ctrlSectionBundleInfo.OnHightLightSectCurve += HightLightSectCurve;
- }
-
- _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
- DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘);
- _ctrlSectionBundleInfo.RefreshAllSectPara(_sectionBundleInfo);
- RefreshSectShapeWhole18(_sectionBundleInfo);
+ _ctrlSectionBundleInfo.SetBindingData(_sectionBundleInfo);
}
+ _ctrlSectionBundleInfo.ShowPage(_hdrBaseInfo, _geomBaseInfo,
+ DPumpHydr.ViewModel.eWizardStepDiretion.鍓嶈繘, false);
+ _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>
--
Gitblit v1.9.3