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
ÎļþÒÑɾ³ý