diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 8b9c935..8d0505f 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 8b9c935..8d0505f 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmDbManager.cs b/FrmDbManager.cs
index 613e3f4..e5dd0d1 100644
--- a/FrmDbManager.cs
+++ b/FrmDbManager.cs
@@ -103,7 +103,7 @@
///
private void dbLists_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(dbLists.SelectedItem.ToString());
+ if (dbLists.SelectedItem == null) return;
string selectedDbname=dbLists.SelectedItem.ToString();
//根据库名查找对应的数据库配置
for (int i = 0; i < Utility.listDb.Count; i++) {
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 8b9c935..8d0505f 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmDbManager.cs b/FrmDbManager.cs
index 613e3f4..e5dd0d1 100644
--- a/FrmDbManager.cs
+++ b/FrmDbManager.cs
@@ -103,7 +103,7 @@
///
private void dbLists_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(dbLists.SelectedItem.ToString());
+ if (dbLists.SelectedItem == null) return;
string selectedDbname=dbLists.SelectedItem.ToString();
//根据库名查找对应的数据库配置
for (int i = 0; i < Utility.listDb.Count; i++) {
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index a6a7320..943beed 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -112,6 +112,7 @@
this.sideBar1 = new DevComponents.DotNetBar.SideBar();
this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
this.layerSensorTree = new System.Windows.Forms.TreeView();
+ this.layerTree = new Cyberpipe.MyTreeView();
this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem();
this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem();
this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem();
@@ -260,6 +261,13 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+ this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+ this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+ this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+ this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+ this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -350,13 +358,6 @@
this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
- this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
- this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
- this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
- this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
- this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel();
this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar();
this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem();
@@ -540,7 +541,6 @@
this.labelX17 = new DevComponents.DotNetBar.LabelX();
this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.layerTree = new Cyberpipe.MyTreeView();
this.statusStrip1.SuspendLayout();
this.sideBar1.SuspendLayout();
this.panelEx3.SuspendLayout();
@@ -551,13 +551,13 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel6.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel1.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
this.ribbonPanel4.SuspendLayout();
- this.ribbonPanel6.SuspendLayout();
this.ribbonPanel7.SuspendLayout();
this.ribbonPanel3.SuspendLayout();
this.panelOfTable.SuspendLayout();
@@ -979,6 +979,18 @@
this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick);
this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
//
+ // layerTree
+ //
+ this.layerTree.CheckBoxes = true;
+ this.layerTree.ItemHeight = 18;
+ this.layerTree.Location = new System.Drawing.Point(30, 78);
+ this.layerTree.Name = "layerTree";
+ this.layerTree.Size = new System.Drawing.Size(121, 97);
+ this.layerTree.TabIndex = 1;
+ this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck);
+ this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick);
+ this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
+ //
// sideBarPanelItem3
//
this.sideBarPanelItem3.FontBold = true;
@@ -2175,6 +2187,116 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel6
+ //
+ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+ this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel6.Name = "ribbonPanel6";
+ this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel6.Style.Class = "";
+ this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel6.StyleMouseDown.Class = "";
+ this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel6.StyleMouseOver.Class = "";
+ this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel6.TabIndex = 38;
+ //
+ // ribbonBar6
+ //
+ this.ribbonBar6.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar6.BackgroundStyle.Class = "";
+ this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar6.ContainerControlProcessDialogKey = true;
+ this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.buttonItemSPSZ,
+ this.buttonItem8,
+ this.buttonItemLocation,
+ this.sliderItem2,
+ this.buttonItemGBJC});
+ this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar6.Name = "ribbonBar6";
+ this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+ this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar6.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar6.TitleStyle.Class = "";
+ this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar6.TitleStyleMouseOver.Class = "";
+ this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar6.TitleVisible = false;
+ //
+ // buttonItemSPSZ
+ //
+ this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+ this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+ this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+ this.buttonItemSPSZ.Text = "双屏设置";
+ this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+ //
+ // buttonItem8
+ //
+ this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+ this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItem8.Name = "buttonItem8";
+ this.buttonItem8.SubItemsExpandWidth = 14;
+ this.buttonItem8.Text = "双屏分析";
+ this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+ //
+ // buttonItemLocation
+ //
+ this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+ this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemLocation.Name = "buttonItemLocation";
+ this.buttonItemLocation.SubItemsExpandWidth = 14;
+ this.buttonItemLocation.Text = "快速定位";
+ this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+ //
+ // sliderItem2
+ //
+ this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+ this.sliderItem2.LabelWidth = 50;
+ this.sliderItem2.Name = "sliderItem2";
+ this.sliderItem2.Text = "地面透明度";
+ this.sliderItem2.TextColor = System.Drawing.Color.Black;
+ this.sliderItem2.Value = 0;
+ this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+ //
+ // buttonItemGBJC
+ //
+ this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+ this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemGBJC.Name = "buttonItemGBJC";
+ this.buttonItemGBJC.SubItemsExpandWidth = 14;
+ this.buttonItemGBJC.Text = "国标检测";
+ this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3240,116 +3362,6 @@
this.btn_document_info.Text = "文档管理";
this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
//
- // ribbonPanel6
- //
- this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel6.Controls.Add(this.ribbonBar6);
- this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel6.Name = "ribbonPanel6";
- this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel6.Style.Class = "";
- this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel6.StyleMouseDown.Class = "";
- this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel6.StyleMouseOver.Class = "";
- this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel6.TabIndex = 38;
- //
- // ribbonBar6
- //
- this.ribbonBar6.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar6.BackgroundStyle.Class = "";
- this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar6.ContainerControlProcessDialogKey = true;
- this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.buttonItemSPSZ,
- this.buttonItem8,
- this.buttonItemLocation,
- this.sliderItem2,
- this.buttonItemGBJC});
- this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar6.Name = "ribbonBar6";
- this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
- this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar6.TabIndex = 0;
- //
- //
- //
- this.ribbonBar6.TitleStyle.Class = "";
- this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar6.TitleStyleMouseOver.Class = "";
- this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar6.TitleVisible = false;
- //
- // buttonItemSPSZ
- //
- this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
- this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemSPSZ.Name = "buttonItemSPSZ";
- this.buttonItemSPSZ.SubItemsExpandWidth = 14;
- this.buttonItemSPSZ.Text = "双屏设置";
- this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
- //
- // buttonItem8
- //
- this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
- this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItem8.Name = "buttonItem8";
- this.buttonItem8.SubItemsExpandWidth = 14;
- this.buttonItem8.Text = "双屏分析";
- this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
- //
- // buttonItemLocation
- //
- this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
- this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemLocation.Name = "buttonItemLocation";
- this.buttonItemLocation.SubItemsExpandWidth = 14;
- this.buttonItemLocation.Text = "快速定位";
- this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
- //
- // sliderItem2
- //
- this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
- this.sliderItem2.LabelWidth = 50;
- this.sliderItem2.Name = "sliderItem2";
- this.sliderItem2.Text = "地面透明度";
- this.sliderItem2.TextColor = System.Drawing.Color.Black;
- this.sliderItem2.Value = 0;
- this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
- //
- // buttonItemGBJC
- //
- this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
- this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemGBJC.Name = "buttonItemGBJC";
- this.buttonItemGBJC.SubItemsExpandWidth = 14;
- this.buttonItemGBJC.Text = "国标检测";
- this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
- //
// ribbonPanel7
//
this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4555,7 +4567,7 @@
this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(46525, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(46822, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -4665,7 +4677,7 @@
this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(46524, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(46821, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5947,18 +5959,6 @@
this.pictureBox1.TabStop = false;
this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint);
//
- // layerTree
- //
- this.layerTree.CheckBoxes = true;
- this.layerTree.ItemHeight = 18;
- this.layerTree.Location = new System.Drawing.Point(30, 78);
- this.layerTree.Name = "layerTree";
- this.layerTree.Size = new System.Drawing.Size(121, 97);
- this.layerTree.TabIndex = 1;
- this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck);
- this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick);
- this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
- //
// MainFrm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
@@ -6001,13 +6001,13 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
this.ribbonPanel4.ResumeLayout(false);
- this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel7.ResumeLayout(false);
this.ribbonPanel3.ResumeLayout(false);
this.panelOfTable.ResumeLayout(false);
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 8b9c935..8d0505f 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmDbManager.cs b/FrmDbManager.cs
index 613e3f4..e5dd0d1 100644
--- a/FrmDbManager.cs
+++ b/FrmDbManager.cs
@@ -103,7 +103,7 @@
///
private void dbLists_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(dbLists.SelectedItem.ToString());
+ if (dbLists.SelectedItem == null) return;
string selectedDbname=dbLists.SelectedItem.ToString();
//根据库名查找对应的数据库配置
for (int i = 0; i < Utility.listDb.Count; i++) {
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index a6a7320..943beed 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -112,6 +112,7 @@
this.sideBar1 = new DevComponents.DotNetBar.SideBar();
this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
this.layerSensorTree = new System.Windows.Forms.TreeView();
+ this.layerTree = new Cyberpipe.MyTreeView();
this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem();
this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem();
this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem();
@@ -260,6 +261,13 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+ this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+ this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+ this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+ this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+ this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -350,13 +358,6 @@
this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
- this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
- this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
- this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
- this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
- this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel();
this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar();
this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem();
@@ -540,7 +541,6 @@
this.labelX17 = new DevComponents.DotNetBar.LabelX();
this.panelEx4 = new DevComponents.DotNetBar.PanelEx();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.layerTree = new Cyberpipe.MyTreeView();
this.statusStrip1.SuspendLayout();
this.sideBar1.SuspendLayout();
this.panelEx3.SuspendLayout();
@@ -551,13 +551,13 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel6.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel1.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
this.ribbonPanel4.SuspendLayout();
- this.ribbonPanel6.SuspendLayout();
this.ribbonPanel7.SuspendLayout();
this.ribbonPanel3.SuspendLayout();
this.panelOfTable.SuspendLayout();
@@ -979,6 +979,18 @@
this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick);
this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
//
+ // layerTree
+ //
+ this.layerTree.CheckBoxes = true;
+ this.layerTree.ItemHeight = 18;
+ this.layerTree.Location = new System.Drawing.Point(30, 78);
+ this.layerTree.Name = "layerTree";
+ this.layerTree.Size = new System.Drawing.Size(121, 97);
+ this.layerTree.TabIndex = 1;
+ this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck);
+ this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick);
+ this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
+ //
// sideBarPanelItem3
//
this.sideBarPanelItem3.FontBold = true;
@@ -2175,6 +2187,116 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel6
+ //
+ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+ this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel6.Name = "ribbonPanel6";
+ this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel6.Style.Class = "";
+ this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel6.StyleMouseDown.Class = "";
+ this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel6.StyleMouseOver.Class = "";
+ this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel6.TabIndex = 38;
+ //
+ // ribbonBar6
+ //
+ this.ribbonBar6.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar6.BackgroundStyle.Class = "";
+ this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar6.ContainerControlProcessDialogKey = true;
+ this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.buttonItemSPSZ,
+ this.buttonItem8,
+ this.buttonItemLocation,
+ this.sliderItem2,
+ this.buttonItemGBJC});
+ this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar6.Name = "ribbonBar6";
+ this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+ this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar6.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar6.TitleStyle.Class = "";
+ this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar6.TitleStyleMouseOver.Class = "";
+ this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar6.TitleVisible = false;
+ //
+ // buttonItemSPSZ
+ //
+ this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+ this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+ this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+ this.buttonItemSPSZ.Text = "双屏设置";
+ this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+ //
+ // buttonItem8
+ //
+ this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+ this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItem8.Name = "buttonItem8";
+ this.buttonItem8.SubItemsExpandWidth = 14;
+ this.buttonItem8.Text = "双屏分析";
+ this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+ //
+ // buttonItemLocation
+ //
+ this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+ this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemLocation.Name = "buttonItemLocation";
+ this.buttonItemLocation.SubItemsExpandWidth = 14;
+ this.buttonItemLocation.Text = "快速定位";
+ this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+ //
+ // sliderItem2
+ //
+ this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+ this.sliderItem2.LabelWidth = 50;
+ this.sliderItem2.Name = "sliderItem2";
+ this.sliderItem2.Text = "地面透明度";
+ this.sliderItem2.TextColor = System.Drawing.Color.Black;
+ this.sliderItem2.Value = 0;
+ this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+ //
+ // buttonItemGBJC
+ //
+ this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+ this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.buttonItemGBJC.Name = "buttonItemGBJC";
+ this.buttonItemGBJC.SubItemsExpandWidth = 14;
+ this.buttonItemGBJC.Text = "国标检测";
+ this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3240,116 +3362,6 @@
this.btn_document_info.Text = "文档管理";
this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
//
- // ribbonPanel6
- //
- this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel6.Controls.Add(this.ribbonBar6);
- this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel6.Name = "ribbonPanel6";
- this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel6.Style.Class = "";
- this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel6.StyleMouseDown.Class = "";
- this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel6.StyleMouseOver.Class = "";
- this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel6.TabIndex = 38;
- //
- // ribbonBar6
- //
- this.ribbonBar6.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar6.BackgroundStyle.Class = "";
- this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar6.ContainerControlProcessDialogKey = true;
- this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.buttonItemSPSZ,
- this.buttonItem8,
- this.buttonItemLocation,
- this.sliderItem2,
- this.buttonItemGBJC});
- this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar6.Name = "ribbonBar6";
- this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
- this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar6.TabIndex = 0;
- //
- //
- //
- this.ribbonBar6.TitleStyle.Class = "";
- this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar6.TitleStyleMouseOver.Class = "";
- this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar6.TitleVisible = false;
- //
- // buttonItemSPSZ
- //
- this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
- this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemSPSZ.Name = "buttonItemSPSZ";
- this.buttonItemSPSZ.SubItemsExpandWidth = 14;
- this.buttonItemSPSZ.Text = "双屏设置";
- this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
- //
- // buttonItem8
- //
- this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
- this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItem8.Name = "buttonItem8";
- this.buttonItem8.SubItemsExpandWidth = 14;
- this.buttonItem8.Text = "双屏分析";
- this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
- //
- // buttonItemLocation
- //
- this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
- this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemLocation.Name = "buttonItemLocation";
- this.buttonItemLocation.SubItemsExpandWidth = 14;
- this.buttonItemLocation.Text = "快速定位";
- this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
- //
- // sliderItem2
- //
- this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
- this.sliderItem2.LabelWidth = 50;
- this.sliderItem2.Name = "sliderItem2";
- this.sliderItem2.Text = "地面透明度";
- this.sliderItem2.TextColor = System.Drawing.Color.Black;
- this.sliderItem2.Value = 0;
- this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
- //
- // buttonItemGBJC
- //
- this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
- this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.buttonItemGBJC.Name = "buttonItemGBJC";
- this.buttonItemGBJC.SubItemsExpandWidth = 14;
- this.buttonItemGBJC.Text = "国标检测";
- this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
- //
// ribbonPanel7
//
this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4555,7 +4567,7 @@
this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(46525, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(46822, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -4665,7 +4677,7 @@
this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(46524, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(46821, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5947,18 +5959,6 @@
this.pictureBox1.TabStop = false;
this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint);
//
- // layerTree
- //
- this.layerTree.CheckBoxes = true;
- this.layerTree.ItemHeight = 18;
- this.layerTree.Location = new System.Drawing.Point(30, 78);
- this.layerTree.Name = "layerTree";
- this.layerTree.Size = new System.Drawing.Size(121, 97);
- this.layerTree.TabIndex = 1;
- this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck);
- this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick);
- this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick);
- //
// MainFrm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
@@ -6001,13 +6001,13 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
this.ribbonPanel4.ResumeLayout(false);
- this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel7.ResumeLayout(false);
this.ribbonPanel3.ResumeLayout(false);
this.panelOfTable.ResumeLayout(false);
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index e5ecc62..0dd1e75 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ