From 5fc444fd4e3a7f94fed8c848211e52012d6c522f Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期一, 14 四月 2025 17:51:44 +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 | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
index 1a99f0e..a2ec9e5 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;
@@ -349,12 +352,27 @@
}
/// <summary>
- ///
+ /// 显示/隐藏1-8断面
/// </summary>
/// <param name="isVisible"></param>
public void SetAllSectionCurveVisible(bool isVisible)
{
for (int i = 8; i >= 1; i--)
+ {
+ string wstrShapeNameI = string.Format("SectShape_{0}", i);
+ if (isVisible)
+ pDisplayView.showVoluteCurve(wstrShapeNameI);
+ else
+ pDisplayView.hideVoluteCurve(wstrShapeNameI);
+ }
+ }
+ /// <summary>
+ /// 显示/隐藏9、10断面
+ /// </summary>
+ /// <param name="isVisible"></param>
+ public void SetAllSection910CurveVisible(bool isVisible)
+ {
+ for (int i = 10; i >= 9; i--)
{
string wstrShapeNameI = string.Format("SectShape_{0}", i);
if (isVisible)
@@ -411,7 +429,8 @@
}
else
{
- MessageBox.Show(theToolTips.GetToolTips(), "提示");
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
+ MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
return false;
}
}
@@ -440,7 +459,8 @@
}
else
{
- MessageBox.Show(theToolTips.GetToolTips(), "提示");
+ pDisplayView.ClearTopoShape(TopoTypeDisplay.E2DMidCurve);
+ MessageBox.Show(theToolTips.GetToolTips(), "2D提示");
return false ;
}
}
@@ -462,6 +482,7 @@
var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomCurve);
if (tt.GetTipsId() != 1)
{
+ MessageBox.Show(tt.GetToolTips(), "3D提示");
}
Invalidate(true);
pDisplayView.FitAll3DViews(true);
@@ -484,6 +505,7 @@
var tt = pDisplayView.buildWaterBody(theHydrProperties, pHydrGeomArcCurve);
if (tt.GetTipsId() != 1)
{
+ MessageBox.Show(tt.GetToolTips(), "3D提示");
}
Invalidate(true);
pDisplayView.FitAll3DViews(true);
@@ -503,7 +525,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 +535,7 @@
}
public HydrEngineCSharp.ToolTips Edit3DWaterBody(HydrEngineCSharp.WaterBodyOuterArcParam pHydrGeomArcCurve)
- {
+ {
if (!this._is3D)
return null;
if (pDisplayView.hasBuildThicknessBody())
@@ -522,7 +546,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);
--
Gitblit v1.9.3