阀门视图修改

lixiaojun

2025-01-21 f589894c84d47b9671eef6d3a8337b6b51b32edb

 WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs

@@ -157,7 +157,7 @@
                    break;
                case Ahart.eCurveType.QL:
                    {
                        obj=QLGraphParasViewModel.ToModel(graphParas);
                        obj = QLGraphParasViewModel.ToModel(graphParas);
                    }
                    break;
                case Ahart.eCurveType.OL:
@@ -167,7 +167,7 @@
                    break;
                case Ahart.eCurveType.VOL:
                    {
                        obj = VOLGraphParasViewModel.ToModel(graphParas); 
                        obj = VOLGraphParasViewModel.ToModel(graphParas);
                    }
                    break;
                default:
@@ -200,14 +200,14 @@
        /// <summary>
        /// 获取 GeometryParas
        /// </summary>
        public static object GetGeometryParas(Yw.Ahart.eCurveType curveType, string geometryParas)
        public static CurveGeometryParasViewModel GetGeometryParas(Yw.Ahart.eCurveType curveType, string geometryParas)
        {
            if (string.IsNullOrEmpty(geometryParas))
            {
                return default;
            }

            object obj = null;
            CurveGeometryParasViewModel obj = null;
            switch (curveType)
            {
                case Ahart.eCurveType.QH:
@@ -262,23 +262,7 @@
            return obj;
        }

        /// <summary>
        /// 获取 GeometryParas
        /// </summary>
        public static T GetGeometryParas<T>(Yw.Ahart.eCurveType curveType, string graphParas)
        {
            if (string.IsNullOrEmpty(graphParas))
            {
                return default;
            }

            var obj = GetGeometryParas(curveType, graphParas);
            if (obj is T t)
            {
                return t;
            }
            return default;
        }

        #endregion

@@ -287,84 +271,67 @@
        /// <summary>
        /// 获取 AnnotationParas
        /// </summary>
        public static object GetAnnotationParas(Yw.Ahart.eCurveType curveType, string annotationParas)
        public static List<AnnotationParasViewModel> GetAnnotationParasList(Yw.Ahart.eCurveType curveType, string annotationParas)
        {
            if (string.IsNullOrEmpty(annotationParas))
            {
                return default;
            }

            object obj = null;
            List<AnnotationParasViewModel> list = null;
            switch (curveType)
            {
                case Ahart.eCurveType.QH:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.QP:
                    {
                        obj = AnnotationParasViewModel.ToModel(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.QE:
                    {
                        obj = AnnotationParasViewModel.ToModel(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.QNPSH:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.EqualE:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.EqualP:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.QL:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.OL:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                case Ahart.eCurveType.VOL:
                    {
                        obj = AnnotationParasViewModel.ToList(annotationParas);
                        list = AnnotationParasViewModel.ToList(annotationParas);
                    }
                    break;
                default:
                    break;
            }
            return obj;
            return list;
        }

        /// <summary>
        /// 获取 AnnotationParas
        /// </summary>
        public static T GetAnnotationParas<T>(Yw.Ahart.eCurveType curveType, string annotationParas)
        {
            if (string.IsNullOrEmpty(annotationParas))
            {
                return default;
            }

            var obj = GetGeometryParas(curveType, annotationParas);
            if (obj is T t)
            {
                return t;
            }
            return default;
        }
 
        #endregion

        #region 获取存储字符串
@@ -398,6 +365,16 @@
                        featCurve = new Yw.Ahart.ThroughCurve(pts);
                    }
                    break;
                case Yw.Ahart.eFeatType.Quadratic:
                    {
                        featCurve = new Yw.Ahart.QuadraticCurve(pts);
                    }
                    break;
                case Yw.Ahart.eFeatType.Quartic:
                    {
                        featCurve = new Yw.Ahart.QuarticCurve(pts);
                    }
                    break;
            }

            if (featCurve == null || featCurve.IsInvalid())