diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 94f8597..1a4aeed 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 94f8597..1a4aeed 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b276838..19b3415 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 94f8597..1a4aeed 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b276838..19b3415 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 94f8597..1a4aeed 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b276838..19b3415 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 94f8597..1a4aeed 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 6aa5c6b..537b4c3 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 9595651..38d4927 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -14,6 +14,8 @@ using System.Reflection; using System.Data.OracleClient; using WHC.Pager.WinControl; +using System.Threading; +using System.Runtime.InteropServices; namespace Cyberpipe { @@ -370,16 +372,31 @@ private void FrmFlagManagers_FormClosing(object sender, FormClosingEventArgs e) { IS_OPEN = false; + Thread downloadJob = new Thread(new ParameterizedThreadStart(doSave)); + downloadJob.IsBackground = true; + downloadJob.Start(e); globeControl1.Globe.MemoryLayer.RemoveAllFeature(); foreach (GSOFeature f in Features) { f.Label = null; - } - globeControl1.Globe.Layers["标识器"].Save(); + } Features.RemoveRange(0, Features.Count); globeControl1.Refresh(); } + private void doSave(Object e) + { + //保存标识器图层 + try + { + globeControl1.Globe.Layers["标识器"].Save(); + } + catch (Exception ex) + { + + } + + } private void btn_query_Click(object sender, EventArgs e) { diff --git a/FrmPatrolerEdit.resx b/FrmPatrolerEdit.resx index 4202d97..732cc9b 100644 --- a/FrmPatrolerEdit.resx +++ b/FrmPatrolerEdit.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index e17d22e..fddfb94 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,7 +82,6 @@ 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(); @@ -654,6 +653,7 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -1094,16 +1094,6 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // - // 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); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4171,8 +4161,8 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel7); @@ -4251,6 +4241,7 @@ this.ribbonPanel8.StyleMouseOver.Class = ""; this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; // // ribbonBar_UserInfo // @@ -4379,7 +4370,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -6777,6 +6767,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6796,7 +6787,6 @@ // // ribbonTabItem8 // - this.ribbonTabItem8.Checked = true; this.ribbonTabItem8.Name = "ribbonTabItem8"; this.ribbonTabItem8.Panel = this.ribbonPanel8; this.ribbonTabItem8.Text = "权限管理"; @@ -7108,6 +7098,16 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // + // 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); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 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 94f8597..1a4aeed 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index b276838..19b3415 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 2478be4..b19e2ab 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 94f8597..1a4aeed 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index ed9311f..79b7689 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ