更新库；修复一些bug

chenn

2025-04-02 b398603062f8e7a5f3213a36ebc5b30508596815

更新库；修复一些bug

 Library/HydrEngineCSharp.dll

Binary files differ

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_ExportImport.cs

@@ -116,6 +116,7 @@
                if (_sectionBundleInfo == null)
                    return;
                CreateSectionStepCtrl();
                _isHaveCreateWaterBody3d = false;
                DockStepParaCtrl(_ctrlSectionBundleInfo);
                if(_ctrlSectionBundleInfo != null)
                {
@@ -133,7 +134,7 @@
                if (_outflowParas == null)
                    return;
                CreateOutflowStepCtrl();

                _isHaveCreateWaterBody3d = false;
                DockStepParaCtrl(_ctrlSetOutflowParas);
                _ctrlSetOutflowParas.Isxml = true;
                InitilOutflowStepCtrl(this._stepTreeDockPanel.Step_ID_Section18_Full);

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_³ö¿Ú_Ë®Ìå.cs

@@ -281,15 +281,26 @@
                {
                    if(_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
                    {
                        this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve);
                        this._occDesign3dCtrl.Edit3DWaterBody(pHydrGeomArcCurve);
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        if (this._occDesign3dCtrl.Edit3DWaterBody(pHydrGeomArcCurve).GetTipsId() != 1)
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        this._occDesign3dCtrl.SetWaterBodyVisible(true);
                    }
                    else
                    {

                        this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurve);
                        this._occDesign3dCtrl.Edit3DWaterBody(pHydrGeomCurve);
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurve))
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        if (this._occDesign3dCtrl.Edit3DWaterBody(pHydrGeomCurve).GetTipsId() != 1)
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        this._occDesign3dCtrl.SetWaterBodyVisible(true);
                    }
                }
@@ -298,14 +309,26 @@
                    _isHaveCreateWaterBody3d = true;
                    if (_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.直线圆弧 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.侧面出口_直线连接)
                    {
                        this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve);
                        this._occDesign3dCtrl.Create3DWaterBody(pHydrGeomArcCurve);
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        if (this._occDesign3dCtrl.Create3DWaterBody(pHydrGeomArcCurve).GetTipsId() != 1)
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        this._occDesign3dCtrl.SetWaterBodyVisible(true);
                    }
                    else
                    {
                        this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurve);
                        this._occDesign3dCtrl.Create3DWaterBody(pHydrGeomCurve);
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurve))
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        if (this._occDesign3dCtrl.Create3DWaterBody(pHydrGeomCurve).GetTipsId() != 1)
                        {
                            _isHaveCreateWaterBody3d = false;
                        }
                        this._occDesign3dCtrl.SetWaterBodyVisible(true);
                    }
                }

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesign3DCtrl.cs

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using HydrEngineCSharp;

namespace DPumpHydr.WinFrmUI.Volute
@@ -50,6 +51,10 @@
                Invalidate(true);
                pDisplayView.FitAll3DViews(true);
            }
            if(theToolTips.GetTipsId() != 1)
            {
                MessageBox.Show(theToolTips.GetToolTips(), "加厚提示");
            }
        }
        public void SetThicknessBodyVisible(bool isVisible)
        {

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs

@@ -411,7 +411,8 @@
            }
            else
            {
                MessageBox.Show(theToolTips.GetToolTips(), "提示");
                pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
                MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
                return false;
            }
        }
@@ -440,7 +441,8 @@
            }
            else
            {
                MessageBox.Show(theToolTips.GetToolTips(), "提示");
                pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
                MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
                return false  ;
            }
        }
@@ -462,6 +464,7 @@
           var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomCurve);
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);
            pDisplayView.FitAll3DViews(true);
@@ -484,6 +487,7 @@
            var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomArcCurve);
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);
            pDisplayView.FitAll3DViews(true);
@@ -503,7 +507,9 @@
                return null;
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "提示");
                pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
                pDisplayView.FitAll3DViews(true);
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);

@@ -511,7 +517,7 @@
        }

        public HydrEngineCSharp.ToolTips Edit3DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
        {
         {
            if (!this._is3D)
                return null;
            if (pDisplayView.hasBuildThicknessBody())
@@ -522,7 +528,9 @@
                return null;
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "提示");
                pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
                pDisplayView.FitAll3DViews(true);
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);


 WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowParas.cs

@@ -201,17 +201,14 @@
            else
            {
                comboBoxType.SelectedIndex = (int)_sharp_type;
                if (_isxml)
                {
                    InitialOutflowStyle();
                    _isxml = false;

                }
                InitialOutflowStyle();

                    RefreshModel();
                RefreshModel();
                
            }

            if (_isxml)
            {
                _isxml = false;
            }
            return 1;
        }


 WinFrmUI/DPumpHydr.WinFrmUI.Volute/¶ÏÃæÉè¼Æ/ctrlSectionBundleInfo.cs

@@ -174,6 +174,7 @@
            _sectionBundleInfo = sectionBundle_info;
        }

        bool _isxml = false;
        /// <summary>
        /// æ˜¾ç¤ºç•Œé¢
        /// </summary>
@@ -186,6 +187,7 @@
            ViewModel.GeomBaseInfo geom_info,
            DPumpHydr.ViewModel.eWizardStepDiretion step_direction, bool isRefreshModel = false)
        {
            _isxml = isRefreshModel;
            if (step_direction == DPumpHydr.ViewModel.eWizardStepDiretion.后退)
            {
                return;
@@ -461,6 +463,10 @@

        private void skyTextBox断面VIIIy1_TextChanged(object sender, EventArgs e)
        {
            if (!_isxml)
            {
                return;
            }
            if (sender is SkyTextBox skytextBox)
            {
                string lastChar = skytextBox.Name[skytextBox.Name.Length - 1].ToString();
@@ -489,6 +495,10 @@

        private void skyTextBox断面VIIIy2_TextChanged(object sender, EventArgs e)
        {
            if (!_isxml)
            {
                return;
            }
            if (sender is SkyTextBox skytextBox)
            {
                string lastChar = skytextBox.Name[skytextBox.Name.Length - 1].ToString();
@@ -597,24 +607,6 @@
                OnRefreshShape.Invoke(paras);
            }

        }

        private void mlBtn更改断面角度_Click(object sender, EventArgs e)
        {
            //if (!RBtn断面对称梯形.Checked && !RBtn不对称梯形.Checked && !RBtn矩形.Checked)
            //{
            //    MessageBox.Show("请先选择断面类型！");
            //    return;
            //}
            //if (string.IsNullOrEmpty(skyTextBox断面y18.Text) || string.IsNullOrEmpty(skyTextBox断面r18.Text))
            //{
            //    //skyLabel提示y2.Visible = false;
            //    //skyLabel提示y1.Visible = false;
            //    //skyLabely1.Visible = true;
            //    //skyLabely2.Visible = true;
            //    //MessageBox.Show("请先输入y1、y2！");
            //    return;
            //}
        }

        private void RBtn断面对称梯形_CheckedChanged(object sender)