1be37dafbdd0ab6e5ca03efe1cb65afd89cc1683..6a407cd9fb759ce68ff289ae26dd854ddc310314
2025-04-15 tx
遗漏
6a407c 对比 | 目录
2025-04-15 tx
遗漏文件
0605dd 对比 | 目录
2025-04-15 tx
添加Open
04f9d0 对比 | 目录
已重命名4个文件
已修改4个文件
已添加5个文件
343 ■■■■■ 文件已修改
Client/DesktopDebugFwOpen/Program.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/ApiRequest/ApiRequest.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/ApiResult/ApiResult.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/ApiResult/ApiResultCode.cs 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/DesginParameters/DesignParameter.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/DesginParameters/OutflowParas/OutflowParas.cs 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/DPumpHydr.Model.Open/DesginParameters/OutflowParas/eOutflowStyle.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/OutflowParas.cs 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/OutflowStyleHelper.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
OpenUI/DPumpHydr.OpenFwUI.Volute/ViewModel/eOutflowStyle.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,
    }
}