From b825d70578b0ddf6d479569887c194f919795dad Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.Designer.cs | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.Designer.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.Designer.cs
index fcee1c8..442d93e 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/MapViewer.Designer.cs
@@ -1,7 +1,7 @@
锘縰sing System.ComponentModel;
using Timer = System.Windows.Forms.Timer;
-namespace Hydro
+namespace HydroUI
{
partial class MapViewer
@@ -287,10 +287,9 @@
toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripSplitButton2, toolStripButton_save, toolStripSeparator2, toolStripButton_鏅��, toolStripButton_鏂板缓鑺傜偣, toolStripButton_鏂板缓绠＄嚎, toolStripButton_鏂板缓绔嬬, toolStripButton_娣诲姞姘村簱, toolStripButton_娣诲姞姘存睜, toolStripButton_娣诲姞姘存车, toolStripButton_娣诲姞闃�闂�, toolStripButton_娣诲姞姘磋〃, toolStripButton_閲嶅鍣�, buttonUndo, buttonRedo, toolStripButton_ClearMinor, toolStripSeparator4, toolStripButton_鍒锋柊, btn_姘撮噺鍒濆垎閰�, toolStripDropDownButton_宸ュ叿, toolStripSeparator8, toolStripSplitButton1, toolStripComboBox_娴忚妯″紡, toolStripDropDownButton1, cb_Node_Colour, cb_Link_Colour, tb_棰滆壊鍒嗙骇璁剧疆, toolStripSeparator21 });
toolStrip1.Location = new Point(0, 0);
toolStrip1.Name = "toolStrip1";
- toolStrip1.Size = new Size(1344, 28);
+ toolStrip1.Size = new Size(1276, 28);
toolStrip1.TabIndex = 6;
toolStrip1.Text = "toolStrip1";
- toolStrip1.ItemClicked += toolStrip1_ItemClicked;
//
// toolStripSplitButton2
//
@@ -520,8 +519,7 @@
toolStripButton_鍒锋柊.ImageTransparentColor = Color.Magenta;
toolStripButton_鍒锋柊.Name = "toolStripButton_鍒锋柊";
toolStripButton_鍒锋柊.Size = new Size(63, 25);
- toolStripButton_鍒锋柊.Text = "璁＄畻";
- toolStripButton_鍒锋柊.Click += toolStripButton_璁＄畻_Click;
+ toolStripButton_鍒锋柊.Text = "璁＄畻";
//
// btn_姘撮噺鍒濆垎閰�
//
@@ -769,8 +767,7 @@
妤煎眰绠＄悊ToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("妤煎眰绠＄悊ToolStripMenuItem.Image");
妤煎眰绠＄悊ToolStripMenuItem.Name = "妤煎眰绠＄悊ToolStripMenuItem";
妤煎眰绠＄悊ToolStripMenuItem.Size = new Size(182, 26);
- 妤煎眰绠＄悊ToolStripMenuItem.Text = "妤煎眰绠＄悊";
- 妤煎眰绠＄悊ToolStripMenuItem.Click += 妤煎眰绠＄悊ToolStripMenuItem_Click;
+ 妤煎眰绠＄悊ToolStripMenuItem.Text = "妤煎眰绠＄悊";
//
// 姘撮噺鍒嗛厤ToolStripMenuItem
//
@@ -784,8 +781,7 @@
璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Image");
璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Name = "璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem";
璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Size = new Size(182, 26);
- 璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Text = "璁＄畻灞�閮ㄦ崯澶�";
- 璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Click += toolStripButton_CalcMiniLoss_Click;
+ 璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Text = "璁＄畻灞�閮ㄦ崯澶�";
//
// toolStripSeparator8
//
@@ -1157,7 +1153,6 @@
棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem.Name = "棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem";
棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem.Size = new Size(188, 26);
棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem.Text = "棰滆壊鍒嗙骇绠＄悊";
- 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem.Click += 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem_Click;
//
// cb_Node_Colour
//
@@ -1184,7 +1179,6 @@
tb_棰滆壊鍒嗙骇璁剧疆.Name = "tb_棰滆壊鍒嗙骇璁剧疆";
tb_棰滆壊鍒嗙骇璁剧疆.Size = new Size(63, 25);
tb_棰滆壊鍒嗙骇璁剧疆.Text = "鍒嗙骇";
- tb_棰滆壊鍒嗙骇璁剧疆.Click += 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem_Click;
//
// toolStripSeparator21
//
@@ -1655,4 +1649,4 @@
private DMap CubeView;
private PropertyForm propertyForm;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3