冲突

duheng

2024-12-11 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef

 Service/HStation.Service.PhartRelation.Core/05-service/00-core/PerformCurveHelper.cs

@@ -26,6 +26,7 @@
                        }
                    }
                    break;

                case eGraphType.PumpQP:
                    {
                        var curveQP = Yw.Pump.CurveQPHelper.ToModel(geometryInfo);
@@ -35,6 +36,7 @@
                        }
                    }
                    break;

                case eGraphType.PumpQE:
                    {
                        var curveQE = Yw.Pump.CurveQEHelper.ToModel(geometryInfo);
@@ -44,6 +46,7 @@
                        }
                    }
                    break;

                case eGraphType.ValveQL:
                    {
                        var cubic_spline_ql = new Yw.Geometry.CubicSpline2d(geometryInfo);
@@ -53,6 +56,17 @@
                        }
                    }
                    break;

                case eGraphType.ValveOL:
                    {
                        var cubic_spline_ol = new Yw.Geometry.CubicSpline2d(geometryInfo);
                        if (cubic_spline_ol != null)
                        {
                            pts = cubic_spline_ol.GetPointList(pointNumber, minSpace);
                        }
                    }
                    break;

                default: break;
            }
            return pts;
@@ -61,26 +75,28 @@
        /// <summary>
        /// to 存储字符串
        /// </summary>
        public static string ToDbString(eGraphType graphType, Yw.Pump.eFeatType featType, List<Yw.Geometry.Point2d> pts)
        public static string ToDbString(eGraphType graphType, Yw.Ahart.eFeatType featType, List<Yw.Geometry.Point2d> pts)
        {
            var dbString = string.Empty;
            if (pts == null || pts.Count < 1)
            {
                return dbString;
            }
            Yw.Pump.IFeatCurve featCurve = null;
            Yw.Ahart.IFeatCurve featCurve = null;
            switch (featType)
            {
                case Yw.Pump.eFeatType.Polynomial:
                case Yw.Ahart.eFeatType.Polynomial:
                    {
                        featCurve = new Yw.Pump.PolynomialCurve(pts);
                        featCurve = new Yw.Ahart.PolynomialCurve(pts);
                    }
                    break;
                case Yw.Pump.eFeatType.Cubic:

                case Yw.Ahart.eFeatType.Cubic:
                    {
                        featCurve = new Yw.Pump.CubicCurve(pts);
                        featCurve = new Yw.Ahart.CubicCurve(pts);
                    }
                    break;

                default: break;
            }
            if (featCurve == null || featCurve.IsInvalid())
@@ -96,24 +112,24 @@
                        dbString = curveQH.ToDbString();
                    }
                    break;

                case eGraphType.PumpQP:
                    {
                        var curveQP = new Yw.Pump.CurveQP(featType, featCurve);
                        dbString = curveQP.ToDbString();
                    }
                    break;

                case eGraphType.PumpQE:
                    {
                        var curveQE = new Yw.Pump.CurveQE(featType, featCurve);
                        dbString = curveQE.ToDbString();
                    }
                    break;

                default: break;
            }
            return dbString;
        }



    }
}
}