冲突解决

qin

2024-05-06 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c

 Hydraulic/Hydro.MapUI/Map/MapViewer.Model.cs

@@ -39,11 +39,12 @@

        #region 新增管网
        [Browsable(false)]
        public Template _newTemplate { get; set; } = new Template();
        public Template _newTemplate { get; set; } = null;// new Template();
        MapViewNetWork _NewNet
        {
            get
            {
                if (_newTemplate==null) _newTemplate = new Template();
                if (_newTemplate.network == null) _newTemplate.network = new MapViewNetWork(); 
                return _newTemplate.network;
            }
@@ -189,13 +190,43 @@
        private const float MaxZoom = 1000.0f;

        [DisplayName("缩放系数")]
        public float zoom { get { return mapOption.zoom; }set { mapOption.zoom = value; } }
        public float zoom 
        { 
            get
            { 
                return mapOption.zoom;
            }
            set
            { 
                mapOption.zoom = value; 
            } 
        }
        [DisplayName("旋转角度")]
        public double Rotation { get { return mapOption.rotation; } set { mapOption.rotation = value; } }
        public double Rotation 
        {
            get
            {
                return mapOption.rotation; 
            } 
            set 
            { 
                mapOption.rotation = value; 
            } 
        }
        
        private double Rotation0 = 0;
        [Browsable(false)]
        public PointF MapCenter { get { return mapOption.Center; } set { mapOption.Center = value; } }
        public PointF MapCenter 
        { 
            get 
            { 
                return mapOption.Center; 
            } 
            set 
            { 
                mapOption.Center = value; 
            } 
        }
        private PointF MapCenter0;
        private bool is3Dview = false;
        double 俯视角度_start = 90;
@@ -206,13 +237,15 @@
        [DisplayName("俯视角度")]
        public double RotationF 
        { 
            get {
            get 
            {
                if (Lock2DView) 
                    mapOption.rotationF = 90;
                
                return mapOption.rotationF; 
            } 
            set { 
            set 
            { 
                
                if (Lock2DView) 
                    mapOption.rotationF = 90;