tangxu
2024-12-24 af9e62d8fbcdbd18821671f198480289c66d36de
添加出口
已删除14个文件
已修改6个文件
3339 ■■■■■ 文件已修改
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/DesignDraw1.cs 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/DesignDraw1.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ViewModel/eOutflowStyle.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/centralExitControl.Designer.cs 481 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/centralExitControl.cs 358 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/centralExitControl.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowStyle.Designer.cs 161 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowStyle.cs 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowStyle.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowType.Designer.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/ctrlSetOutflowType.resx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sideCurveExitControl.Designer.cs 310 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sideCurveExitControl.cs 214 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sideCurveExitControl.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sideLineExitControl.cs 357 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sidelineExitControl.Designer.cs 481 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/出水设计/sidelineExitControl.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_Occ.cs
@@ -4,6 +4,7 @@
using System.IO;
using System.Text;
using System.Linq;
using HydrEngineCSharp;
namespace DPumpHydr.WinFrmUI.Volute
{
@@ -50,7 +51,7 @@
        }
        //更新单个断面
        private void RefreshSectShapeSingle18( ViewModel.SectionShapePara para)
        private void RefreshSectShapeSingle18(ViewModel.SectionShapePara para)
        {
            this._sectionBundleInfo.FromSectionShapePara(para);
@@ -59,5 +60,60 @@
            this._occDesign2dCtrl.RefreshSingleSectShape18(para);
            this._sectAreaDockPanel.SetBindingData(para);
        }
        double m_dTopValue = 1.0;
        double m_dBtmValue = 1.0;
        private WaterBodyOuterParam m_theWaterBodyOuterParam;
        private bool CreateWaterBody()
        {
            if (_ctrlSetOutflowStyle == 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;
            if(m_theWaterBodyOuterParam != null)
            {
                return EditWaterBody();
            }
            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);
            if (!m_theHydrGeomSplineParam.IsEmpty())
            {
                this._occDesign3dCtrl.Create3DWaterBody(m_theWaterBodyOuterParam, m_theHydrGeomSplineParam);
            }
            return true;
        }
        private bool EditWaterBody()
        {
            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);
            this._occDesign3dCtrl.Edit3DWaterBody(m_theWaterBodyOuterParam, m_theHydrGeomSplineParam);
            return true;
        }
    }
}
WinFrmUI/DPumpHydr.WinFrmUI.Volute/MainViewPage_StepInfo.cs
@@ -17,7 +17,7 @@
        ctrlGeomBaseInfo _ctrlGeomBaseInfo = null;
        ctrlSectionBundleInfo _ctrlSectionBundleInfo = null;
        ctrlSectionShapeInfo18 _ctrlSectionShapeInfo18 = null;
        ctrlSetOutflowStyle _ctrlSetOutflowStyle = null;
        ctrlSetOutflowParas _ctrlSetOutflowStyle = null;
        ctrlSetOutflowType _ctrlSetOutflowType = null;
        //参数
@@ -298,31 +298,13 @@
                _type = _ctrlSetOutflowType.GetBindingData();
                if (_ctrlSetOutflowStyle == null)
                {
                    _ctrlSetOutflowStyle = new ctrlSetOutflowStyle();
                    _ctrlSetOutflowStyle = new ctrlSetOutflowParas();
                    _ctrlSetOutflowStyle.Name = "ctrlSetOutflowStyle";
                    //HydrEngineCSharp.BcGePoint theMidCurveFilletPtOnBase = new HydrEngineCSharp.BcGePoint();
                    //HydrEngineCSharp.BcGePoint theMidCurveFilletPtOnOuter = new HydrEngineCSharp.BcGePoint();
                    //this._occDesign2dCtrl.CreateWaterBody(theMidCurveFilletPtOnBase, theMidCurveFilletPtOnOuter);
                    //theMidCurveFilletPtOnBase = this._occDesign2dCtrl.get2DMidCurveFilletPtOnBase();
                    //theMidCurveFilletPtOnOuter = this._occDesign2dCtrl.get2DMidCurveFilletPtOnOuter();
                    //this._occDesign3dCtrl.CreateWaterBody(theMidCurveFilletPtOnBase, theMidCurveFilletPtOnOuter);
                    _ctrlSetOutflowStyle.OnRefreshShape += CreateWaterBody;
                }
                else
                {//编辑
                    //this._occDesign2dCtrl.EditOutletFlow(   );
                    //HydrEngineCSharp.BcGePoint theMidCurveFilletPtOnBase = new HydrEngineCSharp.BcGePoint();
                    //HydrEngineCSharp.BcGePoint theMidCurveFilletPtOnOuter = new HydrEngineCSharp.BcGePoint();
                    //theMidCurveFilletPtOnBase = this._occDesign2dCtrl.get2DMidCurveFilletPtOnBase();
                    //theMidCurveFilletPtOnOuter = this._occDesign2dCtrl.get2DMidCurveFilletPtOnOuter();
                    //this._occDesign3dCtrl.EditOutletFlow(  theMidCurveFilletPtOnBase, theMidCurveFilletPtOnOuter );
                }
                _ctrlSetOutflowStyle.SetBindingData(_type);
                _ctrlSetOutflowStyle.ShowPage();
                this._sectAreaDockPanel.RefreshControl();
                this._sectAreaDockPanel.Visible = true;
                AddStepParaCtrl(_ctrlSetOutflowStyle);
WinFrmUI/DPumpHydr.WinFrmUI.Volute/Occ/OccDesignBaseCtrl.cs
@@ -412,14 +412,48 @@
        }
        public HydrGeomSplineParam Create2DWaterBody(WaterBodyOuterParam theWaterBodyOuterParam)
        {
            if (!this._is3D)
            if (this._is3D)
                return null;
            bool bSucc = pDisplayView.build2DMidCurve(theWaterBodyOuterParam);
            Invalidate(true);
            pDisplayView.FitAll3DViews(true);
            if (bSucc)
            {
                pDisplayView.build2DMidCurve(theWaterBodyOuterParam);
                Invalidate(true);
                pDisplayView.FitAll3DViews(true);
                return pDisplayView.getHydrGeomSplineParam();
            }
            return new HydrGeomSplineParam();
            else
            {
                return null;
            }
        }
        public void Create3DWaterBody(WaterBodyOuterParam theWaterBodyOuterParam, HydrGeomSplineParam theHydrGeomSplineParam)
        {
            if (!this._is3D)
                return;
            {
                string wstrName = "水体";
                string wstrShapeNameI = wstrName;
                HydrGeomCurve theHydrGeomCurve = HydrDisplayEngineBridge.CreateGeomCurve(HydrCurveType.EHydrGeomCircle);
                HydrProperties theHydrProperties = new HydrProperties();
                theHydrProperties.SetShapeName(wstrShapeNameI);
                theHydrGeomCurve.SetHydrProperties(theHydrProperties);
                pDisplayView.buildWaterBody(wstrShapeNameI, theHydrGeomSplineParam, theWaterBodyOuterParam);
                Invalidate(true);
                pDisplayView.FitAll3DViews(true);
            }
        }
        public void Edit3DWaterBody(WaterBodyOuterParam theWaterBodyOuterParam, HydrGeomSplineParam theHydrGeomSplineParam)
        {
            if (!this._is3D)
                return;
            {
                pDisplayView.rebuildWaterBody(theHydrGeomSplineParam, theWaterBodyOuterParam);
                Invalidate(true);
                pDisplayView.FitAll3DViews(true);
            }
        }
    }
}
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/DesignDraw1.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/DesignDraw1.resx
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ViewModel/eOutflowStyle.cs
@@ -8,6 +8,7 @@
{
    public enum eOutflowStyle
    {
        æœªçŸ¥=-1,
        ä¸­å¿ƒå‡ºå£_垂直法兰面流出 = 0,
        ä¾§é¢å‡ºå£_曲线连接 = 1,
        ä¾§é¢å‡ºå£_直线连接 = 2
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/centralExitControl.Designer.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/centralExitControl.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/centralExitControl.resx
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowStyle.Designer.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowStyle.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowStyle.resx
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowType.Designer.cs
@@ -34,7 +34,6 @@
            RBtn侧面出口直线 = new RLT.Controls.RibbonRadioButton();
            RBtn中心出口 = new RLT.Controls.RibbonRadioButton();
            RBtn侧面出口曲线 = new RLT.Controls.RibbonRadioButton();
            designDraw11 = new DesignDraw1();
            thunderGroupBox1.SuspendLayout();
            SuspendLayout();
            // 
@@ -103,6 +102,7 @@
            RBtn侧面出口直线.CircleBorderColor = System.Drawing.Color.FromArgb(117, 120, 117);
            RBtn侧面出口直线.CircleEdgeColor = System.Drawing.Color.WhiteSmoke;
            RBtn侧面出口直线.CompositingQualityType = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
            RBtn侧面出口直线.Enabled = false;
            RBtn侧面出口直线.Font = new System.Drawing.Font("Tw Cen MT Condensed Extra Bold", 8F, System.Drawing.FontStyle.Bold);
            RBtn侧面出口直线.ForeColor = System.Drawing.Color.FromArgb(40, 40, 40);
            RBtn侧面出口直线.Location = new System.Drawing.Point(10, 79);
@@ -156,19 +156,11 @@
            RBtn侧面出口曲线.TextRenderingType = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
            RBtn侧面出口曲线.CheckedChanged += RBtn侧面出口曲线_CheckedChanged;
            // 
            // designDraw11
            //
            designDraw11.Location = new System.Drawing.Point(10, 354);
            designDraw11.Name = "designDraw11";
            designDraw11.Size = new System.Drawing.Size(300, 329);
            designDraw11.TabIndex = 27;
            //
            // ctrlSetOutflowType
            // 
            AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            BackColor = System.Drawing.SystemColors.ControlLight;
            Controls.Add(designDraw11);
            Controls.Add(thunderGroupBox1);
            Controls.Add(metroTile出口图片);
            Controls.Add(crownLabel4);
@@ -188,6 +180,5 @@
        private RLT.Controls.RibbonRadioButton RBtn侧面出口直线;
        private RLT.Controls.RibbonRadioButton RBtn中心出口;
        private RLT.Controls.RibbonRadioButton RBtn侧面出口曲线;
        private DesignDraw1 designDraw11;
    }
}
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/ctrlSetOutflowType.resx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema
    Version 2.0
@@ -48,7 +48,7 @@
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sideCurveExitControl.Designer.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sideCurveExitControl.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sideCurveExitControl.resx
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sideLineExitControl.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sidelineExitControl.Designer.cs
ÎļþÒÑɾ³ý
WinFrmUI/DPumpHydr.WinFrmUI.Volute/³öË®Éè¼Æ/sidelineExitControl.resx
ÎļþÒÑɾ³ý