From 9cc5bf68aaab46f33f2b00f8dcef0ab52ced0c41 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期五, 27 十二月 2024 10:17:12 +0800
Subject: [PATCH] 添加出口口径初始化

---
 WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs |   83 ++++++++++++++++++++++++-----------------
 1 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs
index 4ace27c..ea04f60 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs
@@ -4,8 +4,7 @@
 using System.IO;
 using System.Text;
 using System.Linq;
-using HydrEngineCSharp;
-using DPumpHydr.WinFrmUI.Volute.ViewModel;
+using HydrEngineCSharp; 
 
 namespace DPumpHydr.WinFrmUI.Volute
 {
@@ -61,40 +60,52 @@
             this._occDesign2dCtrl.RefreshSingleSectShape18(para);
             this._sectAreaDockPanel.SetBindingData(para);
         }
-        double m_dTopValue = 1.0;
-        double m_dBtmValue = 1.0;
+        //double m_dTopValue = 1.0;
+        //double m_dBtmValue = 1.0;
         private WaterBodyOuterParam m_theWaterBodyOuterParam;
-        private bool CreateWaterBody(DPumpHydr.WinFrmUI.Volute.ViewModel.OtuflowParas  otuflowParas)
+        private bool CreateWaterBody(DPumpHydr.WinFrmUI.Volute.ViewModel.OtuflowParas outflowParas)
         {
-            if (_ctrlSetOutflowStyle == null)
+            if (_ctrlSetOutflowStyle == null || outflowParas == null)
             {
                 return false ;
             }
             
-            double dOuterOffset = 0.0;
-            double dOuterHigh = 420.0;
-            double dOuterRad = 80.0;
-            double dOuterTopValue = m_dTopValue;
-            double dOuterBtmValue = m_dBtmValue;
-            double dH1 = 10;
-            double dH2 = 10;
-            double m_dRadConner = 8;
+            //double dOuterOffset = 0.0;
+            //double dOuterHigh = 420.0;
+            //double dOuterRad = 80.0;
+            //double dOuterTopValue = m_dTopValue;
+            //double dOuterBtmValue = m_dBtmValue;
+            //double dH1 = 10;
+            //double dH2 = 10;
+            //double m_dRadConner = 8;
             if(m_theWaterBodyOuterParam != null)
             {
-                return EditWaterBody();
+                return EditWaterBody(outflowParas);
             }
             m_theWaterBodyOuterParam = new WaterBodyOuterParam();
-        m_theWaterBodyOuterParam.SetOuterOffset(dOuterOffset);
-            m_theWaterBodyOuterParam.SetOuterHigh(dOuterHigh);
-            m_theWaterBodyOuterParam.SetOuterRad(dOuterRad);
-            m_theWaterBodyOuterParam.SetTopValue1(dOuterTopValue);
-            m_theWaterBodyOuterParam.SetBtmValue1(dOuterBtmValue);
-            m_theWaterBodyOuterParam.SetTopValue2(dOuterTopValue);
-            m_theWaterBodyOuterParam.SetBtmValue2(dOuterBtmValue);
-            m_theWaterBodyOuterParam.SetH1(dH1);
-            m_theWaterBodyOuterParam.SetH2(dH2);
-            m_theWaterBodyOuterParam.SetRadConner(m_dRadConner);
-          var   m_theHydrGeomSplineParam = this._occDesign2dCtrl.Create2DWaterBody(m_theWaterBodyOuterParam);
+            //m_theWaterBodyOuterParam.SetOuterOffset(dOuterOffset);
+            //m_theWaterBodyOuterParam.SetOuterHigh(dOuterHigh);
+            //m_theWaterBodyOuterParam.SetOuterRad(dOuterRad);
+            //m_theWaterBodyOuterParam.SetTopValue1(dOuterTopValue);
+            //m_theWaterBodyOuterParam.SetBtmValue1(dOuterBtmValue);
+            //m_theWaterBodyOuterParam.SetTopValue2(dOuterTopValue);
+            //m_theWaterBodyOuterParam.SetBtmValue2(dOuterBtmValue);
+            //m_theWaterBodyOuterParam.SetH1(dH1);
+            //m_theWaterBodyOuterParam.SetH2(dH2);
+            //m_theWaterBodyOuterParam.SetRadConner(m_dRadConner);
+
+            m_theWaterBodyOuterParam.SetOuterOffset(outflowParas.Offset);
+            m_theWaterBodyOuterParam.SetOuterHigh(outflowParas.Heigh);
+            m_theWaterBodyOuterParam.SetOuterRad(outflowParas.Dia/2);
+            m_theWaterBodyOuterParam.SetTopValue1(outflowParas.Tangent_Top_Right);
+            m_theWaterBodyOuterParam.SetBtmValue1(outflowParas.Tangent_Btm_Right);
+            m_theWaterBodyOuterParam.SetTopValue2(outflowParas.Tangent_Top_Left);
+            m_theWaterBodyOuterParam.SetBtmValue2(outflowParas.Tangent_Btm_Left);
+            m_theWaterBodyOuterParam.SetH1(outflowParas.H1);
+            m_theWaterBodyOuterParam.SetH2(outflowParas.H2);
+            m_theWaterBodyOuterParam.SetRadConner(outflowParas.Septalradius);
+
+            var   m_theHydrGeomSplineParam = this._occDesign2dCtrl.Create2DWaterBody(m_theWaterBodyOuterParam);
             if (!m_theHydrGeomSplineParam.IsEmpty())
             {
                 this._occDesign3dCtrl.Create3DWaterBody(m_theWaterBodyOuterParam, m_theHydrGeomSplineParam);
@@ -103,15 +114,19 @@
             return true;
         }
 
-        private bool EditWaterBody()
+        private bool EditWaterBody(DPumpHydr.WinFrmUI.Volute.ViewModel.OtuflowParas outflowParas)
         {
-            m_dTopValue += 0.1;
-            m_dBtmValue += 0.1;
-            m_theWaterBodyOuterParam.SetTopValue1(m_dTopValue);
-            m_theWaterBodyOuterParam.SetBtmValue1(m_dBtmValue);
-            m_theWaterBodyOuterParam.SetTopValue2(m_dTopValue);
-            m_theWaterBodyOuterParam.SetBtmValue2(m_dBtmValue);
-           var  m_theHydrGeomSplineParam = this._occDesign2dCtrl.Create2DWaterBody(m_theWaterBodyOuterParam);
+            m_theWaterBodyOuterParam.SetOuterOffset(outflowParas.Offset);
+            m_theWaterBodyOuterParam.SetOuterHigh(outflowParas.Heigh);
+            m_theWaterBodyOuterParam.SetOuterRad(outflowParas.Dia / 2);
+            m_theWaterBodyOuterParam.SetTopValue1(outflowParas.Tangent_Top_Right);
+            m_theWaterBodyOuterParam.SetBtmValue1(outflowParas.Tangent_Btm_Right);
+            m_theWaterBodyOuterParam.SetTopValue2(outflowParas.Tangent_Top_Left);
+            m_theWaterBodyOuterParam.SetBtmValue2(outflowParas.Tangent_Btm_Left);
+            m_theWaterBodyOuterParam.SetH1(outflowParas.H1);
+            m_theWaterBodyOuterParam.SetH2(outflowParas.H2);
+            m_theWaterBodyOuterParam.SetRadConner(outflowParas.Septalradius);
+            var  m_theHydrGeomSplineParam = this._occDesign2dCtrl.Create2DWaterBody(m_theWaterBodyOuterParam);
             this._occDesign3dCtrl.Edit3DWaterBody(m_theWaterBodyOuterParam, m_theHydrGeomSplineParam);
 
             return true;

--
Gitblit v1.9.3