diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/app.config b/app.config index f9eb150..d01583f 100644 --- a/app.config +++ b/app.config @@ -10,7 +10,7 @@ - + diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/app.config b/app.config index f9eb150..d01583f 100644 --- a/app.config +++ b/app.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/EMSCyberpipe.exe.config b/bin/x86/Debug/EMSCyberpipe.exe.config index f9eb150..d01583f 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.exe.config @@ -10,7 +10,7 @@ - + diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/app.config b/app.config index f9eb150..d01583f 100644 --- a/app.config +++ b/app.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/EMSCyberpipe.exe.config b/bin/x86/Debug/EMSCyberpipe.exe.config index f9eb150..d01583f 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.exe.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/log/2019/201902/20190215.txt b/bin/x86/Debug/log/2019/201902/20190215.txt new file mode 100644 index 0000000..4acdf6d --- /dev/null +++ b/bin/x86/Debug/log/2019/201902/20190215.txt @@ -0,0 +1,50 @@ + + +��¼ʱ�䣺2019-02-15 14:37:18,765 +�߳�ID:[1] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 14:38:29,713 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:16:30,428 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:19:39,547 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:19:39,625 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:20:21,965 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/app.config b/app.config index f9eb150..d01583f 100644 --- a/app.config +++ b/app.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/EMSCyberpipe.exe.config b/bin/x86/Debug/EMSCyberpipe.exe.config index f9eb150..d01583f 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.exe.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/log/2019/201902/20190215.txt b/bin/x86/Debug/log/2019/201902/20190215.txt new file mode 100644 index 0000000..4acdf6d --- /dev/null +++ b/bin/x86/Debug/log/2019/201902/20190215.txt @@ -0,0 +1,50 @@ + + +��¼ʱ�䣺2019-02-15 14:37:18,765 +�߳�ID:[1] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 14:38:29,713 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:16:30,428 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:19:39,547 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:19:39,625 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:20:21,965 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + diff --git a/bin/x86/Debug/log/2019/201904/20190425.txt b/bin/x86/Debug/log/2019/201904/20190425.txt new file mode 100644 index 0000000..cc67d3b --- /dev/null +++ b/bin/x86/Debug/log/2019/201904/20190425.txt @@ -0,0 +1,64 @@ + + +��¼ʱ�䣺2019-04-25 18:45:39,122 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 18:45:56,828 +�߳�ID:[16] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-25 18:51:14,674 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:07:04,739 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:07:12,570 +�߳�ID:[15] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-25 19:07:55,439 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:12:37,690 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:13:42,753 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index e3cd12c..32ab93d 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -1088,6 +1088,7 @@ + Form @@ -1288,12 +1289,14 @@ Form + True True Reference.map + Form_EditTask.cs diff --git a/Cyberpipe.suo b/Cyberpipe.suo index a1aecf8..454d130 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmEquipmentEdit.cs b/FrmEquipmentEdit.cs index be81fe5..a1a5da2 100644 --- a/FrmEquipmentEdit.cs +++ b/FrmEquipmentEdit.cs @@ -67,11 +67,11 @@ txtMacId.Focus(); return; } - if (isExitMAC(txtMacId.Text)) + /*if (isExitMAC(txtMacId.Text)) { MessageBox.Show("已存在mac地址", "提示"); return; - } + }*/ if (String.IsNullOrEmpty(comboPerson.Text)) { MessageBox.Show("设备所有人不能为空！", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmExportCADS.cs b/FrmExportCADS.cs index 59629dd..ea67c2b 100644 --- a/FrmExportCADS.cs +++ b/FrmExportCADS.cs @@ -102,6 +102,7 @@ { MessageBox.Show(ex.ToString()); } + MessageBox.Show("到处成功！", "提示"); } else { diff --git a/FrmPatrolerEdit.cs b/FrmPatrolerEdit.cs index f0ee553..000f37c 100644 --- a/FrmPatrolerEdit.cs +++ b/FrmPatrolerEdit.cs @@ -54,14 +54,14 @@ } try { - string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; + /*string sqlCount = "select count(*) from patroler where username='"+txt_name.Text.Trim()+"'"; int rows = 0; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); if (rows>0) { MessageBox.Show("巡检人员已存在，请更换用户名", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; - } + }*/ if (String.IsNullOrEmpty(lab_dbid.Text.Trim())) { diff --git a/LayerConfig.cs b/LayerConfig.cs new file mode 100644 index 0000000..408ba77 --- /dev/null +++ b/LayerConfig.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + [XmlType(TypeName = "layerconfig")] + public class LayerConfig + { + [XmlArray("datasrcs")] public List datasrcs; + } + + [XmlType(TypeName = "datasrc")] + public class DataSrc + { + [XmlAttribute] public string label; + [XmlArray("layertypes")] public List layertypes; + } + + [XmlType(TypeName = "layertype")] + public class LayerType + { + [XmlAttribute] public string label; + [XmlArray("layers")] public List layers; + } + + [XmlType(TypeName = "layer")] + public class Layer + { + [XmlAttribute] public string label; + [XmlAttribute] public string layersrc; + [XmlAttribute] public string layer; + [XmlAttribute] public string flag; + } +} diff --git a/MainFrm.cs b/MainFrm.cs index ed2685b..a95c7da 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1060,6 +1060,7 @@ GSOLayer layer = e.Node.Tag as GSOLayer; layer.Visible = e.Node.Checked; globeControl1.Globe.Refresh(); + } if (e.Node.Tag is GSOFeature) { @@ -1072,6 +1073,7 @@ } } CheckControl(e); + } /// /// 树节点选中方法 @@ -1110,6 +1112,39 @@ } } + private void layerTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) + { + if (e.Button != MouseButtons.Right) return; + layerTree.SelectedNode = e.Node; + if (e.Node.Tag == null || e.Node.Parent == null) return; //排除无图层节点和第一级节点 + + GSOLayer gsoLayer = null; + if (e.Node.Tag.ToString().Contains("|")) + { + string nodeTag = e.Node.Tag.ToString().Split('|')[1]; + gsoLayer = globeControl1.Globe.Layers.GetLayerByCaption(nodeTag); + } + //gsoLayer = e.Node.Tag as GSOLayer; + if (gsoLayer == null) return; + if (e.Node.Parent.Text.Equals("临时图层") || e.Node.Parent.Text.Equals("我的地标")) + { + //临时图层下的子节点应该展示的 + contextMenuStripDeleteLayerNode.Show(layerTree, e.X, e.Y); + contextMenuStripDeleteLayerNode.Tag = e.Node; + } + else + { + LayerSelectableMenuItem.Visible = true; + LayerEditableMenuItem.Visible = true; + SaveLayerMenuItem.Visible = true; + layerNodeContexMenu.Show(layerTree, e.X, e.Y); + layerNodeContexMenu.Tag = e.Node; + LayerSelectableMenuItem.Checked = gsoLayer.Selectable; + LayerEditableMenuItem.Checked = gsoLayer.Editable; + } + + } + //改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 private void CheckParentNode(TreeNode curNode) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 97b8299..fd7aed1 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -366,17 +366,6 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_device = new DevComponents.DotNetBar.ButtonItem(); - this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); - this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -386,19 +375,12 @@ this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_device = new DevComponents.DotNetBar.ButtonItem(); + this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); + this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -561,6 +543,24 @@ this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.btn_reset_password = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem14 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem2 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -647,12 +647,12 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -1055,6 +1055,7 @@ 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); // // sideBarPanelItem3 // @@ -3020,7 +3021,7 @@ // this.导出文件ToolStripMenuItem1.Name = "导出文件ToolStripMenuItem1"; this.导出文件ToolStripMenuItem1.Size = new System.Drawing.Size(125, 22); - this.导出文件ToolStripMenuItem1.Text = "导出文件"; + this.导出文件ToolStripMenuItem1.Text = "导出矢量"; this.导出文件ToolStripMenuItem1.Click += new System.EventHandler(this.buttonItemBJ10_2_Click); // // 前进ToolStripMenuItem @@ -4123,12 +4124,12 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -4169,198 +4170,6 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel3 - // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar3); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - // - // ribbonBar3 - // - this.ribbonBar3.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_device, - this.btn_Person, - this.btn_constructMap, - this.buttonItem9}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(378, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 0; - // - // - // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; - // - // btn_device - // - this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; - this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_device.Name = "btn_device"; - this.btn_device.SubItemsExpandWidth = 14; - this.btn_device.Text = "探测仪管理"; - this.btn_device.Click += new System.EventHandler(this.btn_device_Click); - // - // btn_Person - // - this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_Person.Name = "btn_Person"; - this.btn_Person.SubItemsExpandWidth = 14; - this.btn_Person.Text = "定位人员维护"; - this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); - // - // btn_constructMap - // - this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; - this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_constructMap.Name = "btn_constructMap"; - this.btn_constructMap.SubItemsExpandWidth = 14; - this.btn_constructMap.Text = "导出施工图"; - this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "文档管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(299, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -4368,10 +4177,10 @@ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel1.Controls.Add(this.ribbonBar21); this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); this.ribbonPanel1.Name = "ribbonPanel1"; this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // @@ -4388,7 +4197,6 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4417,7 +4225,7 @@ this.buttonItem89}); this.ribbonBar21.Location = new System.Drawing.Point(3, 0); this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(653, 92); + this.ribbonBar21.Size = new System.Drawing.Size(653, 59); this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar21.TabIndex = 2; this.ribbonBar21.Text = "浏览模式"; @@ -4501,219 +4309,117 @@ this.buttonItem89.Visible = false; this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); // - // ribbonPanel8 + // ribbonPanel3 // - this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); - this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel8.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel8.Name = "ribbonPanel8"; - this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel8.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar3); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel8.Style.Class = ""; - this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseDown.Class = ""; - this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel8.StyleMouseOver.Class = ""; - this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel8.TabIndex = 42; - this.ribbonPanel8.Visible = false; + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; // - // ribbonBar_UserInfo + // ribbonBar3 // - this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + this.ribbonBar3.AutoOverflowEnabled = true; // // // - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; - this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; - this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.btn_reset_password}); - this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); - this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; - this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 92); - this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar_UserInfo.TabIndex = 0; + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_device, + this.btn_Person, + this.btn_constructMap, + this.buttonItem9}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(378, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 0; // // // - this.ribbonBar_UserInfo.TitleStyle.Class = ""; - this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; - this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - // btn_user_info + // btn_device // - this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.btn_device.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_device.Image = global::Cyberpipe.Properties.Resources._24X24__2__02; + this.btn_device.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_device.Name = "btn_device"; + this.btn_device.SubItemsExpandWidth = 14; + this.btn_device.Text = "探测仪管理"; + this.btn_device.Click += new System.EventHandler(this.btn_device_Click); // - // btn_role_info + // btn_Person // - this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.btn_Person.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.btn_Person.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_Person.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_Person.Name = "btn_Person"; + this.btn_Person.SubItemsExpandWidth = 14; + this.btn_Person.Text = "定位人员维护"; + this.btn_Person.Click += new System.EventHandler(this.btn_Person_Click); // - // btn_resc_info + // btn_constructMap // - this.btn_resc_info.Name = "btn_resc_info"; + this.btn_constructMap.Image = global::Cyberpipe.Properties.Resources._24x24icon_04_hover; + this.btn_constructMap.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_constructMap.Name = "btn_constructMap"; + this.btn_constructMap.SubItemsExpandWidth = 14; + this.btn_constructMap.Text = "导出施工图"; + this.btn_constructMap.Click += new System.EventHandler(this.btn_constructMap_Click); // - // btn_role_resc - // - this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); - // - // btn_user_role - // - this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // btn_reset_password - // - this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; - this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_reset_password.Name = "btn_reset_password"; - this.btn_reset_password.SubItemsExpandWidth = 14; - this.btn_reset_password.Text = "重置密码"; - this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); - // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.ribbonBar5); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // ribbonBar5 - // - this.ribbonBar5.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.BackgroundStyle.Class = ""; - this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.ContainerControlProcessDialogKey = true; - this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar5.Location = new System.Drawing.Point(3, 0); - this.ribbonBar5.Name = "ribbonBar5"; - this.ribbonBar5.Size = new System.Drawing.Size(418, 92); - this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar5.TabIndex = 0; - // - // - // - this.ribbonBar5.TitleStyle.Class = ""; - this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar5.TitleStyleMouseOver.Class = ""; - this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar5.TitleVisible = false; - this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground + // buttonItem9 // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__10; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "文档管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); // // // @@ -4762,7 +4468,7 @@ this.buttonItemBZ}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(835, 92); + this.ribbonBar20.Size = new System.Drawing.Size(835, 59); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -6017,9 +5723,305 @@ this.buttonItemBZ11.Text = "标注管理"; this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(299, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // + // ribbonPanel8 + // + this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel8.Controls.Add(this.ribbonBar_UserInfo); + this.ribbonPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel8.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel8.Name = "ribbonPanel8"; + this.ribbonPanel8.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel8.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel8.Style.Class = ""; + this.ribbonPanel8.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseDown.Class = ""; + this.ribbonPanel8.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel8.StyleMouseOver.Class = ""; + this.ribbonPanel8.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel8.TabIndex = 42; + this.ribbonPanel8.Visible = false; + // + // ribbonBar_UserInfo + // + this.ribbonBar_UserInfo.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.BackgroundStyle.Class = ""; + this.ribbonBar_UserInfo.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar_UserInfo.ContainerControlProcessDialogKey = true; + this.ribbonBar_UserInfo.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar_UserInfo.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.btn_reset_password}); + this.ribbonBar_UserInfo.Location = new System.Drawing.Point(3, 0); + this.ribbonBar_UserInfo.Name = "ribbonBar_UserInfo"; + this.ribbonBar_UserInfo.Size = new System.Drawing.Size(427, 59); + this.ribbonBar_UserInfo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar_UserInfo.TabIndex = 0; + // + // + // + this.ribbonBar_UserInfo.TitleStyle.Class = ""; + this.ribbonBar_UserInfo.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar_UserInfo.TitleStyleMouseOver.Class = ""; + this.ribbonBar_UserInfo.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // btn_user_info + // + this.btn_user_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = global::Cyberpipe.Properties.Resources._24x24icon_05_hover1; + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Name = "btn_resc_info"; + // + // btn_role_resc + // + this.btn_role_resc.Image = global::Cyberpipe.Properties.Resources.btnlegendSet_Image_副本; + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__67; + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // btn_reset_password + // + this.btn_reset_password.Image = global::Cyberpipe.Properties.Resources.liuxiang; + this.btn_reset_password.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_reset_password.Name = "btn_reset_password"; + this.btn_reset_password.SubItemsExpandWidth = 14; + this.btn_reset_password.Text = "重置密码"; + this.btn_reset_password.Click += new System.EventHandler(this.btn_reset_password_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.ribbonBar5); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + this.ribbonPanel7.Visible = false; + // + // ribbonBar5 + // + this.ribbonBar5.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar5.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar5.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.BackgroundStyle.Class = ""; + this.ribbonBar5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.ContainerControlProcessDialogKey = true; + this.ribbonBar5.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar5.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar5.Location = new System.Drawing.Point(3, 0); + this.ribbonBar5.Name = "ribbonBar5"; + this.ribbonBar5.Size = new System.Drawing.Size(418, 59); + this.ribbonBar5.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar5.TabIndex = 0; + // + // + // + this.ribbonBar5.TitleStyle.Class = ""; + this.ribbonBar5.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar5.TitleStyleMouseOver.Class = ""; + this.ribbonBar5.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar5.TitleVisible = false; + this.ribbonBar5.ItemClick += new System.EventHandler(this.ribbonBar5_ItemClick); + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6048,7 +6050,6 @@ // 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"; @@ -6422,7 +6423,6 @@ this.Controls.Add(this.dockSite6); this.Controls.Add(this.dockSite7); this.Controls.Add(this.dockSite8); - this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.IsMdiContainer = true; this.Name = "MainFrm"; @@ -6474,12 +6474,12 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TreeUtils.cs b/TreeUtils.cs new file mode 100644 index 0000000..0c9e115 --- /dev/null +++ b/TreeUtils.cs @@ -0,0 +1,293 @@ +using System.Collections.Generic; +using System.Windows.Forms; +using GeoScene.Data; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public class TreeUtils + { + /// + /// 构造图层tree,最多解析三层，若地球存在，则只构造指定地球上图层已存在的树节点，若地球不存在，则按照配置文件构造全部 + /// + /// 所属地球 + /// 要加载的树 + /// 数据来源，实测数据/施工数据/规划数据/红线数据,为空则展示全部 + public static void InitLayerTree(GSOGlobeControl gsoGlobeControl, TreeView treeView, string viewDatasrc) + { + /* +// treeView.Nodes.Clear(); + LayerConfig layerConfig = Utility.LayerConfig;//layertree所在的配置文件 + List datasrcs = layerConfig.datasrcs; + foreach (DataSrc datasrc in datasrcs) + { + if (viewDatasrc != null && !viewDatasrc.Trim().Equals("") && !datasrc.label.Equals(viewDatasrc)) continue; + TreeNode rootNode = treeView.Nodes.Add(datasrc.label); + List layerTypes = datasrc.layertypes; + foreach (LayerType layerType in layerTypes) + { + TreeNode secNode = rootNode.Nodes.Add(layerType.label); + List layers = layerType.layers; + foreach (Layer layer in layers) + { + if (gsoGlobeControl == null) + { + TreeNode node = new TreeNode(); + node.Text = layer.label; + secNode.Nodes.Add(node); + + } + else + { + GSOLayer gsoLayer = gsoGlobeControl.Globe.Layers.GetLayerByCaption(layer.layer); + if (gsoLayer == null) continue;//将不存在的去除 + TreeNode node = new TreeNode(); + node.Tag = gsoLayer; + node.Text = layer.label; + node.Checked = gsoLayer.Visible; + if (gsoLayer.Visible) + { + secNode.Checked = true; + rootNode.Checked = true; + } + secNode.Nodes.Add(node); + } + + } + } + } + * */ + } + + + /// + /// TreeNode选中状态改变，对其子节点和父节点的选中状态做相应改变 + /// + /// + /// + public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) + { +// if (node.Text.Equals("道路")&&node.Tag==null) +// {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 +// node.Tag = globeControl.Globe.Layers.GetLayerByCaption("180fd"); +// } + if (node.Tag != null) + { + if (node.Tag is GSOLayer)//图层 + { + GSOLayer layer = node.Tag as GSOLayer; + layer.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + else if (node.Tag is GSOTerrain)//地形 + { + GSOTerrain feat = node.Tag as GSOTerrain; + feat.Visible = node.Checked; + globeControl.Globe.Refresh(); + }else if (node.Tag is GSOFeature)//特征点 + { + GSOFeature feature = node.Tag as GSOFeature; + feature.Visible = node.Checked; + globeControl.Globe.Refresh(); + } + } + + CheckParentNode(node); + if (node.Nodes.Count > 0) + CheckChildrenNode(globeControl, node, node.Checked); + } + /// + /// 树形结构中，根据parentNode的选中状态，更改其子节点的选中状态 + /// + /// + /// + /// + public static void CheckChildrenNode(GSOGlobeControl globeControl, TreeNode parentNode, bool isChecked) + { + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Tag is GSOLayer) + { + GSOLayer layer = childNode.Tag as GSOLayer; + layer.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOTerrain) + { + GSOTerrain feat = childNode.Tag as GSOTerrain; + feat.Visible = isChecked; + globeControl.Globe.Refresh(); + } + else if (childNode.Tag is GSOFeature) + { + GSOFeature feature = childNode.Tag as GSOFeature; + feature.Visible = childNode.Checked; + globeControl.Globe.Refresh(); + } + if (childNode.Nodes.Count > 0) + CheckChildrenNode(globeControl, childNode, isChecked); + } + } + + /// + /// 子节点则父节点：一选则选，全不选才不选 + /// 改变父节点的选中状态，此处为所有子节点不选中时才取消父节点选中，可以根据需要修改 + /// + /// 要检查的节点，更改其父节点状态 + public static void CheckParentNode(TreeNode curNode) + { + + if (curNode.Parent == null) return; + bool bChecked = false; + foreach (TreeNode node in curNode.Parent.Nodes) + { + if (!node.Checked) continue; + bChecked = true; + break; + } + curNode.Parent.Checked = bChecked; + CheckParentNode(curNode.Parent); + + } + /// + /// 删除指定名称的节点,用于临时图层下的删除 + /// + /// + /// + public static void RemoveNode(TreeNode treeNode,string nodeText) + { + if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); + else if (treeNode.Nodes.Count > 0) + { + foreach (TreeNode node in treeNode.Nodes) + { + RemoveNode(node,nodeText); + } + } + } + + /// + /// 在地球上添加图层时候，在指定节点下方添加该图层的树节点，用于临时图层 + /// + /// 添加节点的父节点 + /// 图层 + public static void AddNodeToManagerNode(TreeNode tempNode, GSOLayer layer) + { + List managerLayerList = new List(); + for (int i = 0; i < tempNode.Nodes.Count; i++)//layerManagerNode 临时图层 + { + managerLayerList.Add(tempNode.Nodes[i].Text); + } + if (managerLayerList.Contains(layer.Dataset.Caption)) return; + TreeNode node = new TreeNode(); + node.Tag = layer; + node.Text = layer.Dataset.Caption; + node.ImageIndex = 0; + node.SelectedImageIndex = 0; + node.Checked = layer.Visible; + tempNode.Nodes.Insert(0, node); + tempNode.Expand(); + } + /// + /// 创建features对应的树节点，并挂载到node下。标注管理树形图使用 + /// + /// 父节点 + /// 要素集合 + public static void AddNodesMatchFeatures(TreeNode node, GSOFeatures features) + { + for (int i = 0; i < features.Length; i++) + { + GSOFeature feature = features[i]; + if (feature.Type == EnumFeatureType.FeatureFolder) + { + TreeNode tempnode = new TreeNode(); + tempnode.Text = feature.Name; + tempnode.ImageIndex = 1; + tempnode.SelectedImageIndex = 1; + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + GSOFeatureFolder featureFolder = (GSOFeatureFolder)feature; + AddNodesMatchFeatures(tempnode, featureFolder.Features); + } + else + { + TreeNode tempnode = new TreeNode { Text = feature.Name }; + if (feature.Geometry != null) + { + switch (feature.Geometry.Type) + { + case EnumGeometryType.GeoPoint3D: + case EnumGeometryType.GeoMarker: + tempnode.ImageIndex = 3; + tempnode.SelectedImageIndex = 3; + break; + case EnumGeometryType.GeoPolyline3D: + tempnode.ImageIndex = 4; + tempnode.SelectedImageIndex = 4; + break; + case EnumGeometryType.GeoPolygon3D: + tempnode.ImageIndex = 5; + tempnode.SelectedImageIndex = 5; + break; + case EnumGeometryType.GeoModel: + case EnumGeometryType.GeoEntity: + case EnumGeometryType.GeoGroupEntity: + case EnumGeometryType.GeoSphereEntity: + case EnumGeometryType.GeoBoxEntity: + case EnumGeometryType.GeoEllipsoidEntity: + case EnumGeometryType.GeoCylinderEntity: + case EnumGeometryType.GeoFrustumEntity: + case EnumGeometryType.GeoEllipCylinderEntity: + case EnumGeometryType.GeoEllipFrustumEntity: + case EnumGeometryType.GeoRangeEllipsoidEntity: + case EnumGeometryType.GeoRangeEllipCylinderEntity: + case EnumGeometryType.GeoRangeEllipFrustumEntity: + tempnode.ImageIndex = 6; + tempnode.SelectedImageIndex = 6; + break; + case EnumGeometryType.GeoGroundOverlay: + tempnode.ImageIndex = 7; + tempnode.SelectedImageIndex = 7; + break; + } + } + + tempnode.Checked = node.Checked && feature.Visible; + tempnode.Tag = feature; + node.Nodes.Add(tempnode); + } + } + } + + /// + /// 根据父节点改变子节点的选中状态 + /// + /// + /// + public static void CheckChildrenNode(TreeNode parentNode, bool isChecked) + { + parentNode.Checked = isChecked; + foreach (TreeNode childNode in parentNode.Nodes) + { + childNode.Checked = isChecked; + if (childNode.Nodes.Count > 0) + CheckChildrenNode(childNode, isChecked); + } + } + + public static void ChangeNodeCheckedStatus(TreeView treeView, string strNodeName, bool isChecked) + { + foreach (TreeNode curNode in treeView.Nodes) + { + if (curNode.Text != strNodeName) continue; + else + { + TreeUtils.CheckChildrenNode(curNode, isChecked); + return; + } + } + } + } +} diff --git a/XmlTools.cs b/XmlTools.cs new file mode 100644 index 0000000..cfb50e6 --- /dev/null +++ b/XmlTools.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Serialization; + +namespace Cyberpipe +{ + class XmlTools + { + public static void SerializeToXml(string filePath, T obj) + { + try + { + using (System.IO.StreamWriter writer = new System.IO.StreamWriter(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + xs.Serialize(writer, obj); + } + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 从某一XML文件反序列化到某一类型 + /// + /// 待反序列化的XML文件名称 + /// 反序列化出的 + /// + public static T DeserializeFromXml(string filePath) + { + try + { + if (!System.IO.File.Exists(filePath)) + throw new ArgumentNullException(filePath + " not Exists"); + + using (System.IO.StreamReader reader = new System.IO.StreamReader(filePath)) + { + XmlSerializer xs = new XmlSerializer(typeof(T)); + T ret = (T)xs.Deserialize(reader); + return ret; + } + } + catch (Exception ex) + { + throw ex; + // return default(T); + } + } + } +} diff --git a/app.config b/app.config index f9eb150..d01583f 100644 --- a/app.config +++ b/app.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/EMSCyberpipe.exe.config b/bin/x86/Debug/EMSCyberpipe.exe.config index f9eb150..d01583f 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.exe.config @@ -10,7 +10,7 @@ - + diff --git a/bin/x86/Debug/log/2019/201902/20190215.txt b/bin/x86/Debug/log/2019/201902/20190215.txt new file mode 100644 index 0000000..4acdf6d --- /dev/null +++ b/bin/x86/Debug/log/2019/201902/20190215.txt @@ -0,0 +1,50 @@ + + +��¼ʱ�䣺2019-02-15 14:37:18,765 +�߳�ID:[1] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 14:38:29,713 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:16:30,428 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-02-15 18:19:39,547 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:19:39,625 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.OledbHelper property: [(null)] - +����������ORA-12170: TNS: ���ӳ�ʱ + + + + +��¼ʱ�䣺2019-02-15 18:20:21,965 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + diff --git a/bin/x86/Debug/log/2019/201904/20190425.txt b/bin/x86/Debug/log/2019/201904/20190425.txt new file mode 100644 index 0000000..cc67d3b --- /dev/null +++ b/bin/x86/Debug/log/2019/201904/20190425.txt @@ -0,0 +1,64 @@ + + +��¼ʱ�䣺2019-04-25 18:45:39,122 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 18:45:56,828 +�߳�ID:[16] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-25 18:51:14,674 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:07:04,739 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:07:12,570 +�߳�ID:[15] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-25 19:07:55,439 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:12:37,690 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-25 19:13:42,753 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + diff --git a/bin/x86/Debug/log/2019/201904/20190426.txt b/bin/x86/Debug/log/2019/201904/20190426.txt new file mode 100644 index 0000000..6f683d1 --- /dev/null +++ b/bin/x86/Debug/log/2019/201904/20190426.txt @@ -0,0 +1,80 @@ + + +��¼ʱ�䣺2019-04-26 08:46:37,555 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 08:53:55,376 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 08:54:07,372 +�߳�ID:[16] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-26 09:06:54,246 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 09:08:57,164 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 09:18:00,910 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 09:20:36,311 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 09:22:12,171 +�߳�ID:[10] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. + + + +��¼ʱ�䣺2019-04-26 09:22:22,112 +�߳�ID:[16] +��־���� ERROR +�����ࣺCyberpipe.MainFrm property: [(null)] - +����������Cross-thread operation not valid: Control 'layerTree' accessed from a thread other than the thread it was created on. + + + +��¼ʱ�䣺2019-04-26 09:22:43,798 +�߳�ID:[9] +��־���� ERROR +�����ࣺCyberpipe.Utility property: [(null)] - +����������Object reference not set to an instance of an object. +