Client/DesktopDebugFwOpen/Program.cs
@@ -18,6 +18,10 @@ Application.SetCompatibleTextRenderingDefault(false); DPumpHydr.OpenModel.ApiRequest apiRequest = new OpenModel.ApiRequest(); apiRequest.StepNumber = 1; DPumpHydr.OpenFwUI.Volute.MainWindow mainWindow = new OpenFwUI.Volute.MainWindow(); var apiResult = mainWindow.Show(apiRequest); // Application.Run(new Form1()); Model/DPumpHydr.Model.Open/ApiRequest/ApiRequest.cs
ÎļþÃû´Ó Model/DPumpHydr.Model.Open/ApiRequest.cs ÐÞ¸Ä @@ -12,7 +12,9 @@ /// 设计æ¥éª¤ /// </summary> public int StepNumber { get; set; } /// <summary> /// /// </summary> public DPumpHydr.OpenModel.DesignParameter DesignParameter { get; set; } } } Model/DPumpHydr.Model.Open/ApiResult/ApiResult.cs
ÎļþÃû´Ó Model/DPumpHydr.Model.Open/ApiResult.cs ÐÞ¸Ä @@ -22,7 +22,10 @@ public string Message { get; set; } /// <summary> ///è®¾è®¡åæ° /// </summary> public DesignParameter DesignParameter { get; set; } /// <summary> Model/DPumpHydr.Model.Open/ApiResult/ApiResultCode.cs
Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj
@@ -39,10 +39,12 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> <Compile Include="ApiRequest.cs" /> <Compile Include="ApiResult.cs" /> <Compile Include="ApiResultCode.cs" /> <Compile Include="DesignParameter.cs" /> <Compile Include="ApiRequest\ApiRequest.cs" /> <Compile Include="ApiResult\ApiResult.cs" /> <Compile Include="ApiResult\ApiResultCode.cs" /> <Compile Include="DesginParameters\OutflowParas\eOutflowStyle.cs" /> <Compile Include="DesginParameters\OutflowParas\OutflowParas.cs" /> <Compile Include="DesginParameters\DesignParameter.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> Model/DPumpHydr.Model.Open/DesginParameters/DesignParameter.cs
ÎļþÃû´Ó Model/DPumpHydr.Model.Open/DesignParameter.cs ÐÞ¸Ä @@ -6,7 +6,8 @@ namespace DPumpHydr.OpenModel { public class DesignParameter public class DesignParameter { public OutflowParas OutflowParas { get; set; } } } Model/DPumpHydr.Model.Open/DesginParameters/OutflowParas/OutflowParas.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,95 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.OpenModel { public class OutflowParas { public OutflowParas() { ShapeStyle = DPumpHydr.OpenModel.eOutflowShapeStyle.æªç¥; LinkStyle = DPumpHydr.OpenModel.eOutflowLinkStyle.æ²çº¿; this.Tangent_Top_Right = 1; this.Tangent_Btm_Right = 1; this.Tangent_Top_Left = 1; this.Tangent_Btm_Left = 1; } public OutflowParas(OutflowParas rhs) { this.ShapeStyle = rhs.ShapeStyle; this.LinkStyle = rhs.LinkStyle; this.Offset = rhs.Offset; this.Heigh = rhs.Heigh; this.Dia = rhs.Dia; this.Tangent_Top_Right = rhs.Tangent_Top_Right; this.Tangent_Btm_Right = rhs.Tangent_Btm_Right; this.Tangent_Top_Left = rhs.Tangent_Top_Left; this.Tangent_Btm_Left = rhs.Tangent_Btm_Left; this.H1 = rhs.H1; this.H2 = rhs.H2; this.R1 = rhs.R1; this.R2 = rhs.R2; this.Septalradius = rhs.Septalradius; } public DPumpHydr.OpenModel.eOutflowShapeStyle ShapeStyle { get; set; } public DPumpHydr.OpenModel.eOutflowLinkStyle LinkStyle { get; set; } /// <summary> /// ä¸å¿è·ç¦» å¾çä¸çA /// </summary> public double Offset { get; set; } //å¾çä¸çA = 0.0; /// <summary> /// åºå£é¿åº¦ å¾çä¸L /// </summary> public double Heigh { get; set; } //å¾çä¸çL = 420.0; /// <summary> /// åºå£å®½åº¦ å¾çä¸çD4 /// </summary> public double Dia { get; set; } //å¾çä¸çD4 = 80.0; /// <summary> /// å³ä¸æ²çº¿ç¼©æ¾é /// </summary> public double Tangent_Top_Right { get; set; } //å线缩æ¾é = m_dTopValue; /// <summary> /// å³ä¸æ²çº¿ç¼©æ¾é /// </summary> public double Tangent_Btm_Right { get; set; } //å线缩æ¾é = m_dBtmValue; /// <summary> /// 左䏿²çº¿ç¼©æ¾é /// </summary> public double Tangent_Top_Left { get; set; } //å线缩æ¾é = m_dTopValue; /// <summary> /// 左䏿²çº¿ç¼©æ¾é /// </summary> public double Tangent_Btm_Left { get; set; } //å线缩æ¾é = m_dBtmValue; /// <summary> /// å弧龿¥æ¶R1 /// </summary> public double R1 { get; set; }//åå¼§è¿æ¥æ¶çR1 /// <summary> /// å弧龿¥æ¶R2 /// </summary> public double R2 { get; set; }//åå¼§è¿æ¥æ¶çR2 /// <summary> /// åºå£ä¸æ²çº¿æåå¼§ä¹é´çé«åº¦ å·¦ /// </summary> public double H1 { get; set; } //å¾çä¸çH1 = 10; /// <summary> /// åºå£ä¸æ²çº¿æåå¼§ä¹é´çé«åº¦ å³ /// </summary> public double H2 { get; set; } //å¾çä¸çH2 = 10; /// <summary> /// å²èåå¾ /// </summary> public double Septalradius { get; set; } //éèåå¾r } } Model/DPumpHydr.Model.Open/DesginParameters/OutflowParas/eOutflowStyle.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.OpenModel { public enum eOutflowShapeStyle { æªç¥=-1, ä¸å¿åºå£ = 0, ä¾§é¢åºå£ = 1, ä¾§é¢å¯¹é½åºå£ = 2 } public enum eOutflowLinkStyle { æ²çº¿ = 0, ç´çº¿åå¼§ = 1, } } OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj
@@ -56,6 +56,9 @@ <DependentUpon>StepForm1.cs</DependentUpon> </Compile> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="ViewModel\eOutflowStyle.cs" /> <Compile Include="ViewModel\OutflowParas.cs" /> <Compile Include="ViewModel\OutflowStyleHelper.cs" /> <EmbeddedResource Include="StepForm1.resx"> <DependentUpon>StepForm1.cs</DependentUpon> </EmbeddedResource> OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs
@@ -10,6 +10,21 @@ { public DPumpHydr.OpenModel.ApiResult Show(DPumpHydr.OpenModel.ApiRequest Request) { if (Request.DesignParameter == null) { return new OpenModel.ApiResult() { Code = OpenModel.ApiResultCode.Error, Message = "DesignParameter 为空" }; } if (Request.StepNumber == 3) { if (Request.DesignParameter.OutflowParas == null) { return new OpenModel.ApiResult() { Code = OpenModel.ApiResultCode.Error, Message = "OutflowParas 为空" }; } var vm = new DPumpHydr.WinFrmUI.Volute.ViewModel.OutflowParas(); vm.Dia = Request.DesignParameter.OutflowParas.Dia; vm.H1 = Request.DesignParameter.OutflowParas.H1; } StepForm1 frm = new StepForm1(); frm.ShowDialog(); DPumpHydr.OpenModel.ApiResult apiResult = new OpenModel.ApiResult(); OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/OutflowParas.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,127 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.WinFrmUI.Volute.ViewModel { public class OutflowParas { public OutflowParas() { ShapeStyle = ViewModel.eOutflowShapeStyle.æªç¥; LinkStyle = ViewModel.eOutflowLinkStyle.æ²çº¿; this.Tangent_Top_Right = 1; this.Tangent_Btm_Right = 1; this.Tangent_Top_Left = 1; this.Tangent_Btm_Left = 1; } public OutflowParas(OutflowParas rhs) { this.ShapeStyle = rhs.ShapeStyle; this.LinkStyle = rhs.LinkStyle; this.Offset = rhs.Offset; this.Heigh = rhs.Heigh; this.Dia = rhs.Dia; this.Tangent_Top_Right = rhs.Tangent_Top_Right; this.Tangent_Btm_Right = rhs.Tangent_Btm_Right; this.Tangent_Top_Left = rhs.Tangent_Top_Left; this.Tangent_Btm_Left = rhs.Tangent_Btm_Left; this.H1 = rhs.H1; this.H2 = rhs.H2; this.R1 = rhs.R1; this.R2 = rhs.R2; this.Septalradius = rhs.Septalradius; } public ViewModel.eOutflowShapeStyle ShapeStyle { get; set; } public ViewModel.eOutflowLinkStyle LinkStyle { get; set; } /// <summary> /// ä¸å¿è·ç¦» å¾çä¸çA /// </summary> public double Offset { get; set; } //å¾çä¸çA = 0.0; /// <summary> /// åºå£é¿åº¦ å¾çä¸L /// </summary> public double Heigh { get; set; } //å¾çä¸çL = 420.0; /// <summary> /// åºå£å®½åº¦ å¾çä¸çD4 /// </summary> public double Dia { get; set; } //å¾çä¸çD4 = 80.0; /// <summary> /// å³ä¸æ²çº¿ç¼©æ¾é /// </summary> public double Tangent_Top_Right { get; set; } //å线缩æ¾é = m_dTopValue; /// <summary> /// å³ä¸æ²çº¿ç¼©æ¾é /// </summary> public double Tangent_Btm_Right { get; set; } //å线缩æ¾é = m_dBtmValue; /// <summary> /// 左䏿²çº¿ç¼©æ¾é /// </summary> public double Tangent_Top_Left { get; set; } //å线缩æ¾é = m_dTopValue; /// <summary> /// 左䏿²çº¿ç¼©æ¾é /// </summary> public double Tangent_Btm_Left { get; set; } //å线缩æ¾é = m_dBtmValue; /// <summary> /// å弧龿¥æ¶R1 /// </summary> public double R1 { get; set; }//åå¼§è¿æ¥æ¶çR1 /// <summary> /// å弧龿¥æ¶R2 /// </summary> public double R2 { get; set; }//åå¼§è¿æ¥æ¶çR2 /// <summary> /// åºå£ä¸æ²çº¿æåå¼§ä¹é´çé«åº¦ å·¦ /// </summary> public double H1 { get; set; } //å¾çä¸çH1 = 10; /// <summary> /// åºå£ä¸æ²çº¿æåå¼§ä¹é´çé«åº¦ å³ /// </summary> public double H2 { get; set; } //å¾çä¸çH2 = 10; /// <summary> /// å²èåå¾ /// </summary> public double Septalradius { get; set; } //éèåå¾r } public static class GeometryHelper { // å°è§åº¦ä»åº¦è½¬æ¢ä¸ºå¼§åº¦ public static double DegreesToRadians(double degrees) { return degrees * Math.PI / 180.0; } // è®¡ç®æåæ ç¹ public static PointD AdsPolar(PointD startPoint, double angleInRadians, double distance) { double newX = startPoint.X + distance * Math.Cos(angleInRadians); double newY = startPoint.Y + distance * Math.Sin(angleInRadians); return new PointD(newX, newY); } } public struct PointD { public double X { get; set; } public double Y { get; set; } public PointD(double x, double y) { X = x; Y = y; } } public class OutflowParasCalcReponse { public bool IsSuccess { get; set; } public double SectArea9 { get; set; } //9 æªé¢é¢ç§¯ public double SectArea10 { get; set; } //10 æªé¢é¢ç§¯ } } OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/OutflowStyleHelper.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,33 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.WinFrmUI.Volute { internal class OutflowStyleHelper { /// <summary> /// æªé¢å¼å§è§åº¦ /// </summary> /// <param name="style"></param> /// <returns></returns> public static double GetSectStartAngle(DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle style) { if (style == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.ä¾§é¢åºå£) { return 0; } else if (style == DPumpHydr.WinFrmUI.Volute.ViewModel.eOutflowShapeStyle.ä¾§é¢å¯¹é½åºå£ ) { return 0; } else { return -HydrEngineCSharp.HydrDisplayEngineBridge.PI_4; } } } } OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/eOutflowStyle.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; namespace DPumpHydr.WinFrmUI.Volute.ViewModel { public enum eOutflowShapeStyle { æªç¥=-1, ä¸å¿åºå£ = 0, ä¾§é¢åºå£ = 1, ä¾§é¢å¯¹é½åºå£ = 2 } public enum eOutflowLinkStyle { æ²çº¿ = 0, ç´çº¿åå¼§ = 1, } }