diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 00e538f..56af06a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 00e538f..56af06a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index d314a3d..e5a3d98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3479,6 +3479,14 @@ j++; } + if (name1.Contains("高程") || name1.Contains("井深") || name1.Contains("深度") || name1.Contains("高度") || name1.Contains("埋深") || name1.Contains("沟道宽") || name1.Contains("沟道高")) + { + name1 = name1 + "_米"; + } + if (name2.Contains("高程") || name2.Contains("井深") || name2.Contains("深度") || name2.Contains("高度") || name2.Contains("埋深") || name2.Contains("沟道宽") || name2.Contains("沟道高")) + { + name2 = name2 + "_米"; + } str += "
" + name1 + "
" + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 00e538f..56af06a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index d314a3d..e5a3d98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3479,6 +3479,14 @@ j++; } + if (name1.Contains("高程") || name1.Contains("井深") || name1.Contains("深度") || name1.Contains("高度") || name1.Contains("埋深") || name1.Contains("沟道宽") || name1.Contains("沟道高")) + { + name1 = name1 + "_米"; + } + if (name2.Contains("高程") || name2.Contains("井深") || name2.Contains("深度") || name2.Contains("高度") || name2.Contains("埋深") || name2.Contains("沟道宽") || name2.Contains("沟道高")) + { + name2 = name2 + "_米"; + } str += "
" + name1 + "
" + diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0522781..000c027 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4122,11 +4122,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4195,6 +4195,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4490,10 +4491,10 @@ this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar4); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); // // // @@ -4533,7 +4534,7 @@ this.buttonItem_Event}); this.ribbonBar4.Location = new System.Drawing.Point(3, 0); this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar4.TabIndex = 0; this.ribbonBar4.Text = "ribbonBar4"; @@ -4581,10 +4582,10 @@ this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4601,7 +4602,6 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; - this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4633,7 +4633,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(791, 92); + this.ribbonBar20.Size = new System.Drawing.Size(791, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6015,7 +6015,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6025,6 +6024,7 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 00e538f..56af06a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index d314a3d..e5a3d98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3479,6 +3479,14 @@ j++; } + if (name1.Contains("高程") || name1.Contains("井深") || name1.Contains("深度") || name1.Contains("高度") || name1.Contains("埋深") || name1.Contains("沟道宽") || name1.Contains("沟道高")) + { + name1 = name1 + "_米"; + } + if (name2.Contains("高程") || name2.Contains("井深") || name2.Contains("深度") || name2.Contains("高度") || name2.Contains("埋深") || name2.Contains("沟道宽") || name2.Contains("沟道高")) + { + name2 = name2 + "_米"; + } str += "
" + name1 + "
" + diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0522781..000c027 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4122,11 +4122,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4195,6 +4195,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4490,10 +4491,10 @@ this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar4); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); // // // @@ -4533,7 +4534,7 @@ this.buttonItem_Event}); this.ribbonBar4.Location = new System.Drawing.Point(3, 0); this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar4.TabIndex = 0; this.ribbonBar4.Text = "ribbonBar4"; @@ -4581,10 +4582,10 @@ this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4601,7 +4602,6 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; - this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4633,7 +4633,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(791, 92); + this.ribbonBar20.Size = new System.Drawing.Size(791, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6015,7 +6015,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6025,6 +6024,7 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c8ffee0..75724dc 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 00e538f..56af06a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index d314a3d..e5a3d98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3479,6 +3479,14 @@ j++; } + if (name1.Contains("高程") || name1.Contains("井深") || name1.Contains("深度") || name1.Contains("高度") || name1.Contains("埋深") || name1.Contains("沟道宽") || name1.Contains("沟道高")) + { + name1 = name1 + "_米"; + } + if (name2.Contains("高程") || name2.Contains("井深") || name2.Contains("深度") || name2.Contains("高度") || name2.Contains("埋深") || name2.Contains("沟道宽") || name2.Contains("沟道高")) + { + name2 = name2 + "_米"; + } str += "
" + name1 + "
" + diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0522781..000c027 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4122,11 +4122,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; @@ -4195,6 +4195,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4490,10 +4491,10 @@ this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel2.Controls.Add(this.ribbonBar4); this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); this.ribbonPanel2.Name = "ribbonPanel2"; this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); // // // @@ -4533,7 +4534,7 @@ this.buttonItem_Event}); this.ribbonBar4.Location = new System.Drawing.Point(3, 0); this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Size = new System.Drawing.Size(211, 59); this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar4.TabIndex = 0; this.ribbonBar4.Text = "ribbonBar4"; @@ -4581,10 +4582,10 @@ this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4601,7 +4602,6 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; - this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -4633,7 +4633,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(791, 92); + this.ribbonBar20.Size = new System.Drawing.Size(791, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6015,7 +6015,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6025,6 +6024,7 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index c8ffee0..75724dc 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index b566d57..8560614 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ