冲突解决

qinjie

2023-12-19 c34f05eace8f6aefe1cdc2f77f5bfa17bd25a260

 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>(); }

        }