From 252d49eda4ac2b61d0c72ee0c1839779f0ce1d3a Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 04 六月 2024 00:16:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1

---
 Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs |   67 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
index 8a0d553..9c0cfe6 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
@@ -146,6 +146,7 @@
             this.鎺掑垪ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator();
             this.妤煎眰绠$悊ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.姘撮噺鍒嗛厤ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSplitButton1 = new System.Windows.Forms.ToolStripSplitButton();
             this.閲嶇疆ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -237,7 +238,6 @@
             this.鍙嶉�塗oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.timer_draw = new System.Windows.Forms.Timer(this.components);
             this.map = new Hydro.MapUI.DMap();
-            this.姘撮噺鍒嗛厤ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.statusStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -616,8 +616,8 @@
             this.姘村钩鏃嬭浆ToolStripMenuItem,
             this.杞存棆杞琓oolStripMenuItem,
             this.杞撮暅鍍廡oolStripMenuItem,
-            this.toolStripSeparator7,
             this.缂╂斁ToolStripMenuItem,
+            this.toolStripSeparator7,
             this.鍏抽榾鍒嗘瀽ToolStripMenuItem,
             this.杩為�氭�ф鏌oolStripMenuItem1,
             this.涓嬫父杩為�氭�oolStripMenuItem,
@@ -634,7 +634,8 @@
             this.瀵归綈ToolStripMenuItem,
             this.鎺掑垪ToolStripMenuItem,
             this.toolStripSeparator22,
-            this.妤煎眰绠$悊ToolStripMenuItem});
+            this.妤煎眰绠$悊ToolStripMenuItem,
+            this.姘撮噺鍒嗛厤ToolStripMenuItem});
             this.toolStripDropDownButton_宸ュ叿.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton_宸ュ叿.Image")));
             this.toolStripDropDownButton_宸ュ叿.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripDropDownButton_宸ュ叿.Name = "toolStripDropDownButton_宸ュ叿";
@@ -647,7 +648,7 @@
             this.toolStripTextBox_姘村钩鏃嬭浆瑙掑害});
             this.姘村钩鏃嬭浆ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("姘村钩鏃嬭浆ToolStripMenuItem.Image")));
             this.姘村钩鏃嬭浆ToolStripMenuItem.Name = "姘村钩鏃嬭浆ToolStripMenuItem";
-            this.姘村钩鏃嬭浆ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.姘村钩鏃嬭浆ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.姘村钩鏃嬭浆ToolStripMenuItem.Text = "姘村钩鏃嬭浆";
             this.姘村钩鏃嬭浆ToolStripMenuItem.Click += new System.EventHandler(this.姘村钩鏃嬭浆ToolStripMenuItem_Click);
             // 
@@ -662,20 +663,20 @@
             // 
             this.杞存棆杞琓oolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("杞存棆杞琓oolStripMenuItem.Image")));
             this.杞存棆杞琓oolStripMenuItem.Name = "杞存棆杞琓oolStripMenuItem";
-            this.杞存棆杞琓oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.杞存棆杞琓oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.杞存棆杞琓oolStripMenuItem.Text = "杞存棆杞�";
             // 
             // 杞撮暅鍍廡oolStripMenuItem
             // 
             this.杞撮暅鍍廡oolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("杞撮暅鍍廡oolStripMenuItem.Image")));
             this.杞撮暅鍍廡oolStripMenuItem.Name = "杞撮暅鍍廡oolStripMenuItem";
-            this.杞撮暅鍍廡oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.杞撮暅鍍廡oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.杞撮暅鍍廡oolStripMenuItem.Text = "杞撮暅鍍�";
             // 
             // toolStripSeparator7
             // 
             this.toolStripSeparator7.Name = "toolStripSeparator7";
-            this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
+            this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
             // 
             // 缂╂斁ToolStripMenuItem
             // 
@@ -685,7 +686,7 @@
             this.toolStripMenuItem_缂╁皬2鍊峿);
             this.缂╂斁ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("缂╂斁ToolStripMenuItem.Image")));
             this.缂╂斁ToolStripMenuItem.Name = "缂╂斁ToolStripMenuItem";
-            this.缂╂斁ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.缂╂斁ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.缂╂斁ToolStripMenuItem.Text = "缂╂斁";
             this.缂╂斁ToolStripMenuItem.Click += new System.EventHandler(this.缂╂斁ToolStripMenuItem_Click);
             // 
@@ -699,14 +700,14 @@
             // toolStripMenuItem_鏀惧ぇ2鍊�
             // 
             this.toolStripMenuItem_鏀惧ぇ2鍊�.Name = "toolStripMenuItem_鏀惧ぇ2鍊�";
-            this.toolStripMenuItem_鏀惧ぇ2鍊�.Size = new System.Drawing.Size(160, 22);
+            this.toolStripMenuItem_鏀惧ぇ2鍊�.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItem_鏀惧ぇ2鍊�.Text = "鏀惧ぇ2鍊�";
             this.toolStripMenuItem_鏀惧ぇ2鍊�.Click += new System.EventHandler(this.缂╂斁ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem_缂╁皬2鍊�
             // 
             this.toolStripMenuItem_缂╁皬2鍊�.Name = "toolStripMenuItem_缂╁皬2鍊�";
-            this.toolStripMenuItem_缂╁皬2鍊�.Size = new System.Drawing.Size(160, 22);
+            this.toolStripMenuItem_缂╁皬2鍊�.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItem_缂╁皬2鍊�.Text = "缂╁皬2鍊�";
             this.toolStripMenuItem_缂╁皬2鍊�.Click += new System.EventHandler(this.缂╂斁ToolStripMenuItem_Click);
             // 
@@ -716,7 +717,7 @@
             this.鍏抽榾鍒嗘瀽涓嶈�冭檻姘存簮ToolStripMenuItem});
             this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("鍏抽榾鍒嗘瀽ToolStripMenuItem.Image")));
             this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Name = "鍏抽榾鍒嗘瀽ToolStripMenuItem";
-            this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Text = "鍏抽榾鍒嗘瀽";
             this.鍏抽榾鍒嗘瀽ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽榾鎼滅储鑰冭檻姘存簮ToolStripMenuItem_Click);
             // 
@@ -731,7 +732,7 @@
             // 
             this.杩為�氭�ф鏌oolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("杩為�氭�ф鏌oolStripMenuItem1.Image")));
             this.杩為�氭�ф鏌oolStripMenuItem1.Name = "杩為�氭�ф鏌oolStripMenuItem1";
-            this.杩為�氭�ф鏌oolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
+            this.杩為�氭�ф鏌oolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
             this.杩為�氭�ф鏌oolStripMenuItem1.Text = "杩為�氭�ф鏌�";
             this.杩為�氭�ф鏌oolStripMenuItem1.Click += new System.EventHandler(this.杩為�氭�ф鏌oolStripMenuItem1_Click);
             // 
@@ -739,7 +740,7 @@
             // 
             this.涓嬫父杩為�氭�oolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("涓嬫父杩為�氭�oolStripMenuItem.Image")));
             this.涓嬫父杩為�氭�oolStripMenuItem.Name = "涓嬫父杩為�氭�oolStripMenuItem";
-            this.涓嬫父杩為�氭�oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.涓嬫父杩為�氭�oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.涓嬫父杩為�氭�oolStripMenuItem.Text = "涓嬫父杩為�氭��";
             this.涓嬫父杩為�氭�oolStripMenuItem.Click += new System.EventHandler(this.涓嬫父杩為�氭�oolStripMenuItem_Click);
             // 
@@ -747,14 +748,14 @@
             // 
             this.涓婃父杩為�氭�oolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("涓婃父杩為�氭�oolStripMenuItem.Image")));
             this.涓婃父杩為�氭�oolStripMenuItem.Name = "涓婃父杩為�氭�oolStripMenuItem";
-            this.涓婃父杩為�氭�oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.涓婃父杩為�氭�oolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.涓婃父杩為�氭�oolStripMenuItem.Text = "涓婃父杩為�氭��";
             // 
             // 鏍囬珮鎺ㄦ祴ToolStripMenuItem
             // 
             this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("鏍囬珮鎺ㄦ祴ToolStripMenuItem.Image")));
             this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Name = "鏍囬珮鎺ㄦ祴ToolStripMenuItem";
-            this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Text = "鏍囬珮鎺ㄦ祴";
             this.鏍囬珮鎺ㄦ祴ToolStripMenuItem.Click += new System.EventHandler(this.鏍囬珮鎺ㄦ祴ToolStripMenuItem_Click);
             // 
@@ -762,7 +763,7 @@
             // 
             this.鏍囬珮瀵煎嚭ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("鏍囬珮瀵煎嚭ToolStripMenuItem.Image")));
             this.鏍囬珮瀵煎嚭ToolStripMenuItem.Name = "鏍囬珮瀵煎嚭ToolStripMenuItem";
-            this.鏍囬珮瀵煎嚭ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鏍囬珮瀵煎嚭ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鏍囬珮瀵煎嚭ToolStripMenuItem.Text = "鏍囬珮瀵煎嚭";
             this.鏍囬珮瀵煎嚭ToolStripMenuItem.Click += new System.EventHandler(this.鏍囬珮瀵煎嚭ToolStripMenuItem_Click);
             // 
@@ -770,28 +771,28 @@
             // 
             this.鏄剧ず姘存祦ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("鏄剧ず姘存祦ToolStripMenuItem.Image")));
             this.鏄剧ず姘存祦ToolStripMenuItem.Name = "鏄剧ず姘存祦ToolStripMenuItem";
-            this.鏄剧ず姘存祦ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鏄剧ず姘存祦ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鏄剧ず姘存祦ToolStripMenuItem.Text = "鏄剧ず姘存祦璺嚎";
             this.鏄剧ず姘存祦ToolStripMenuItem.Click += new System.EventHandler(this.鏄剧ず姘存祦ToolStripMenuItem_Click);
             // 
             // 鏂瑰悜淇ToolStripMenuItem
             // 
             this.鏂瑰悜淇ToolStripMenuItem.Name = "鏂瑰悜淇ToolStripMenuItem";
-            this.鏂瑰悜淇ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鏂瑰悜淇ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鏂瑰悜淇ToolStripMenuItem.Text = "鏂瑰悜淇";
             this.鏂瑰悜淇ToolStripMenuItem.Click += new System.EventHandler(this.鏂瑰悜淇ToolStripMenuItem_Click);
             // 
             // toolStripSeparator12
             // 
             this.toolStripSeparator12.Name = "toolStripSeparator12";
-            this.toolStripSeparator12.Size = new System.Drawing.Size(145, 6);
+            this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
             // 
             // 澶嶅埗ToolStripMenuItem
             // 
             this.澶嶅埗ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("澶嶅埗ToolStripMenuItem.Image")));
             this.澶嶅埗ToolStripMenuItem.Name = "澶嶅埗ToolStripMenuItem";
             this.澶嶅埗ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
-            this.澶嶅埗ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.澶嶅埗ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.澶嶅埗ToolStripMenuItem.Text = "澶嶅埗";
             this.澶嶅埗ToolStripMenuItem.Click += new System.EventHandler(this.澶嶅埗ToolStripMenuItem_Click);
             // 
@@ -800,21 +801,21 @@
             this.绮樿创ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("绮樿创ToolStripMenuItem.Image")));
             this.绮樿创ToolStripMenuItem.Name = "绮樿创ToolStripMenuItem";
             this.绮樿创ToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
-            this.绮樿创ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.绮樿创ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.绮樿创ToolStripMenuItem.Text = "绮樿创";
             this.绮樿创ToolStripMenuItem.Click += new System.EventHandler(this.绮樿创ToolStripMenuItem1_Click);
             // 
             // 鍒犻櫎ToolStripMenuItem1
             // 
             this.鍒犻櫎ToolStripMenuItem1.Name = "鍒犻櫎ToolStripMenuItem1";
-            this.鍒犻櫎ToolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
+            this.鍒犻櫎ToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
             this.鍒犻櫎ToolStripMenuItem1.Text = "鍒犻櫎";
             this.鍒犻櫎ToolStripMenuItem1.Click += new System.EventHandler(this.鍒犻櫎ToolStripMenuItem_Click);
             // 
             // toolStripSeparator15
             // 
             this.toolStripSeparator15.Name = "toolStripSeparator15";
-            this.toolStripSeparator15.Size = new System.Drawing.Size(145, 6);
+            this.toolStripSeparator15.Size = new System.Drawing.Size(177, 6);
             // 
             // 瀵归綈ToolStripMenuItem
             // 
@@ -825,7 +826,7 @@
             this.绔栫洿瀵归綈ToolStripMenuItem,
             this.鑷姩瀵归綈ToolStripMenuItem});
             this.瀵归綈ToolStripMenuItem.Name = "瀵归綈ToolStripMenuItem";
-            this.瀵归綈ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.瀵归綈ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.瀵归綈ToolStripMenuItem.Text = "瀵归綈";
             // 
             // toolStripSeparator16
@@ -868,21 +869,27 @@
             // 鎺掑垪ToolStripMenuItem
             // 
             this.鎺掑垪ToolStripMenuItem.Name = "鎺掑垪ToolStripMenuItem";
-            this.鎺掑垪ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.鎺掑垪ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.鎺掑垪ToolStripMenuItem.Text = "鎺掑垪";
             // 
             // toolStripSeparator22
             // 
             this.toolStripSeparator22.Name = "toolStripSeparator22";
-            this.toolStripSeparator22.Size = new System.Drawing.Size(145, 6);
+            this.toolStripSeparator22.Size = new System.Drawing.Size(177, 6);
             // 
             // 妤煎眰绠$悊ToolStripMenuItem
             // 
             this.妤煎眰绠$悊ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("妤煎眰绠$悊ToolStripMenuItem.Image")));
             this.妤煎眰绠$悊ToolStripMenuItem.Name = "妤煎眰绠$悊ToolStripMenuItem";
-            this.妤煎眰绠$悊ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.妤煎眰绠$悊ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
             this.妤煎眰绠$悊ToolStripMenuItem.Text = "妤煎眰绠$悊";
             this.妤煎眰绠$悊ToolStripMenuItem.Click += new System.EventHandler(this.妤煎眰绠$悊ToolStripMenuItem_Click);
+            // 
+            // 姘撮噺鍒嗛厤ToolStripMenuItem
+            // 
+            this.姘撮噺鍒嗛厤ToolStripMenuItem.Name = "姘撮噺鍒嗛厤ToolStripMenuItem";
+            this.姘撮噺鍒嗛厤ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
+            this.姘撮噺鍒嗛厤ToolStripMenuItem.Text = "姘撮噺鍒嗛厤";
             // 
             // toolStripSeparator8
             // 
@@ -1591,12 +1598,6 @@
             this.map.Name = "map";
             this.map.Size = new System.Drawing.Size(1051, 554);
             this.map.TabIndex = 8;
-            // 
-            // 姘撮噺鍒嗛厤ToolStripMenuItem
-            // 
-            this.姘撮噺鍒嗛厤ToolStripMenuItem.Name = "姘撮噺鍒嗛厤ToolStripMenuItem";
-            this.姘撮噺鍒嗛厤ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.姘撮噺鍒嗛厤ToolStripMenuItem.Text = "姘撮噺鍒嗛厤";
             // 
             // MapViewer
             // 

--
Gitblit v1.9.3