From c7621b10414bcba9031acb29f0de3af9a1a7a751 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 12 三月 2025 08:44:30 +0800
Subject: [PATCH] 监测分析bug修复
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs
index c2bdab6..3072183 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs
@@ -1,7 +1,4 @@
-锘縰sing Yw.DAL.PostgreSql;
-using Yw.WinFrmUI.Phart;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class UniversalChartEditCtrl : DevExpress.XtraEditors.XtraUserControl
{
@@ -17,16 +14,14 @@
/// </summary>
public void SetBindingData(Yw.Vmo.PhartDiagramExGraphListVmo vmo)
{
- _vmo=vmo;
+ _vmo = vmo;
if (vmo == null)
{
return;
- }
- var curveInfo = vmo.GraphList[0].GetCurveInfo();
- this.universalChartExcelEditCtrl1.SetBindingData(curveInfo.Item1, curveInfo.Item3);
+ }
+ var (curve_type, feat_type, define_pt_list, line_pt_list) = vmo.GraphList[0].GetCurveInfo();
+ this.universalChartExcelEditCtrl1.SetBindingData(curve_type, define_pt_list, feat_type);
}
-
-
/// <summary>
/// 鑾峰彇
@@ -37,11 +32,14 @@
return default;
if (!this.universalChartExcelEditCtrl1.Get(out Yw.Ahart.eFeatType feat_type, out List<Yw.Geometry.Point2d> pt_list))
return default;
+
var curve_type = (Yw.Ahart.eCurveType)_vmo.GraphList[0].GraphType;
- var ds_stirng = pt_list.ToDbString(curve_type, feat_type);
- if (string.IsNullOrEmpty(ds_stirng))
- return default;
- _vmo.GraphList[0].GeometryInfo = ds_stirng;
+ _vmo.GraphList[0].GeometryParas = new Yw.WinFrmUI.Phart.CurveGeometryParasViewModel
+ {
+ DefinePoints = pt_list
+ }.ToJson();
+ _vmo.GraphList[0].GeometryInfo = pt_list.ToDbString(curve_type, feat_type);
+
return _vmo;
}
--
Gitblit v1.9.3