解决冲突

chenn

2025-04-11 e98de937b28d42493de5dea6365c853d6b412d3c

解决冲突

 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);
            } 
            }

        }
    }

 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);



 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;