diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 46f3cdc..275eae2 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(); @@ -227,7 +228,6 @@ this.FeatureAddLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerSelectableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerEditableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.导出CADToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerOpaqueMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -540,7 +540,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(); @@ -742,7 +741,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -979,6 +978,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; @@ -1860,7 +1871,6 @@ this.FeatureAddLayerMenuItem, this.LayerSelectableMenuItem, this.LayerEditableMenuItem, - //this.导出CADToolStripMenuItem1, this.SaveLayerMenuItem, this.SaveAsLayerMenuItem, this.LayerOpaqueMenuItem, @@ -1868,7 +1878,7 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 312); + this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); // // RefreshLayerFeatureListMenuItem // @@ -1920,15 +1930,6 @@ this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // - // 导出CADToolStripMenuItem1 - // - /* - this.导出CADToolStripMenuItem1.Name = "导出CADToolStripMenuItem1"; - this.导出CADToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); - this.导出CADToolStripMenuItem1.Text = "导出CAD"; - this.导出CADToolStripMenuItem1.Visible = false; - this.导出CADToolStripMenuItem1.Click += new System.EventHandler(this.导出CADToolStripMenuItem1_Click);*/ - // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; @@ -2206,6 +2207,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 // @@ -4564,7 +4566,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(58405, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4674,7 +4676,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(58404, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5956,18 +5958,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; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 46f3cdc..275eae2 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(); @@ -227,7 +228,6 @@ this.FeatureAddLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerSelectableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerEditableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.导出CADToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerOpaqueMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -540,7 +540,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(); @@ -742,7 +741,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -979,6 +978,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; @@ -1860,7 +1871,6 @@ this.FeatureAddLayerMenuItem, this.LayerSelectableMenuItem, this.LayerEditableMenuItem, - //this.导出CADToolStripMenuItem1, this.SaveLayerMenuItem, this.SaveAsLayerMenuItem, this.LayerOpaqueMenuItem, @@ -1868,7 +1878,7 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 312); + this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); // // RefreshLayerFeatureListMenuItem // @@ -1920,15 +1930,6 @@ this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // - // 导出CADToolStripMenuItem1 - // - /* - this.导出CADToolStripMenuItem1.Name = "导出CADToolStripMenuItem1"; - this.导出CADToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); - this.导出CADToolStripMenuItem1.Text = "导出CAD"; - this.导出CADToolStripMenuItem1.Visible = false; - this.导出CADToolStripMenuItem1.Click += new System.EventHandler(this.导出CADToolStripMenuItem1_Click);*/ - // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; @@ -2206,6 +2207,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 // @@ -4564,7 +4566,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(58405, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4674,7 +4676,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(58404, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5956,18 +5958,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; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 15361bb..467efc5 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,11 +1,11 @@  LocaSpace三维地下管线信息系统 - gz + gzcs orcl - 47.96.29.200 - gz - 47.96.29.200 + 192.168.43.100 + gzcs + 192.168.43.100 1500 http://127.0.0.1/images/ http://127.0.0.1/images/default.jpg diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 46f3cdc..275eae2 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(); @@ -227,7 +228,6 @@ this.FeatureAddLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerSelectableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerEditableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.导出CADToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerOpaqueMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -540,7 +540,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(); @@ -742,7 +741,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -979,6 +978,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; @@ -1860,7 +1871,6 @@ this.FeatureAddLayerMenuItem, this.LayerSelectableMenuItem, this.LayerEditableMenuItem, - //this.导出CADToolStripMenuItem1, this.SaveLayerMenuItem, this.SaveAsLayerMenuItem, this.LayerOpaqueMenuItem, @@ -1868,7 +1878,7 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 312); + this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); // // RefreshLayerFeatureListMenuItem // @@ -1920,15 +1930,6 @@ this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // - // 导出CADToolStripMenuItem1 - // - /* - this.导出CADToolStripMenuItem1.Name = "导出CADToolStripMenuItem1"; - this.导出CADToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); - this.导出CADToolStripMenuItem1.Text = "导出CAD"; - this.导出CADToolStripMenuItem1.Visible = false; - this.导出CADToolStripMenuItem1.Click += new System.EventHandler(this.导出CADToolStripMenuItem1_Click);*/ - // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; @@ -2206,6 +2207,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 // @@ -4564,7 +4566,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(58405, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4674,7 +4676,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(58404, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5956,18 +5958,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; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 15361bb..467efc5 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,11 +1,11 @@  LocaSpace三维地下管线信息系统 - gz + gzcs orcl - 47.96.29.200 - gz - 47.96.29.200 + 192.168.43.100 + gzcs + 192.168.43.100 1500 http://127.0.0.1/images/ http://127.0.0.1/images/default.jpg diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index 239a2df..5d3d988 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 46f3cdc..275eae2 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(); @@ -227,7 +228,6 @@ this.FeatureAddLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerSelectableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerEditableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.导出CADToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerOpaqueMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -540,7 +540,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(); @@ -742,7 +741,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -979,6 +978,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; @@ -1860,7 +1871,6 @@ this.FeatureAddLayerMenuItem, this.LayerSelectableMenuItem, this.LayerEditableMenuItem, - //this.导出CADToolStripMenuItem1, this.SaveLayerMenuItem, this.SaveAsLayerMenuItem, this.LayerOpaqueMenuItem, @@ -1868,7 +1878,7 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 312); + this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); // // RefreshLayerFeatureListMenuItem // @@ -1920,15 +1930,6 @@ this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // - // 导出CADToolStripMenuItem1 - // - /* - this.导出CADToolStripMenuItem1.Name = "导出CADToolStripMenuItem1"; - this.导出CADToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); - this.导出CADToolStripMenuItem1.Text = "导出CAD"; - this.导出CADToolStripMenuItem1.Visible = false; - this.导出CADToolStripMenuItem1.Click += new System.EventHandler(this.导出CADToolStripMenuItem1_Click);*/ - // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; @@ -2206,6 +2207,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 // @@ -4564,7 +4566,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(58405, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4674,7 +4676,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(58404, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5956,18 +5958,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; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 15361bb..467efc5 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,11 +1,11 @@  LocaSpace三维地下管线信息系统 - gz + gzcs orcl - 47.96.29.200 - gz - 47.96.29.200 + 192.168.43.100 + gzcs + 192.168.43.100 1500 http://127.0.0.1/images/ http://127.0.0.1/images/default.jpg diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index 239a2df..5d3d988 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/GSRResource.rrs b/bin/x86/Debug/GSRResource.rrs index ceb24c5..31b4110 100644 --- a/bin/x86/Debug/GSRResource.rrs +++ b/bin/x86/Debug/GSRResource.rrs Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 82a8b4d..43c6992 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 8545ebb..b965a6f 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -7586,6 +7586,11 @@ } + private void ribbonPanel1_Click(object sender, EventArgs e) + { + + } + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 46f3cdc..275eae2 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(); @@ -227,7 +228,6 @@ this.FeatureAddLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerSelectableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerEditableMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - //this.导出CADToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.LayerOpaqueMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -540,7 +540,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(); @@ -742,7 +741,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -979,6 +978,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; @@ -1860,7 +1871,6 @@ this.FeatureAddLayerMenuItem, this.LayerSelectableMenuItem, this.LayerEditableMenuItem, - //this.导出CADToolStripMenuItem1, this.SaveLayerMenuItem, this.SaveAsLayerMenuItem, this.LayerOpaqueMenuItem, @@ -1868,7 +1878,7 @@ this.MenuItemVisiblePixelSize, this.LayerFlyMenuItem}); this.layerNodeContexMenu.Name = "layerNodeContexMenu"; - this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 312); + this.layerNodeContexMenu.Size = new System.Drawing.Size(149, 290); // // RefreshLayerFeatureListMenuItem // @@ -1920,15 +1930,6 @@ this.LayerEditableMenuItem.Text = "可编辑"; this.LayerEditableMenuItem.Click += new System.EventHandler(this.LayerEditableMenuItem_Click); // - // 导出CADToolStripMenuItem1 - // - /* - this.导出CADToolStripMenuItem1.Name = "导出CADToolStripMenuItem1"; - this.导出CADToolStripMenuItem1.Size = new System.Drawing.Size(148, 22); - this.导出CADToolStripMenuItem1.Text = "导出CAD"; - this.导出CADToolStripMenuItem1.Visible = false; - this.导出CADToolStripMenuItem1.Click += new System.EventHandler(this.导出CADToolStripMenuItem1_Click);*/ - // // SaveLayerMenuItem // this.SaveLayerMenuItem.Name = "SaveLayerMenuItem"; @@ -2206,6 +2207,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Click += new System.EventHandler(this.ribbonPanel1_Click); // // ribbonBar21 // @@ -4564,7 +4566,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(58405, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(59890, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4674,7 +4676,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(58404, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(59889, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5956,18 +5958,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; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 15361bb..467efc5 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -1,11 +1,11 @@  LocaSpace三维地下管线信息系统 - gz + gzcs orcl - 47.96.29.200 - gz - 47.96.29.200 + 192.168.43.100 + gzcs + 192.168.43.100 1500 http://127.0.0.1/images/ http://127.0.0.1/images/default.jpg diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index 239a2df..5d3d988 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/GSRResource.rrs b/bin/x86/Debug/GSRResource.rrs index ceb24c5..31b4110 100644 --- a/bin/x86/Debug/GSRResource.rrs +++ b/bin/x86/Debug/GSRResource.rrs Binary files differ diff --git a/bin/x86/Debug/OceanResource.rrs b/bin/x86/Debug/OceanResource.rrs index caeda46..78a6a53 100644 --- a/bin/x86/Debug/OceanResource.rrs +++ b/bin/x86/Debug/OceanResource.rrs Binary files differ