From b0de14c2670b9ff0079dacfb4b7457b438368f11 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 27 三月 2025 10:17:53 +0800
Subject: [PATCH] 添加导出直线圆弧数据
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 238 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 137 insertions(+), 101 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index a2a1f8a..44f6f1a 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -3,7 +3,8 @@
using System.Windows.Forms;
using System.IO;
using System.Text;
-using System.Linq;
+using System.Linq;
+
namespace DPumpHydr.WinFrmUI.Volute
{
public partial class MainViewPage
@@ -18,73 +19,31 @@
/// <returns></returns>
private bool GoNextStepCore()
{
- var currentStepID = this._stepTreeDockPanel.CurrentStepID;
-
+ var current_step_id = this._stepTreeDockPanel.CurrentStepID;
+
//
var next_step_id = this._stepTreeDockPanel.NextStepID;
- if (currentStepID == this._stepTreeDockPanel.Step_ID_Section18_Full)
+ if (current_step_id == this._stepTreeDockPanel.Step_ID_Section18_Full)
{
next_step_id = this._stepTreeDockPanel.Step_ID_Outflow_Paras;
}
- if (next_step_id > 0)
- {
- if (currentStepID == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
- {
- if (!SaveParaStep1())
- return false;
- }
- else if (currentStepID == this._stepTreeDockPanel.Step_ID_Section18_Full)
- {
- if (!SaveParaStep2())
- return false;
- }
- else if (currentStepID == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
- {
- if (!SaveParaStep3())
- return false;
- }
- else
- {
-
- }
- this.SetParasCtrl(currentStepID, next_step_id );
-
- //
- this._stepTreeDockPanel.SetFocusedNode(next_step_id);
- }
-
-
+ ChangeStep(current_step_id, next_step_id);
return true;
}
-
-
-
/// <summary>
/// 涓婁竴姝ユ牳蹇�
/// </summary>
/// <returns></returns>
private bool GoPrevStepCore()
{
- var currentStepID = this._stepTreeDockPanel.CurrentStepID;
- ParasInfoBaseCtrl paras_ctrl = GetParasCtrl(currentStepID);
- //if (paras_ctrl != null && paras_ctrl.IsChangesParas())
- //{
- // DialogResult result = MessageBox.Show("宸茬粡淇敼杩囩殑鏁版嵁闇�瑕佷繚瀛樺悧锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
- // if (result == DialogResult.OK)
- // {
- // if (SaveStepParas(currentStepID) == false)
- // {
- // return false;
- // }
- // }
- //}
+ var current_step_id = this._stepTreeDockPanel.CurrentStepID;
var prev_step_id = this._stepTreeDockPanel.PrevStepID;
- if (currentStepID == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ if (current_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
{
prev_step_id = this._stepTreeDockPanel.Step_ID_Section18_Full;
}
@@ -93,47 +52,154 @@
return false;
- this.SetParasCtrl(currentStepID, prev_step_id);
-
- //
- this._stepTreeDockPanel.SetFocusedNode(prev_step_id);
-
+ this.ChangeStep(current_step_id, prev_step_id);
return true;
}
/// <summary>
- /// 鐢熸垚鎺т欢鐨勫弬鏁版帶浠�
+ /// 鍒囨崲姝ラ
/// </summary>
/// <param name="current_step_id"></param>
- private void SetParasCtrl(long last_step_id, long current_step_id)
+ /// <param name="next_step_id"></param>
+ private bool ChangeStep(long current_step_id, long next_step_id)
{
+ RbtnChk鎴潰18.Visible = false;
+ if (current_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
+ {
+ if (!SaveParaStep1())
+ return false;
+ //ParasInfoBaseCtrl paras_ctrl = GetParasCtrl(current_step_id);
+ //if (paras_ctrl != null && paras_ctrl.IsChangesParas())
+ //{
+ // DialogResult result = MessageBox.Show("宸茬粡淇敼杩囩殑鏁版嵁闇�瑕佷繚瀛樺悧锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+ // if (result == DialogResult.OK)
+ // {
+ // if (SaveStepParas(current_step_id) == false)
+ // {
+ // return false;
+ // }
+ // }
+ //}
+ }
+ else if (current_step_id == this._stepTreeDockPanel.Step_ID_Section18_Full)
+ {
+ if (!SaveParaStep2())
+ return false;
+ }
+ else if (current_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ {
+
+ if (!SaveParaStep3())
+ return false;
+ }
+ else if (current_step_id == this._stepTreeDockPanel.Step_ID_Thickness)
+ {
+ if (!SaveParaStep4())
+ return false;
+ if (next_step_id < current_step_id)
+ {//鍒犻櫎鍔犲帤浣�
+ this._occDesign3dCtrl.RemoveThicknessBody( );
+ }
+ }
+
+
+ this.BuildParasCtrl(current_step_id, next_step_id);
+
+ //
+ this._stepTreeDockPanel.SetFocusedNode(next_step_id);
+
+
+
Rbtn鏁版嵁瀵煎嚭STP.Visible = false;
Rbtn鏁版嵁瀵煎嚭IGS.Visible = false;
-
- #region 绗�1姝�
- if (current_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
+ if (next_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
{
- EnterStep1(last_step_id);
+ this._sectAreaDockPanel.Visible = false;
+
+ this.RBtn鍚庨��.Enabled = false;
+ this.Rbtn鍓嶈繘.Enabled = true;
+
+
+ this.Rbtn涓婁竴姝�.Enabled = false;
+ this.Rbtn涓嬩竴姝�.Enabled = true;
+ this.Rbtn瀹屾垚.Enabled = false;
+
+ this._occDesign2dCtrl.HideAll();
+ this._occDesign3dCtrl.HideAll();
+ }
+ else if (next_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ {
+ RbtnChk鎴潰18.Visible = true;
+
+ this.RBtn鍚庨��.Enabled = true;
+ this.Rbtn鍓嶈繘.Enabled = true;
+
+ this.Rbtn涓婁竴姝�.Enabled = true;
+ this.Rbtn涓嬩竴姝�.Enabled = true;
+ this.Rbtn瀹屾垚.Enabled = false;
+ }
+
+ else if (next_step_id == this._stepTreeDockPanel.Step_ID_Thickness)
+ {
+ this.RBtn鍚庨��.Enabled = true;
+ this.Rbtn鍓嶈繘.Enabled = false;
+
+
+ this.Rbtn涓婁竴姝�.Enabled = true;
+ this.Rbtn涓嬩竴姝�.Enabled = false;
+ this.Rbtn瀹屾垚.Enabled = true;
+
+ this.Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
+ this.Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
+ }
+ else
+ {
+ this.RBtn鍚庨��.Enabled = true;
+ this.Rbtn鍓嶈繘.Enabled = true;
+
+
+ this.Rbtn涓婁竴姝�.Enabled = true;
+ this.Rbtn涓嬩竴姝�.Enabled = true;
+ this.Rbtn瀹屾垚.Enabled = false;
+ }
+
+
+
+ return true;
+ }
+
+
+
+ /// <summary>
+ /// 璁剧疆鍙傛暟鎺т欢
+ /// </summary>
+ /// <param name="next_step_id"></param>
+ private void BuildParasCtrl(long current_step_id, long next_step_id)
+ {
+ #region 绗�1姝�
+ if (next_step_id == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
+ {
+ EnterStep1(current_step_id);
return;
}
#endregion
#region 绗�2姝�
- if (current_step_id == this._stepTreeDockPanel.Step_ID_Section18_Full)
+ if (next_step_id == this._stepTreeDockPanel.Step_ID_Section18_Full)
{
- EnterStep2(last_step_id);
+ EnterStep2(current_step_id);
return;
}
#endregion
#region 绗�3姝� 1-8鏂潰
- if (current_step_id > this._stepTreeDockPanel.Step_ID_Section18_Grp &&
- current_step_id <= this._stepTreeDockPanel.Step_ID_Section18_Grp + 8)
+ if (next_step_id > this._stepTreeDockPanel.Step_ID_Section18_Grp &&
+ next_step_id <= this._stepTreeDockPanel.Step_ID_Section18_Grp + 8)
{
if (_sectionBundleInfo == null)
return;
@@ -144,7 +210,7 @@
_ctrlSectionShapeInfo18.OnRefreshShape += RefreshSectShapeSingle18;
}
DockStepParaCtrl(_ctrlSectionShapeInfo18);
- var sect_index = 9 + this._stepTreeDockPanel.Step_ID_Section18_Grp - current_step_id;
+ var sect_index = 9 + this._stepTreeDockPanel.Step_ID_Section18_Grp - next_step_id;
var shape_info = _sectionBundleInfo.ToSectionShapePara((int)sect_index);
RefreshSectShapeSingle18(shape_info);
_ctrlSectionShapeInfo18.SetBindingData(shape_info);
@@ -159,56 +225,26 @@
#endregion
-
-
#region 鍑烘按闈㈠弬鏁�
- if (current_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
+ if (next_step_id == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
{
- EnterStep3(last_step_id);
+ EnterStep3(current_step_id);
return;
}
#endregion
- #region 鍔犲帤
- if (current_step_id == this._stepTreeDockPanel.Step_ID_jiahout)
+ #region 鍔犲帤
+ if (next_step_id == this._stepTreeDockPanel.Step_ID_Thickness)
{
if (_sectionBundleInfo == null)
return;
- Rbtn鏁版嵁瀵煎嚭STP.Visible = true;
- Rbtn鏁版嵁瀵煎嚭IGS.Visible = true;
- this._occDesign2dCtrl.SetAllSectionCurveVisible(false);
- this._occDesign3dCtrl.SetAllSectionCurveVisible(false);
+ EnterStep4(current_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
-
+ #endregion
}
--
Gitblit v1.9.3