From c34f05eace8f6aefe1cdc2f77f5bfa17bd25a260 Mon Sep 17 00:00:00 2001
From: qinjie <qinjie@163.com>
Date: 星期二, 19 十二月 2023 15:46:24 +0800
Subject: [PATCH] 冲突解决
---
Hydro.MapBase/Map/MapViewer.Model.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Hydro.MapBase/Map/MapViewer.Model.cs b/Hydro.MapBase/Map/MapViewer.Model.cs
index 6d86daa..cb32b71 100644
--- a/Hydro.MapBase/Map/MapViewer.Model.cs
+++ b/Hydro.MapBase/Map/MapViewer.Model.cs
@@ -1,5 +1,6 @@
锘�//using CloudWaterNetwork.Magnifier;
//using dict_py_Inner;
+using Hydro.Core.Model;
using Hydro.MapView;
using Hydro.MapView.Base;
using System;
@@ -156,15 +157,15 @@
}
[Browsable(false)]
- public List<NodeViewModel> _Nodes
+ public List<NodeCalcModel> _Nodes
{
- get { return _Network?.Nodes??new List<NodeViewModel>(); }
+ get { return _Network?.Nodes??new List<NodeCalcModel>(); }
}
[Browsable(false)]
- public List<LinkViewModel> _Links
+ public List<LinkCalcModel> _Links
{
- get { return _Network?.Links??new List<LinkViewModel>(); }
+ get { return _Network?.Links??new List<LinkCalcModel>(); }
}
--
Gitblit v1.9.3