From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs | 67 +++++++++++++++++----------------
WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs | 2
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs | 1
3 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
index 09da50d..7c2b0fc 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs
@@ -4,7 +4,7 @@
using System.IO;
using System.Text;
using System.Drawing;
-using HydrEngineCSharp;
+using HydrEngineCSharp;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -45,17 +45,17 @@
if (currentStepID == this._stepTreeDockPanel.Step_ID_Hdr_Base_Info)
{
if (!SaveParaStep1())
- return ;
+ return;
}
else if (currentStepID == this._stepTreeDockPanel.Step_ID_Section18_Full)
{
if (!SaveParaStep2())
- return ;
+ return;
}
else if (currentStepID == this._stepTreeDockPanel.Step_ID_Outflow_Paras)
{
if (!SaveParaStep3())
- return ;
+ return;
}
#endregion
SaveFileDialog dlg = new SaveFileDialog();
@@ -66,18 +66,18 @@
return;
new DPumpHydr.WinFrmUI.VoluteXmlParasTranHelper().Save(
dlg.FileName,
- _hdrBaseInfo,
- _geomBaseInfo,
- _sectionBundleInfo,
+ _hdrBaseInfo,
+ _geomBaseInfo,
+ _sectionBundleInfo,
_outflowParas,
- this._bodyThickness);
+ this._bodyThickness);
}
/// <summary>
/// 铚楀３鍙傛暟瀵煎叆
/// </summary>
public void ImportXmlFile()
- {
+ {
OpenFileDialog dlg = new OpenFileDialog();
dlg.Title = "瀵煎叆铚楀３淇℃伅";
dlg.FileName = "铚楀３淇℃伅.xml";
@@ -86,12 +86,12 @@
return;
var ret = new DPumpHydr.WinFrmUI.VoluteXmlParasTranHelper().Read(
dlg.FileName,
- out _hdrBaseInfo,
+ out _hdrBaseInfo,
out _geomBaseInfo,
- out _sectionBundleInfo,
+ out _sectionBundleInfo,
out _outflowParas,
out this._bodyThickness);
- if(ret)
+ if (ret)
{
this._occDesign2dCtrl.ClearAll();
this._occDesign3dCtrl.ClearAll();
@@ -99,15 +99,15 @@
#region 绗竴姝�
if (_hdrBaseInfo == null)
return;
-
- if (_ctrlHdrBaseInfo == null)
- {
- _ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
- _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo";
- }
- _ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
- _ctrlHdrBaseInfo.SetBindingData(_geomBaseInfo);
- _ctrlHdrBaseInfo.SaveHistoryParas(_hdrBaseInfo, _geomBaseInfo);
+
+ if (_ctrlHdrBaseInfo == null)
+ {
+ _ctrlHdrBaseInfo = new ctrlHdrBaseInfo();
+ _ctrlHdrBaseInfo.Name = "ctrlHdrBaseInfo";
+ }
+ _ctrlHdrBaseInfo.SetBindingData(_hdrBaseInfo);
+ _ctrlHdrBaseInfo.SetBindingData(_geomBaseInfo);
+ _ctrlHdrBaseInfo.SaveHistoryParas(_hdrBaseInfo, _geomBaseInfo);
_stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Hdr_Base_Info);
#endregion
@@ -118,7 +118,7 @@
CreateSectionStepCtrl();
_isHaveCreateWaterBody3d = false;
DockStepParaCtrl(_ctrlSectionBundleInfo);
- if(_ctrlSectionBundleInfo != null)
+ if (_ctrlSectionBundleInfo != null)
{
_ctrlSectionBundleInfo.SetBindingData(_sectionBundleInfo);
}
@@ -151,17 +151,18 @@
#region 鍔犲帤
if (_bodyThickness < 1)
return;
- InitilThicknessStepCtrl(this._stepTreeDockPanel.Step_ID_Outflow_Paras,_bodyThickness);
+ InitilThicknessStepCtrl(this._stepTreeDockPanel.Step_ID_Outflow_Paras, _bodyThickness);
DockStepParaCtrl(_ctrlThicknessParas);
_stepTreeDockPanel.SetFocusedNode(this._stepTreeDockPanel.Step_ID_Thickness);
- GoNextStep();
RbtnChk鏍囨敞.Visible = true;
#endregion
+
+ GoNextStep();
}
}
-
+
/// <summary>
@@ -181,21 +182,21 @@
if (dlg.ShowDialog() == DialogResult.OK)
{
this._occDesign3dCtrl.ExportThicknessBody(dlg.FileName.Replace(".stp", "_body.stp"), FileType.ESTEPFILE);
- this._occDesign3dCtrl.ExportWaterBodyFile(dlg.FileName.Replace(".stp","_water.stp"), FileType.ESTEPFILE);
+ this._occDesign3dCtrl.ExportWaterBodyFile(dlg.FileName.Replace(".stp", "_water.stp"), FileType.ESTEPFILE);
new DPumpHydr.WinFrmUI.VoluteXmlParasTranHelper().Save(
dlg.FileName.Replace(".stp", ".xml"),
_hdrBaseInfo,
_geomBaseInfo,
- _sectionBundleInfo,
+ _sectionBundleInfo,
_outflowParas,
this._bodyThickness);
}
-
+
}
-
-
-
+
+
+
/// <summary>
/// 铚楀３鍙傛暟瀵煎嚭
/// </summary>
@@ -220,10 +221,10 @@
dlg.FileName.Replace(".stp", ".igs"),
_hdrBaseInfo,
_geomBaseInfo,
- _sectionBundleInfo,
+ _sectionBundleInfo,
_outflowParas,
this._bodyThickness);
- }
+ }
}
}
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
index 1d77492..c034a94 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -109,6 +109,7 @@
this.BuildParasCtrl(current_step_id, next_step_id);
//
+ if(next_step_id > 0)
this._stepTreeDockPanel.SetFocusedNode(next_step_id);
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
index dbf6152..a2ec9e5 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
@@ -189,7 +189,7 @@
{
var theSectionParam = bundle.ToSectionShapePara(i);
- double dGama_Left, dGama_Right, dH, dR_out, dBaseWidth, dBaseCircleRadius;
+ double dGama_Left, dGama_Right, dH, dR_out, dBaseWidth, dBaseCircleRadius;
dGama_Left = theSectionParam.Gama_Left;
dGama_Right = theSectionParam.Gama_Right;
dH = theSectionParam.H;
--
Gitblit v1.9.3