优化template对象，public方法

qin

2024-05-21 a15bf1762569323ebf47dd094b0f79b33829e76f

优化template对象，public方法

 Hydraulic/Hydro.Core/Base/NodeCalcModel.cs

@@ -50,7 +50,7 @@

        //实际需水量
        [Category("计算结果")]
        [DisplayName("1)实际需水量(m)")]
        [DisplayName("1)实际需水量(m³/h)")]
        [Browsable(true)]
        public float EN_DEMAND { get; set; } = float.NaN;


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

@@ -871,7 +871,7 @@
        /// <param name="point"></param>
        /// <param name="z"></param>
        /// <returns></returns>
        private PointF MapPointToWorldPoint(PointF point, float z = 0)
        public PointF MapPointToWorldPoint(PointF point, float z = 0)
        {
            var pointT = Get俯视角还原Point(point, z);
            pointT = Get平面还原Point(pointT);

 Hydraulic/Hydro.MapView/Base/NodeViewModel.cs

@@ -109,8 +109,8 @@


        [Category("计算参数")]
        [Description("需水量(m)")]
        [DisplayName("需水量(m)")]
        [Description("需水量(m³/h)")]
        [DisplayName("需水量(m³/h)")]
        [Browsable(true)]
        public virtual float Demand { get; set; }


 Hydraulic/Hydro.MapView/Model/ReservoirViewModel.cs

@@ -12,7 +12,7 @@
    {
        [Category("计算参数")]
        [Description("需水量")]
        [DisplayName("需水量(m)")]
        [DisplayName("需水量(m³/h)")]
        [Browsable(false)]
        public new float Demand { get; set; }
        [Category("计算参数")]

 Hydraulic/Hydro.MapView/Template/Template.cs

@@ -60,14 +60,22 @@
        [Browsable(false)]
        public PointF3D OffSet { get; set; } = new PointF3D(0, 0, 0);


        private string _BackGroundImg_FullPath;
        [Browsable(false)]
        public string BackGroundImg_FullPath
        {
            get
            {
                FileInfo fi = new FileInfo(FullPath);
                return fi.FullName.Substring(0, fi.FullName.Length - fi.Extension.Length) + ".png";
                if (string.IsNullOrEmpty(_BackGroundImg_FullPath))
                {
                    FileInfo fi = new FileInfo(FullPath);
                    return fi.FullName.Substring(0, fi.FullName.Length - fi.Extension.Length) + ".png";
                }
                else return _BackGroundImg_FullPath;
            }
            set
            {
                _BackGroundImg_FullPath = value;
            }
        }