Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1

tx

2025-04-11 e8260697137f503aa0170b7a36170fd7168e9b80

 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_出口_水体.cs

@@ -161,7 +161,7 @@
            double R2 = outflowParas.R2;
            dRadConnerAngle = dRadConnerAngle * HydrDisplayEngineBridge.PI / 180.0;

            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
            {
                if (m_theWaterBodyOuterParam == null || !(m_theWaterBodyOuterParam is HydrEngineCSharp.WaterBodyOuterArcParam))
                m_theWaterBodyOuterParam = HydrDisplayEngineBridge.CreateWaterBodyOuter(WaterBodyOuterType.EWaterBodyOuterArc);
@@ -173,7 +173,7 @@
            }

            // HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurve = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
            {
                HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurveArc = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
                pHydrGeomCurveArc.SetOuterOffset(dOuterOffset);
@@ -208,20 +208,20 @@
        {
            if (outflowParas == null)
                return false;
            if (outflowParas.LinkStyle != ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 || outflowParas.ShapeStyle == ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
            if (outflowParas.LinkStyle != ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 || outflowParas.ShapeStyle == ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
            {
                if (outflowParas.Tangent_Top_Right <= 0 || outflowParas.Tangent_Btm_Right <= 0 ||
                               outflowParas.Tangent_Top_Left <= 0 || outflowParas.Tangent_Btm_Left <= 0)
                    return false;
            }
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
            {
                if (outflowParas.R1 <= 0 || outflowParas.R2 <= 0)
                    return false;
            }

            RefreshOuterParam(outflowParas); //WaterBodyOuterParam
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
            if (outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
            {
                HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomCurveArc = m_theWaterBodyOuterParam as HydrEngineCSharp.WaterBodyOuterArcParam;
                this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomCurveArc);
@@ -279,7 +279,7 @@
            {
                if (_isHaveCreateWaterBody3d == true)
                {
                    if(_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
                    if(_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
                    {
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {
@@ -307,7 +307,7 @@
                else
                {
                    _isHaveCreateWaterBody3d = true;
                    if (_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰鍑哄彛_鐩寸嚎杩炴帴)
                    if (_outflowParas.LinkStyle == ViewModel.eOutflowLinkStyle.鐩寸嚎鍦嗗姬 && _outflowParas.ShapeStyle != ViewModel.eOutflowShapeStyle.渚ч潰瀵归綈鍑哄彛)
                    {
                        if (!this._occDesign2dCtrl.Create2DWaterBody(pHydrGeomArcCurve))
                        {