core升级

cloudflight

2024-06-17 b62f5f0104845c2a3a74707792ebf28a506e24f1

 Hydraulic/Hydro.MapUI/Map/MapViewer.cs

@@ -1,5 +1,5 @@
//using CloudWaterNetwork.Magnifier;
using DevExpress.XtraEditors;
//using DevExpress.XtraEditors;
using Hydro.CommonBase;
using Hydro.Core.Model;
using Hydro.Inp;
@@ -19,21 +19,21 @@
using System.ComponentModel;
using System.Data;
using System.Data.Common;
using System.Diagnostics;
//using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Runtime.Remoting.Metadata;
//using System.Runtime.InteropServices.WindowsRuntime;
//using System.Runtime.Remoting.Metadata;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Forms.DataVisualization.Charting;
//using System.Windows.Forms.DataVisualization.Charting;
//using static Hydro.Core.ObjectEnum;
using static Hydro.MapView.MapViewEnum;
using static System.Net.Mime.MediaTypeNames;
@@ -106,7 +106,7 @@
        //    DoubleBuffered = true;
        //    SetStyle(ControlStyles.SupportsTransparentBackColor, true);
        //    BackColor = Color.Transparent;

       

        //}
        public MapViewer(bool showToolBar = false)
@@ -114,7 +114,9 @@

            this.showToolBar = showToolBar;
            InitializeComponent();

            //var propertyForm = new PropertyForm();
            //propertyForm.Dock = DockStyle.Right;
            //this.Controls.Add(propertyForm);
            MapCenter = PointF.Empty;
            zoom = 1.0f;
            DoubleBuffered = true;
@@ -142,6 +144,7 @@
        }   
        private void MapViewer_Load(object sender, EventArgs e)
        {
            GlobalObject.PropertyForm = this.propertyForm;
            this.panel1.Visible = _showToolBar;
            this.statusStrip1.Visible = _showStatusBar;

@@ -1803,7 +1806,7 @@
        {
            if (_filePath == null) return;
            FileInfo fi = new FileInfo(_filePath);
            Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
            System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
            //System.Diagnostics.Process.Start("explorer.exe", fi.Directory.FullName);
        }
        private void EPA中打开ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1811,7 +1814,7 @@
            if (_filePath == null) return;


            Process.Start(@"epanetH\Epanet2wH.exe", _filePath);
            System.Diagnostics.Process.Start(@"epanetH\Epanet2wH.exe", _filePath);
        }
        private void 保存ToolStripMenuItem_Click(object sender, EventArgs e)
        {
@@ -3726,13 +3729,13 @@
        {
            if (_filePath == null) return;
            FileInfo fi = new FileInfo(_filePath);
            Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
            System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
        }
        private void label_file_Click(object sender, EventArgs e)
        {
            if (_filePath == null) return;
            FileInfo fi = new FileInfo(_filePath);
            Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
            System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
        }
        private void 设为立管点ToolStripMenuItem_Click(object sender, EventArgs e)
        {