From 0f99d4d12f2eae29bbe343f4b3131f2faeccda5d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:20 +0800
Subject: [PATCH] 泵曲线修改
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs | 63 +++++++------------------------
1 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs b/WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs
index a58aed2..45704f4 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/00-core/01-helper/PhartGraphHelper.cs
@@ -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 鑾峰彇瀛樺偍瀛楃涓�
--
Gitblit v1.9.3