From e8260697137f503aa0170b7a36170fd7168e9b80 Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期五, 11 四月 2025 13:50:59 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/DPump/Hydr/Desktop.V1.1
---
WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
index 1e735f3..ca6fc91 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
+++ b/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;
@@ -385,7 +388,37 @@
#region 水体
-
+
+ public bool Create2DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
+ {
+ if (this._is3D)
+ return false;
+
+
+
+
+ ToolTips theToolTips = this.pDisplayView.build2DMidCurve(pHydrGeomArcCurve);
+ if (theToolTips == null)
+ return false;
+ Invalidate(true);
+ pDisplayView.FitAll3DViews(true);
+
+ pDisplayView.set2DMidCurveClr(
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBoudaryColor.R,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBoudaryColor.G,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBoudaryColor.B);
+
+ if (theToolTips.GetTipsId() == 1)
+ {
+ return true;
+ }
+ else
+ {
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
+ MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
+ return false;
+ }
+ }
public bool Create2DWaterBody(HydrEngineCSharp.WaterBodyOuterSpParam pHydrGeomCurve)
{
if (this._is3D)
@@ -411,6 +444,8 @@
}
else
{
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
+ MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
return false ;
}
}
@@ -430,14 +465,39 @@
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)
+ {
+ if (!this._is3D)
+ return null;
+
+ HydrProperties theHydrProperties = new HydrProperties();
+ theHydrProperties.SetShapeGuid(DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyShapeName);
+ theHydrProperties.SetShapeColor(
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.R,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.G,
+ DPumpHydr.WinFrmUI.Volute.GlobalParas.WaterBodyColor.B, 256);
+
+ 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)
{
if (!this._is3D)
@@ -450,7 +510,30 @@
return null;
if (tt.GetTipsId() != 1)
{
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
+ pDisplayView.FitAll3DViews(true);
+ MessageBox.Show(tt.GetToolTips(), "3D提示");
+ }
+ Invalidate(true);
+ return tt;
+ }
+
+ public HydrEngineCSharp.ToolTips Edit3DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
+ {
+ if (!this._is3D)
+ return null;
+ if (pDisplayView.hasBuildThicknessBody())
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.EThicknessBody);
+
+ var tt = pDisplayView.rebuildWaterBody(pHydrGeomArcCurve);
+ if (tt == null)
+ return null;
+ if (tt.GetTipsId() != 1)
+ {
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.EWaterBody);
+ pDisplayView.FitAll3DViews(true);
+ MessageBox.Show(tt.GetToolTips(), "3D提示");
}
Invalidate(true);
--
Gitblit v1.9.3