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/Occ/OccDesignBaseCtrl.cs

@@ -41,7 +41,10 @@
        }


        public virtual void SetDimVisible(bool isVisible)
        {

        }


        protected void OnMouseDown(object sender, MouseEventArgs e)
@@ -186,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;
@@ -411,6 +414,8 @@
            }
            else
            {
                pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
                MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
                return false;
            }
        }
@@ -439,6 +444,8 @@
            }
            else
            {
                pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
                MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
                return false  ;
            }
        }
@@ -458,9 +465,12 @@
            if (pDisplayView.hasBuildThicknessBody())
                pDisplayView.ClearTopoShape(TopoTypeDisplay.EThicknessBody);
           var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomCurve);
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);
            pDisplayView.FitAll3DViews(true);

            return tt;
        }
        public HydrEngineCSharp.ToolTips Create3DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
@@ -478,9 +488,14 @@
            if (pDisplayView.hasBuildThicknessBody())
                pDisplayView.ClearTopoShape(TopoTypeDisplay.EThicknessBody);
            var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomArcCurve);
            if (tt.GetTipsId() != 1)
            {
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);
            pDisplayView.FitAll3DViews(true);

            
            return tt;
        }
        public HydrEngineCSharp.ToolTips Edit3DWaterBody(HydrEngineCSharp.WaterBodyOuterSpParam pHydrGeomCurve)
@@ -495,7 +510,9 @@
                return null;
            if (tt.GetTipsId() != 1)
            {

                pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
                pDisplayView.FitAll3DViews(true);
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);

@@ -503,7 +520,7 @@
        }

        public HydrEngineCSharp.ToolTips Edit3DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
        {
         {
            if (!this._is3D)
                return null;
            if (pDisplayView.hasBuildThicknessBody())
@@ -514,7 +531,9 @@
                return null;
            if (tt.GetTipsId() != 1)
            {

                pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
                pDisplayView.FitAll3DViews(true);
                MessageBox.Show(tt.GetToolTips(), "3D提示");
            }
            Invalidate(true);