From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs
index 2f37475..976355a 100644
--- a/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs
@@ -8,19 +8,20 @@
}
+ private Yw.Ahart.eCurveType _curve_type;
/// <summary>
/// 缁戝畾鏁版嵁
/// </summary>
public void SetBindingData(string file_path, Yw.Ahart.eCurveType curve_type)
{
+ _curve_type = curve_type;
var err_msg = Yw.WinFrmUI.PhartExcelHelper.ParseUniversalExcel(file_path, out List<Yw.Geometry.Point2d> list);
if (!string.IsNullOrEmpty(err_msg))
{
XtraMessageBox.Show(err_msg);
return;
}
-
- this.universalChartExcelImportCtrl1.SetBindingData(curve_type, list);
+ this.universalChartExcelEditCtrl.SetBindingData(curve_type, list);
}
@@ -29,7 +30,28 @@
/// </summary>
public Yw.Vmo.PhartDiagramExGraphListVmo Get()
{
- return new();
+ if (!this.universalChartExcelEditCtrl.Get(out Yw.Ahart.eFeatType feat_type, out List<Yw.Geometry.Point2d> pt_list))
+ return default;
+ var ds_stirng = pt_list.ToDbString(_curve_type, feat_type);
+ if (string.IsNullOrEmpty(ds_stirng))
+ return default;
+ var geometry_paras = new Yw.WinFrmUI.Phart.CurveGeometryParasViewModel();
+ geometry_paras.DefinePoints = pt_list;
+
+ var vmo = new Yw.Vmo.PhartDiagramExGraphListVmo();
+ vmo.DiagramType = (int)HStation.PhartRelation.eDiagramType.Feat;
+ vmo.GraphList = new List<Yw.Vmo.PhartGraphVmo>()
+ {
+ new ()
+ {
+ GraphType =(int) _curve_type,
+ GeometryParas= geometry_paras.ToJson(),
+ GeometryStyle = (int) HStation.PhartRelation.eGeometryStyle.FeatCurve,
+ GeometryInfo = ds_stirng
+ }
+ };
+
+ return vmo;
}
--
Gitblit v1.9.3