From 49eb2a09634e439090d4a2b13ec7d6f911d3deaf Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 27 七月 2024 11:44:21 +0800
Subject: [PATCH] fix:修复沿程损失计算异常的问题
---
Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs | 172 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 142 insertions(+), 30 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
index 7cb806d..3c78d51 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Designer.cs
@@ -79,8 +79,9 @@
this.label_center = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel_rotation = new System.Windows.Forms.ToolStripStatusLabel();
this.label_zoom = new System.Windows.Forms.ToolStripStatusLabel();
- this.toolStripStatusLabel_split1 = new System.Windows.Forms.ToolStripStatusLabel();
this.label_mouse = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolStripStatusLabel_split1 = new System.Windows.Forms.ToolStripStatusLabel();
+ this.label_ZZ = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabel_split2 = new System.Windows.Forms.ToolStripStatusLabel();
this.label_file = new System.Windows.Forms.ToolStripStatusLabel();
this.panel1 = new System.Windows.Forms.Panel();
@@ -108,20 +109,21 @@
this.toolStripButton_閲嶅鍣� = new System.Windows.Forms.ToolStripButton();
this.buttonUndo = new System.Windows.Forms.ToolStripButton();
this.buttonRedo = new System.Windows.Forms.ToolStripButton();
- this.toolStripButton_refresh = new System.Windows.Forms.ToolStripButton();
this.toolStripButton_ClearMinor = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton_鍒锋柊 = new System.Windows.Forms.ToolStripButton();
+ this.btn_鎷撴墤妫�鏌� = new System.Windows.Forms.ToolStripButton();
+ this.btn_姘撮噺鍒濆垎閰� = new System.Windows.Forms.ToolStripButton();
this.toolStripDropDownButton_宸ュ叿 = new System.Windows.Forms.ToolStripDropDownButton();
this.姘村钩鏃嬭浆ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripTextBox_姘村钩鏃嬭浆瑙掑害 = new System.Windows.Forms.ToolStripTextBox();
this.杞存棆杞琓oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.杞撮暅鍍廡oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.缂╂斁ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripTextBox_缂╂斁姣斾緥 = new System.Windows.Forms.ToolStripTextBox();
this.toolStripMenuItem_鏀惧ぇ2鍊� = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem_缂╁皬2鍊� = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.鍏抽榾鍒嗘瀽ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.鍏抽榾鍒嗘瀽涓嶈�冭檻姘存簮ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.杩為�氭�ф鏌oolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
@@ -143,6 +145,10 @@
this.绔栫洿瀵归綈ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.鑷姩瀵归綈ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
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.璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem = 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();
@@ -204,6 +210,8 @@
this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator();
this.鍙抽敭_Menu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.瑙嗚ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.榛樿瑙嗚ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator();
this.淇鍥綯oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.姝ｈ鍥綯oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.閲嶇疆瑙嗚ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -230,6 +238,9 @@
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.鍏ㄩ�塗oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.鍙嶉�塗oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.timer_draw = new System.Windows.Forms.Timer(this.components);
+ this.map = new Hydro.MapUI.DMap();
+ this.CubeView = new Hydro.MapUI.DMap();
this.statusStrip1.SuspendLayout();
this.panel1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -242,8 +253,9 @@
this.label_center,
this.toolStripStatusLabel_rotation,
this.label_zoom,
- this.toolStripStatusLabel_split1,
this.label_mouse,
+ this.toolStripStatusLabel_split1,
+ this.label_ZZ,
this.toolStripStatusLabel_split2,
this.label_file});
this.statusStrip1.Location = new System.Drawing.Point(0, 578);
@@ -272,17 +284,24 @@
this.label_zoom.Text = "Zoom锛�1";
this.label_zoom.Click += new System.EventHandler(this.label_zoom_Click);
//
+ // label_mouse
+ //
+ this.label_mouse.Name = "label_mouse";
+ this.label_mouse.Size = new System.Drawing.Size(65, 17);
+ this.label_mouse.Text = "X锛�0 Y锛�0";
+ //
// toolStripStatusLabel_split1
//
this.toolStripStatusLabel_split1.Name = "toolStripStatusLabel_split1";
this.toolStripStatusLabel_split1.Size = new System.Drawing.Size(11, 17);
this.toolStripStatusLabel_split1.Text = "|";
//
- // label_mouse
+ // label_ZZ
//
- this.label_mouse.Name = "label_mouse";
- this.label_mouse.Size = new System.Drawing.Size(65, 17);
- this.label_mouse.Text = "X锛�0 Y锛�0";
+ this.label_ZZ.Name = "label_ZZ";
+ this.label_ZZ.Size = new System.Drawing.Size(71, 17);
+ this.label_ZZ.Text = "姝ｄ氦妯″紡:寮�";
+ this.label_ZZ.Click += new System.EventHandler(this.label_ZZ_Click);
//
// toolStripStatusLabel_split2
//
@@ -326,10 +345,11 @@
this.toolStripButton_閲嶅鍣�,
this.buttonUndo,
this.buttonRedo,
- this.toolStripButton_refresh,
this.toolStripButton_ClearMinor,
this.toolStripSeparator4,
this.toolStripButton_鍒锋柊,
+ this.btn_鎷撴墤妫�鏌�,
+ this.btn_姘撮噺鍒濆垎閰�,
this.toolStripDropDownButton_宸ュ叿,
this.toolStripSeparator8,
this.toolStripSplitButton1,
@@ -341,7 +361,7 @@
this.toolStripSeparator21});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1019, 25);
+ this.toolStrip1.Size = new System.Drawing.Size(1190, 25);
this.toolStrip1.TabIndex = 6;
this.toolStrip1.Text = "toolStrip1";
//
@@ -560,16 +580,6 @@
this.buttonRedo.Text = "閲嶅仛";
this.buttonRedo.Click += new System.EventHandler(this.buttonRedo_Click);
//
- // toolStripButton_refresh
- //
- this.toolStripButton_refresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.toolStripButton_refresh.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton_refresh.Image")));
- this.toolStripButton_refresh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.toolStripButton_refresh.Name = "toolStripButton_refresh";
- this.toolStripButton_refresh.Size = new System.Drawing.Size(23, 22);
- this.toolStripButton_refresh.Text = "璁＄畻灞�閮ㄦ崯澶�";
- this.toolStripButton_refresh.Click += new System.EventHandler(this.toolStripButton_CalcMiniLoss_Click);
- //
// toolStripButton_ClearMinor
//
this.toolStripButton_ClearMinor.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -594,14 +604,32 @@
this.toolStripButton_鍒锋柊.Text = "璁＄畻";
this.toolStripButton_鍒锋柊.Click += new System.EventHandler(this.toolStripButton_璁＄畻_Click);
//
+ // btn_鎷撴墤妫�鏌�
+ //
+ this.btn_鎷撴墤妫�鏌�.Image = ((System.Drawing.Image)(resources.GetObject("btn_鎷撴墤妫�鏌�.Image")));
+ this.btn_鎷撴墤妫�鏌�.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btn_鎷撴墤妫�鏌�.Name = "btn_鎷撴墤妫�鏌�";
+ this.btn_鎷撴墤妫�鏌�.Size = new System.Drawing.Size(76, 22);
+ this.btn_鎷撴墤妫�鏌�.Text = "鎷撴墤妫�鏌�";
+ this.btn_鎷撴墤妫�鏌�.Click += new System.EventHandler(this.btn_鎷撴墤妫�鏌Click);
+ //
+ // btn_姘撮噺鍒濆垎閰�
+ //
+ this.btn_姘撮噺鍒濆垎閰�.Image = ((System.Drawing.Image)(resources.GetObject("btn_姘撮噺鍒濆垎閰�.Image")));
+ this.btn_姘撮噺鍒濆垎閰�.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btn_姘撮噺鍒濆垎閰�.Name = "btn_姘撮噺鍒濆垎閰�";
+ this.btn_姘撮噺鍒濆垎閰�.Size = new System.Drawing.Size(64, 22);
+ this.btn_姘撮噺鍒濆垎閰�.Text = "鍒濆垎閰�";
+ this.btn_姘撮噺鍒濆垎閰�.Click += new System.EventHandler(this.btn_鍒濆垎閰峗Click);
+ //
// toolStripDropDownButton_宸ュ叿
//
this.toolStripDropDownButton_宸ュ叿.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.姘村钩鏃嬭浆ToolStripMenuItem,
this.杞存棆杞琓oolStripMenuItem,
this.杞撮暅鍍廡oolStripMenuItem,
- this.toolStripSeparator7,
this.缂╂斁ToolStripMenuItem,
+ this.toolStripSeparator7,
this.鍏抽榾鍒嗘瀽ToolStripMenuItem,
this.杩為�氭�ф鏌oolStripMenuItem1,
this.涓嬫父杩為�氭�oolStripMenuItem,
@@ -616,7 +644,11 @@
this.鍒犻櫎ToolStripMenuItem1,
this.toolStripSeparator15,
this.瀵归綈ToolStripMenuItem,
- this.鎺掑垪ToolStripMenuItem});
+ this.鎺掑垪ToolStripMenuItem,
+ this.toolStripSeparator22,
+ this.妤煎眰绠＄悊ToolStripMenuItem,
+ this.姘撮噺鍒嗛厤ToolStripMenuItem,
+ this.璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem});
this.toolStripDropDownButton_宸ュ叿.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton_宸ュ叿.Image")));
this.toolStripDropDownButton_宸ュ叿.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton_宸ュ叿.Name = "toolStripDropDownButton_宸ュ叿";
@@ -654,11 +686,6 @@
this.杞撮暅鍍廡oolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.杞撮暅鍍廡oolStripMenuItem.Text = "杞撮暅鍍�";
//
- // toolStripSeparator7
- //
- this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
- //
// 缂╂斁ToolStripMenuItem
//
this.缂╂斁ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -691,6 +718,11 @@
this.toolStripMenuItem_缂╁皬2鍊�.Size = new System.Drawing.Size(160, 22);
this.toolStripMenuItem_缂╁皬2鍊�.Text = "缂╁皬2鍊�";
this.toolStripMenuItem_缂╁皬2鍊�.Click += new System.EventHandler(this.缂╂斁ToolStripMenuItem_Click);
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(145, 6);
//
// 鍏抽榾鍒嗘瀽ToolStripMenuItem
//
@@ -852,6 +884,34 @@
this.鎺掑垪ToolStripMenuItem.Name = "鎺掑垪ToolStripMenuItem";
this.鎺掑垪ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.鎺掑垪ToolStripMenuItem.Text = "鎺掑垪";
+ //
+ // toolStripSeparator22
+ //
+ this.toolStripSeparator22.Name = "toolStripSeparator22";
+ this.toolStripSeparator22.Size = new System.Drawing.Size(145, 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.Text = "妤煎眰绠＄悊";
+ this.妤煎眰绠＄悊ToolStripMenuItem.Click += new System.EventHandler(this.妤煎眰绠＄悊ToolStripMenuItem_Click);
+ //
+ // 姘撮噺鍒嗛厤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.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.Text = "璁＄畻灞�閮ㄦ崯澶�";
+ this.璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem.Click += new System.EventHandler(this.toolStripButton_CalcMiniLoss_Click);
//
// toolStripSeparator8
//
@@ -1284,7 +1344,6 @@
this.cb_Node_Colour.Name = "cb_Node_Colour";
this.cb_Node_Colour.Size = new System.Drawing.Size(75, 25);
this.cb_Node_Colour.SelectedIndexChanged += new System.EventHandler(this.cb_Node_Colour_SelectedIndexChanged);
- this.cb_Node_Colour.Click += new System.EventHandler(this.cb_Node_Colour_Click);
//
// cb_Link_Colour
//
@@ -1294,7 +1353,6 @@
this.cb_Link_Colour.Name = "cb_Link_Colour";
this.cb_Link_Colour.Size = new System.Drawing.Size(75, 25);
this.cb_Link_Colour.SelectedIndexChanged += new System.EventHandler(this.cb_Link_Colour_SelectedIndexChanged);
- this.cb_Link_Colour.Click += new System.EventHandler(this.cb_Link_Colour_Click);
//
// tb_棰滆壊鍒嗙骇璁剧疆
//
@@ -1335,12 +1393,26 @@
// 瑙嗚ToolStripMenuItem
//
this.瑙嗚ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.榛樿瑙嗚ToolStripMenuItem,
+ this.toolStripSeparator23,
this.淇鍥綯oolStripMenuItem,
this.姝ｈ鍥綯oolStripMenuItem,
this.閲嶇疆瑙嗚ToolStripMenuItem});
this.瑙嗚ToolStripMenuItem.Name = "瑙嗚ToolStripMenuItem";
this.瑙嗚ToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
this.瑙嗚ToolStripMenuItem.Text = "瑙嗚";
+ //
+ // 榛樿瑙嗚ToolStripMenuItem
+ //
+ this.榛樿瑙嗚ToolStripMenuItem.Name = "榛樿瑙嗚ToolStripMenuItem";
+ this.榛樿瑙嗚ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
+ this.榛樿瑙嗚ToolStripMenuItem.Text = "榛樿瑙嗚";
+ this.榛樿瑙嗚ToolStripMenuItem.Click += new System.EventHandler(this.榛樿瑙嗚ToolStripMenuItem_Click);
+ //
+ // toolStripSeparator23
+ //
+ this.toolStripSeparator23.Name = "toolStripSeparator23";
+ this.toolStripSeparator23.Size = new System.Drawing.Size(121, 6);
//
// 淇鍥綯oolStripMenuItem
//
@@ -1533,8 +1605,37 @@
this.鍙嶉�塗oolStripMenuItem.Text = "鍙嶉��";
this.鍙嶉�塗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶉�塗oolStripMenuItem_Click);
//
+ // timer_draw
+ //
+ this.timer_draw.Enabled = true;
+ this.timer_draw.Interval = 33;
+ this.timer_draw.Tick += new System.EventHandler(this.timer_draw_Tick);
+ //
+ // map
+ //
+ this.map._newTemplate = null;
+ this.map.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.map.Location = new System.Drawing.Point(0, 24);
+ this.map.mapOption = null;
+ this.map.Name = "map";
+ this.map.Size = new System.Drawing.Size(1051, 554);
+ this.map.TabIndex = 8;
+ //
+ // CubeView
+ //
+ this.CubeView._newTemplate = null;
+ this.CubeView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.CubeView.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.CubeView.Location = new System.Drawing.Point(927, 26);
+ this.CubeView.mapOption = null;
+ this.CubeView.Name = "CubeView";
+ this.CubeView.Size = new System.Drawing.Size(120, 120);
+ this.CubeView.TabIndex = 0;
+ //
// MapViewer
//
+ this.Controls.Add(this.CubeView);
+ this.Controls.Add(this.map);
this.Controls.Add(this.panel1);
this.Controls.Add(this.statusStrip1);
this.Name = "MapViewer";
@@ -1732,7 +1833,6 @@
private ToolStripButton toolStripButton_鏂板缓绔嬬;
private ToolStripMenuItem 鏂瑰悜淇ToolStripMenuItem;
private ToolStripMenuItem 鍒锋柊妤煎眰ToolStripMenuItem;
- private ToolStripButton toolStripButton_refresh;
private ToolStripButton toolStripButton_ClearMinor;
public ToolStripComboBox cb_Link_Colour;
public ToolStripComboBox cb_Node_Colour;
@@ -1740,5 +1840,17 @@
private ToolStripMenuItem 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem;
private ToolStripButton tb_棰滆壊鍒嗙骇璁剧疆;
private ToolStripSeparator toolStripSeparator21;
+ private Timer timer_draw;
+ private ToolStripStatusLabel label_ZZ;
+ private ToolStripSeparator toolStripSeparator22;
+ private ToolStripMenuItem 妤煎眰绠＄悊ToolStripMenuItem;
+ private ToolStripMenuItem 榛樿瑙嗚ToolStripMenuItem;
+ private ToolStripMenuItem 姘撮噺鍒嗛厤ToolStripMenuItem;
+ private ToolStripSeparator toolStripSeparator23;
+ private DMap map;
+ private ToolStripMenuItem 璁＄畻灞�閮ㄦ崯澶盩oolStripMenuItem;
+ private ToolStripButton btn_姘撮噺鍒濆垎閰�;
+ private DMap CubeView;
+ private ToolStripButton btn_鎷撴墤妫�鏌�;
}
}
--
Gitblit v1.9.3