From 4db7d08bb295be33e80f1353f58fcea4a8da6127 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 10 六月 2024 19:11:39 +0800
Subject: [PATCH] 2024年6月10日
---
WinfrmUI/Hydro.WinfrmUI.Browser/Viewer.cs | 182 +++++++++++++++++----------------------------
1 files changed, 68 insertions(+), 114 deletions(-)
diff --git a/WinfrmUI/Hydro.WinfrmUI.Browser/Viewer.cs b/WinfrmUI/Hydro.WinfrmUI.Browser/Viewer.cs
index bf552ba..477dc20 100644
--- a/WinfrmUI/Hydro.WinfrmUI.Browser/Viewer.cs
+++ b/WinfrmUI/Hydro.WinfrmUI.Browser/Viewer.cs
@@ -16,6 +16,7 @@
using Hydro.MapView;
using Hydro.MapView.Common;
using Newtonsoft.Json;
+using DevExpress.Utils;
namespace Hydro.WinfrmUI
{
@@ -181,8 +182,6 @@
SetMapInvalidate();
}
}
-
- 鍒锋柊妤煎眰ToolStripMenuItem_Click(1, new EventArgs());
if (OnChangeViewCenter != null)
{
@@ -1917,12 +1916,12 @@
if (e.KeyCode == Keys.C && e.Modifiers == Keys.Control)
{
- 澶嶅埗ToolStripMenuItem_Click(1, new EventArgs());
+ 澶嶅埗ToolStripMenuItem();
}
if (e.KeyCode == Keys.V && e.Modifiers == Keys.Control)
{
_ClickStartPos = Cursor.Position;
- 绮樿创ToolStripMenuItem1_Click(1, new EventArgs());
+ 绮樿创ToolStripMenuItem();
}
if (e.KeyCode == Keys.D1 && e.Modifiers == Keys.Control)
{
@@ -2104,12 +2103,7 @@
SetMapInvalidate();
}
- public void 鍒犻櫎ToolStripMenuItem_Click(object sender, EventArgs e)
- {
- DeleteChoosedObj();
- }
-
- private void DeleteChoosedObj()
+ public void DeleteChoosedObj()
{
var list = _Network.Remove(selectedObjs);
MapObjectExtensions.AddCommand(_Network, "Remove", null, list);
@@ -2172,7 +2166,7 @@
#region 鍒嗘瀽宸ュ叿
- private void 姘村钩鏃嬭浆ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 姘村钩鏃嬭浆ToolStripMenuItem()
{
//var objs = GlobalObject.PropertyForm.selectionSet.selectedObjects;
//var selectobjs = objs.FindAll(o => o is NodeViewModel); //GlobalObject.PropertyForm.listBox1.SelectedItems;
@@ -2348,7 +2342,7 @@
//LoadData();
}
- public void 鍏抽榾鎼滅储ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鍏抽榾鎼滅储ToolStripMenuItem()
{
if (selectedObjs.Count > 0)//&& selectedObjs[0] is Link l
{
@@ -2367,7 +2361,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void 鍏抽榾鎼滅储鑰冭檻姘存簮ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鍏抽榾鎼滅储鑰冭檻姘存簮ToolStripMenuItem()
{
if (selectedObjs.Count > 0)//&& selectedObjs[0] is Link l
{
@@ -2627,63 +2621,27 @@
#region 鏄剧ず閫夐」
- private void 鏄剧ず鑺傜偣ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず鑺傜偣ToolStripMenuItem()
{
_ShowJunction = true;
SetMapInvalidate();
}
- private void 闅愯棌鑺傜偣ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 闅愯棌鑺傜偣ToolStripMenuItem()
{
_ShowJunction = false;
SetMapInvalidate();
}
- private void 澶oolStripMenuItem_Click(object sender, EventArgs e)
- {
- var item = sender as ToolStripItem;
- if (item.Text == "澶�")
- {
- junction_multiply = 1f;
- }
- else if (item.Text == "涓�")
- {
- junction_multiply = 0.6667f;
- }
- else
- {
- junction_multiply = 0.4f;
- }
- SetMapInvalidate();
- }
-
- private void 鏄剧ず闃�闂═oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず闃�闂═oolStripMenuItem()
{
_ShowValve = true;
SetMapInvalidate();
}
- private void 闅愯棌闃�闂═oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 闅愯棌闃�闂═oolStripMenuItem()
{
_ShowValve = false;
- SetMapInvalidate();
- }
-
- private void 澶oolStripMenuItem1_Click(object sender, EventArgs e)
- {
- var item = sender as ToolStripItem;
- if (item.Text == "澶�")
- {
- Link_multiply = 1f;
- }
- else if (item.Text == "涓�")
- {
- Link_multiply = 0.6667f;
- }
- else
- {
- Link_multiply = 0.4f;
- }
SetMapInvalidate();
}
@@ -2693,7 +2651,7 @@
#region 鏂规硶
- private void 鏍囬珮鎺ㄦ祴ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏍囬珮鎺ㄦ祴ToolStripMenuItem()
{
int num = UpdateNodesEle();
if (num > 0)
@@ -2769,7 +2727,7 @@
}
}
- private void 鏍囬珮瀵煎嚭ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏍囬珮瀵煎嚭ToolStripMenuItem()
{
DataTable dt = new DataTable();
dt.Columns.Add("ID");
@@ -3011,7 +2969,7 @@
_Network.Calc(_Template.FullPath, GlobalPath.configPath + "config_calc.wdb");
}
- private void 杩為�氭�ф鏌oolStripMenuItem1_Click(object sender, EventArgs e)
+ public void 杩為�氭�ф鏌oolStripMenuItem()
{
if (selectedObjs.Count > 0)//&& selectedObjs[0] is Link l
{
@@ -3026,7 +2984,7 @@
}
}
- private void 涓嬫父杩為�氭�oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 涓嬫父杩為�氭�oolStripMenuItem()
{
if (selectedObjs.Count > 0)//&& selectedObjs[0] is Link l
{
@@ -3043,7 +3001,7 @@
}
}
- public void 澶嶅埗ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 澶嶅埗ToolStripMenuItem()
{
if (hoveredObjs.Count <= 0 || !(hoveredObjs[0] is NodeViewModel))
{
@@ -3075,7 +3033,7 @@
}
}
- public void 绮樿创ToolStripMenuItem1_Click(object sender, EventArgs e)
+ public void 绮樿创ToolStripMenuItem()
{
{
var net = new MapViewNetWork();
@@ -3114,14 +3072,14 @@
SetMapInvalidate();
}
- private void 鏄剧ず鍏ㄩ儴妤煎眰ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず鍏ㄩ儴妤煎眰ToolStripMenuItem()
{
//this.mapOption.ShowFloor = int.MinValue;
_Network.MapObjects.ForEach(o => o.Visible = true);
this.SetMapInvalidate();
}
- private void 淇濆瓨妤煎眰瑙嗚ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 淇濆瓨妤煎眰瑙嗚ToolStripMenuItem()
{
//if (_Template?.Floors!=null)
//{
@@ -3228,7 +3186,7 @@
return projectedPoints;
}
- public void 娣诲姞搴曞浘ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 娣诲姞搴曞浘ToolStripMenuItem()
{
if (_Template == null) return;
OpenFileDialog openFileDialog = new OpenFileDialog();
@@ -3240,13 +3198,13 @@
var backgroundImagePath = openFileDialog.FileName;
Global.ClearFileReadOnly(_Template.BackGroundImg_FullPath);
File.Copy(backgroundImagePath, _Template.BackGroundImg_FullPath, true);
- 璁剧疆搴曞浘ToolStripMenuItem_Click(1, new EventArgs());
+ 璁剧疆搴曞浘ToolStripMenuItem();
}
}
private bool _isSettingBackGroundPictur = false;
- public void 璁剧疆搴曞浘ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 璁剧疆搴曞浘ToolStripMenuItem()
{
string inputValue = "0";// Prompt.ShowDialog("璇疯緭鍏ュ簳鍥炬爣楂�", "");
float BackGroundElev = 0;
@@ -3264,7 +3222,7 @@
this.Cursor = Cursors.Cross;
}
- public void 鏄剧ず闅愯棌搴曞浘ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず闅愯棌搴曞浘ToolStripMenuItem()
{
mapOption.isShowPic = !mapOption.isShowPic;
SetMapInvalidate();
@@ -3272,7 +3230,7 @@
private dict<string, dynamic> param = null;
- public void 娓呴櫎搴曞浘ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 娓呴櫎搴曞浘ToolStripMenuItem()
{
mapOption.isShowPic = false;
SetMapInvalidate();
@@ -3316,7 +3274,7 @@
}
}
- private void 鏄剧ず姘存祦ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず姘存祦ToolStripMenuItem()
{
_Template.network.MapObjects.ForEach(o => o.Selected = false);
selectedObjs.Clear();
@@ -3372,31 +3330,31 @@
this.SetMapInvalidate();
}
- private void 鏄剧ず鐘舵�乀oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず鐘舵�乀oolStripMenuItem()
{
_Template.mapOption._ShowStatus = true;
this.SetMapInvalidate();
}
- private void 闅愯棌鐘舵�乀oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 闅愯棌鐘舵�乀oolStripMenuItem()
{
_Template.mapOption._ShowStatus = false;
this.SetMapInvalidate();
}
- private void 鏄剧ず娴佸悜ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず娴佸悜ToolStripMenuItem()
{
_Template.mapOption._ShowFlowDirection = true;
this.SetMapInvalidate();
}
- private void 闅愯棌娴佸悜ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 闅愯棌娴佸悜ToolStripMenuItem()
{
_Template.mapOption._ShowFlowDirection = false;
this.SetMapInvalidate();
}
- private void 鏂瑰悜淇ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏂瑰悜淇ToolStripMenuItem()
{
_Network.Links.ForEach(l =>
{
@@ -3410,46 +3368,7 @@
});
}
- private void 鍒锋柊妤煎眰ToolStripMenuItem_Click(object sender, EventArgs e)
- {
- ToolStripMenuItem_Floor.DropDownItems.Clear();
- var mapobjects = _Network.MapObjects;
- TagList tags = new TagList();
- foreach (var item in mapobjects)
- {
- if (item.Tags != null)
- tags.AddRange(item.Tags);
- }
- var t = tags.Distinct().ToList();
- tags.Clear();
- tags.AddRange(t);
- for (int i = -10; i < 1000; i++)
- {
- string tagstring = i.ToString() + "妤�";
- if (tags.Contains(tagstring))
- {
- var item = ToolStripMenuItem_Floor.DropDownItems.Add(i.ToString() + "妤�");
- item.Click += (oo, ee) =>
- {
- mapobjects.ForEach(o =>
- {
- if (o.Tags.Contains(tagstring))
- {
- o.Visible = true;
- }
- else
- {
- o.Visible = false;
- }
- });
- this.SetMapInvalidate();
- };
- }
- }
- this.SetMapInvalidate();
- }
-
- private void 鏄剧ず鎵�鏈夐殣钘忓唴瀹筎oolStripMenuItem_Click(object sender, EventArgs e)
+ public void 鏄剧ず鎵�鏈夐殣钘忓唴瀹筎oolStripMenuItem()
{
_Network.MapObjects.ForEach(o => o.Visible = true);
this.SetMapInvalidate();
@@ -3470,7 +3389,7 @@
private bool _isShowDirection = false;
- private void 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem()
{
//Form_Colour form_Colour = new Form_Colour(_Template.Colours);
//form_Colour.Show(this);
@@ -3508,7 +3427,7 @@
this.SetMapInvalidate();
}
- private void 妤煎眰绠＄悊ToolStripMenuItem_Click(object sender, EventArgs e)
+ public void 妤煎眰绠＄悊ToolStripMenuItem()
{
//if (_Template.Regions==null)
//{
@@ -3519,5 +3438,40 @@
}
#endregion 鏂规硶
+
+ private void 涓滆タ瀵归綈ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 涓滆タ瀵归綈ToolStripMenuItem();
+ }
+
+ private void 鍗楀寳瀵归綈ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 鍗楀寳瀵归綈ToolStripMenuItem();
+ }
+
+ private void 绔栫洿瀵归綈ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 绔栫洿瀵归綈ToolStripMenuItem();
+ }
+
+ private void 鑷姩瀵归綈ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 鑷姩瀵归綈ToolStripMenuItem();
+ }
+
+ private void 澶嶅埗ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 澶嶅埗ToolStripMenuItem();
+ }
+
+ private void 绮樿创ToolStripMenuItem1_Click(object sender, EventArgs e)
+ {
+ 绮樿创ToolStripMenuItem();
+ }
+
+ private void 鍒犻櫎ToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DeleteChoosedObj();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3