From ecac1f13b6d1ad22b69687197ee49836d3a84220 Mon Sep 17 00:00:00 2001 From: ningshuxia <ningshuxia0927@outlook.com> Date: 星期一, 17 三月 2025 09:28:01 +0800 Subject: [PATCH] 禁用程序集null引用 --- WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/02-edit/UniversalChartEditCtrl.cs | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 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 c028b1a..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 @@ -8,23 +8,40 @@ } + private Yw.Vmo.PhartDiagramExGraphListVmo _vmo; /// <summary> /// 缁戝畾鏁版嵁 /// </summary> - public void SetBindingData(HStation.Vmo.PhartDiagramRelationExtensionsVmo vmo) - { - + public void SetBindingData(Yw.Vmo.PhartDiagramExGraphListVmo vmo) + { + _vmo = vmo; + if (vmo == null) + { + return; + } + 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> /// 鑾峰彇 /// </summary> - public HStation.Vmo.PhartDiagramRelationExtensionsVmo Get() + public Yw.Vmo.PhartDiagramExGraphListVmo Get() { - return new Vmo.PhartDiagramRelationExtensionsVmo(); - } + if (_vmo == null) + 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; + _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