diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/MainFrm.cs b/MainFrm.cs index e5a3d98..7375063 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1170,7 +1170,7 @@ { XmlDocument doc = new XmlDocument(); doc.Load(filename); - XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild"); + XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild");///Params/layers foreach (XmlNode xmlLayerNode in xmlLayerNodes) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/MainFrm.cs b/MainFrm.cs index e5a3d98..7375063 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1170,7 +1170,7 @@ { XmlDocument doc = new XmlDocument(); doc.Load(filename); - XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild"); + XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild");///Params/layers foreach (XmlNode xmlLayerNode in xmlLayerNodes) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 7d21d00..06700ee 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -365,6 +366,15 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -532,15 +542,6 @@ 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(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_device = new DevComponents.DotNetBar.ButtonItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,9 +647,9 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2884,7 +2894,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(153, 312); + this.toolRightMenu.Size = new System.Drawing.Size(149, 290); // // 量算ToolStripMenuItem // @@ -2897,7 +2907,7 @@ this.水平面积ToolStripMenuItem1, this.地表面积ToolStripMenuItem1}); this.量算ToolStripMenuItem.Name = "量算ToolStripMenuItem"; - this.量算ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.量算ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.量算ToolStripMenuItem.Text = "量算"; // // 水平距离ToolStripMenuItem1 @@ -2960,7 +2970,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -3036,7 +3046,7 @@ this.绕中心点飞行ToolStripMenuItem, this.绕眼睛飞行ToolStripMenuItem}); this.飞行ToolStripMenuItem.Name = "飞行ToolStripMenuItem"; - this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.飞行ToolStripMenuItem.Text = "飞行"; // // 自定义飞行ToolStripMenuItem @@ -3082,7 +3092,7 @@ this.红线工具ToolStripMenuItem, this.标注管理ToolStripMenuItem}); this.标注ToolStripMenuItem.Name = "标注ToolStripMenuItem"; - this.标注ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.标注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.标注ToolStripMenuItem.Text = "标注"; // // 标高标注ToolStripMenuItem @@ -3177,76 +3187,76 @@ this.关键字查询ToolStripMenuItem, this.附属物查询ToolStripMenuItem}); this.查询ToolStripMenuItem.Name = "查询ToolStripMenuItem"; - this.查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.查询ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.查询ToolStripMenuItem.Text = "查询"; // // 空间查询ToolStripMenuItem // this.空间查询ToolStripMenuItem.Name = "空间查询ToolStripMenuItem"; - this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.空间查询ToolStripMenuItem.Text = "空间查询"; this.空间查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch1_Click); // // 编号查询ToolStripMenuItem // this.编号查询ToolStripMenuItem.Name = "编号查询ToolStripMenuItem"; - this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.编号查询ToolStripMenuItem.Text = "编号查询"; this.编号查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch2_Click); // // 坐标查询ToolStripMenuItem // this.坐标查询ToolStripMenuItem.Name = "坐标查询ToolStripMenuItem"; - this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.坐标查询ToolStripMenuItem.Text = "坐标查询"; this.坐标查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch3_Click); // // 管径查询ToolStripMenuItem // this.管径查询ToolStripMenuItem.Name = "管径查询ToolStripMenuItem"; - this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.管径查询ToolStripMenuItem.Text = "管径查询"; this.管径查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch4_Click); // // 材质查询ToolStripMenuItem // this.材质查询ToolStripMenuItem.Name = "材质查询ToolStripMenuItem"; - this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.材质查询ToolStripMenuItem.Text = "材质查询"; this.材质查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch5_Click); // // 基本查询ToolStripMenuItem // this.基本查询ToolStripMenuItem.Name = "基本查询ToolStripMenuItem"; - this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.基本查询ToolStripMenuItem.Text = "基本查询"; this.基本查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch6_Click); // // 复合查询ToolStripMenuItem // this.复合查询ToolStripMenuItem.Name = "复合查询ToolStripMenuItem"; - this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.复合查询ToolStripMenuItem.Text = "复合查询"; this.复合查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch7_Click); // // 关联查询ToolStripMenuItem // this.关联查询ToolStripMenuItem.Name = "关联查询ToolStripMenuItem"; - this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关联查询ToolStripMenuItem.Text = "关联查询"; this.关联查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch8_Click); // // 关键字查询ToolStripMenuItem // this.关键字查询ToolStripMenuItem.Name = "关键字查询ToolStripMenuItem"; - this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关键字查询ToolStripMenuItem.Text = "关键字查询"; this.关键字查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch9_Click); // // 附属物查询ToolStripMenuItem // this.附属物查询ToolStripMenuItem.Name = "附属物查询ToolStripMenuItem"; - this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.附属物查询ToolStripMenuItem.Text = "附属物查询"; this.附属物查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch10_Click); // @@ -3264,7 +3274,7 @@ this.标识器分类统计ToolStripMenuItem, this.标识器街道统计ToolStripMenuItem}); this.全区域统计ToolStripMenuItem.Name = "全区域统计ToolStripMenuItem"; - this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.全区域统计ToolStripMenuItem.Text = "全区域统计"; // // 管线长度统计ToolStripMenuItem @@ -3351,7 +3361,7 @@ this.标识器分类统计ToolStripMenuItem1, this.标识器街道统计ToolStripMenuItem1}); this.绘制区域统计ToolStripMenuItem.Name = "绘制区域统计ToolStripMenuItem"; - this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.绘制区域统计ToolStripMenuItem.Text = "绘制区域统计"; // // 管线长度统计ToolStripMenuItem1 @@ -3432,7 +3442,7 @@ this.道路断面分析ToolStripMenuItem, this.基线剖面分析ToolStripMenuItem}); this.断面分析ToolStripMenuItem.Name = "断面分析ToolStripMenuItem"; - this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.断面分析ToolStripMenuItem.Text = "断面分析"; // // 横断面分析ToolStripMenuItem @@ -3474,7 +3484,7 @@ this.连通分析ToolStripMenuItem, this.爆管分析ToolStripMenuItem}); this.拓扑分析ToolStripMenuItem.Name = "拓扑分析ToolStripMenuItem"; - this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.拓扑分析ToolStripMenuItem.Text = "拓扑分析"; // // 创建拓扑ToolStripMenuItem @@ -3536,7 +3546,7 @@ this.隐藏隧道ToolStripMenuItem, this.删除隧道ToolStripMenuItem}); this.开挖分析ToolStripMenuItem.Name = "开挖分析ToolStripMenuItem"; - this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.开挖分析ToolStripMenuItem.Text = "开挖分析"; // // 多边形开挖ToolStripMenuItem @@ -3588,7 +3598,7 @@ this.可视域分析ToolStripMenuItem, this.可视包络分析ToolStripMenuItem}); this.视域分析ToolStripMenuItem.Name = "视域分析ToolStripMenuItem"; - this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.视域分析ToolStripMenuItem.Text = "视域分析"; // // 通视分析ToolStripMenuItem @@ -3619,7 +3629,7 @@ this.附属物分析ToolStripMenuItem, this.无源淹没分析ToolStripMenuItem}); this.区域分析ToolStripMenuItem.Name = "区域分析ToolStripMenuItem"; - this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.区域分析ToolStripMenuItem.Text = "区域分析"; // // 缓冲区分析ToolStripMenuItem @@ -3646,7 +3656,7 @@ // 清除分析ToolStripMenuItem // this.清除分析ToolStripMenuItem.Name = "清除分析ToolStripMenuItem"; - this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.清除分析ToolStripMenuItem.Text = "清除分析"; this.清除分析ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemClear_Click); // @@ -4112,9 +4122,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4158,6 +4168,142 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + 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, 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, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(737, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Visible = false; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4183,6 +4329,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -5560,143 +5707,6 @@ this.buttonItem_Event.Text = "事件管理"; this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - 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, 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, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(737, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Visible = false; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6005,6 +6015,7 @@ // 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"; @@ -6014,7 +6025,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -6387,16 +6397,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6470,9 +6470,9 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/MainFrm.cs b/MainFrm.cs index e5a3d98..7375063 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1170,7 +1170,7 @@ { XmlDocument doc = new XmlDocument(); doc.Load(filename); - XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild"); + XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild");///Params/layers foreach (XmlNode xmlLayerNode in xmlLayerNodes) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 7d21d00..06700ee 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -365,6 +366,15 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -532,15 +542,6 @@ 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(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_device = new DevComponents.DotNetBar.ButtonItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,9 +647,9 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2884,7 +2894,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(153, 312); + this.toolRightMenu.Size = new System.Drawing.Size(149, 290); // // 量算ToolStripMenuItem // @@ -2897,7 +2907,7 @@ this.水平面积ToolStripMenuItem1, this.地表面积ToolStripMenuItem1}); this.量算ToolStripMenuItem.Name = "量算ToolStripMenuItem"; - this.量算ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.量算ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.量算ToolStripMenuItem.Text = "量算"; // // 水平距离ToolStripMenuItem1 @@ -2960,7 +2970,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -3036,7 +3046,7 @@ this.绕中心点飞行ToolStripMenuItem, this.绕眼睛飞行ToolStripMenuItem}); this.飞行ToolStripMenuItem.Name = "飞行ToolStripMenuItem"; - this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.飞行ToolStripMenuItem.Text = "飞行"; // // 自定义飞行ToolStripMenuItem @@ -3082,7 +3092,7 @@ this.红线工具ToolStripMenuItem, this.标注管理ToolStripMenuItem}); this.标注ToolStripMenuItem.Name = "标注ToolStripMenuItem"; - this.标注ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.标注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.标注ToolStripMenuItem.Text = "标注"; // // 标高标注ToolStripMenuItem @@ -3177,76 +3187,76 @@ this.关键字查询ToolStripMenuItem, this.附属物查询ToolStripMenuItem}); this.查询ToolStripMenuItem.Name = "查询ToolStripMenuItem"; - this.查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.查询ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.查询ToolStripMenuItem.Text = "查询"; // // 空间查询ToolStripMenuItem // this.空间查询ToolStripMenuItem.Name = "空间查询ToolStripMenuItem"; - this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.空间查询ToolStripMenuItem.Text = "空间查询"; this.空间查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch1_Click); // // 编号查询ToolStripMenuItem // this.编号查询ToolStripMenuItem.Name = "编号查询ToolStripMenuItem"; - this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.编号查询ToolStripMenuItem.Text = "编号查询"; this.编号查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch2_Click); // // 坐标查询ToolStripMenuItem // this.坐标查询ToolStripMenuItem.Name = "坐标查询ToolStripMenuItem"; - this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.坐标查询ToolStripMenuItem.Text = "坐标查询"; this.坐标查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch3_Click); // // 管径查询ToolStripMenuItem // this.管径查询ToolStripMenuItem.Name = "管径查询ToolStripMenuItem"; - this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.管径查询ToolStripMenuItem.Text = "管径查询"; this.管径查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch4_Click); // // 材质查询ToolStripMenuItem // this.材质查询ToolStripMenuItem.Name = "材质查询ToolStripMenuItem"; - this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.材质查询ToolStripMenuItem.Text = "材质查询"; this.材质查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch5_Click); // // 基本查询ToolStripMenuItem // this.基本查询ToolStripMenuItem.Name = "基本查询ToolStripMenuItem"; - this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.基本查询ToolStripMenuItem.Text = "基本查询"; this.基本查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch6_Click); // // 复合查询ToolStripMenuItem // this.复合查询ToolStripMenuItem.Name = "复合查询ToolStripMenuItem"; - this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.复合查询ToolStripMenuItem.Text = "复合查询"; this.复合查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch7_Click); // // 关联查询ToolStripMenuItem // this.关联查询ToolStripMenuItem.Name = "关联查询ToolStripMenuItem"; - this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关联查询ToolStripMenuItem.Text = "关联查询"; this.关联查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch8_Click); // // 关键字查询ToolStripMenuItem // this.关键字查询ToolStripMenuItem.Name = "关键字查询ToolStripMenuItem"; - this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关键字查询ToolStripMenuItem.Text = "关键字查询"; this.关键字查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch9_Click); // // 附属物查询ToolStripMenuItem // this.附属物查询ToolStripMenuItem.Name = "附属物查询ToolStripMenuItem"; - this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.附属物查询ToolStripMenuItem.Text = "附属物查询"; this.附属物查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch10_Click); // @@ -3264,7 +3274,7 @@ this.标识器分类统计ToolStripMenuItem, this.标识器街道统计ToolStripMenuItem}); this.全区域统计ToolStripMenuItem.Name = "全区域统计ToolStripMenuItem"; - this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.全区域统计ToolStripMenuItem.Text = "全区域统计"; // // 管线长度统计ToolStripMenuItem @@ -3351,7 +3361,7 @@ this.标识器分类统计ToolStripMenuItem1, this.标识器街道统计ToolStripMenuItem1}); this.绘制区域统计ToolStripMenuItem.Name = "绘制区域统计ToolStripMenuItem"; - this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.绘制区域统计ToolStripMenuItem.Text = "绘制区域统计"; // // 管线长度统计ToolStripMenuItem1 @@ -3432,7 +3442,7 @@ this.道路断面分析ToolStripMenuItem, this.基线剖面分析ToolStripMenuItem}); this.断面分析ToolStripMenuItem.Name = "断面分析ToolStripMenuItem"; - this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.断面分析ToolStripMenuItem.Text = "断面分析"; // // 横断面分析ToolStripMenuItem @@ -3474,7 +3484,7 @@ this.连通分析ToolStripMenuItem, this.爆管分析ToolStripMenuItem}); this.拓扑分析ToolStripMenuItem.Name = "拓扑分析ToolStripMenuItem"; - this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.拓扑分析ToolStripMenuItem.Text = "拓扑分析"; // // 创建拓扑ToolStripMenuItem @@ -3536,7 +3546,7 @@ this.隐藏隧道ToolStripMenuItem, this.删除隧道ToolStripMenuItem}); this.开挖分析ToolStripMenuItem.Name = "开挖分析ToolStripMenuItem"; - this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.开挖分析ToolStripMenuItem.Text = "开挖分析"; // // 多边形开挖ToolStripMenuItem @@ -3588,7 +3598,7 @@ this.可视域分析ToolStripMenuItem, this.可视包络分析ToolStripMenuItem}); this.视域分析ToolStripMenuItem.Name = "视域分析ToolStripMenuItem"; - this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.视域分析ToolStripMenuItem.Text = "视域分析"; // // 通视分析ToolStripMenuItem @@ -3619,7 +3629,7 @@ this.附属物分析ToolStripMenuItem, this.无源淹没分析ToolStripMenuItem}); this.区域分析ToolStripMenuItem.Name = "区域分析ToolStripMenuItem"; - this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.区域分析ToolStripMenuItem.Text = "区域分析"; // // 缓冲区分析ToolStripMenuItem @@ -3646,7 +3656,7 @@ // 清除分析ToolStripMenuItem // this.清除分析ToolStripMenuItem.Name = "清除分析ToolStripMenuItem"; - this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.清除分析ToolStripMenuItem.Text = "清除分析"; this.清除分析ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemClear_Click); // @@ -4112,9 +4122,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4158,6 +4168,142 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + 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, 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, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(737, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Visible = false; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4183,6 +4329,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -5560,143 +5707,6 @@ this.buttonItem_Event.Text = "事件管理"; this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - 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, 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, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(737, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Visible = false; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6005,6 +6015,7 @@ // 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"; @@ -6014,7 +6025,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -6387,16 +6397,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6470,9 +6470,9 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index fbe2109..40c1911 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/MainFrm.cs b/MainFrm.cs index e5a3d98..7375063 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1170,7 +1170,7 @@ { XmlDocument doc = new XmlDocument(); doc.Load(filename); - XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild"); + XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild");///Params/layers foreach (XmlNode xmlLayerNode in xmlLayerNodes) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 7d21d00..06700ee 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -365,6 +366,15 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -532,15 +542,6 @@ 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(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_device = new DevComponents.DotNetBar.ButtonItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,9 +647,9 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2884,7 +2894,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(153, 312); + this.toolRightMenu.Size = new System.Drawing.Size(149, 290); // // 量算ToolStripMenuItem // @@ -2897,7 +2907,7 @@ this.水平面积ToolStripMenuItem1, this.地表面积ToolStripMenuItem1}); this.量算ToolStripMenuItem.Name = "量算ToolStripMenuItem"; - this.量算ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.量算ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.量算ToolStripMenuItem.Text = "量算"; // // 水平距离ToolStripMenuItem1 @@ -2960,7 +2970,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -3036,7 +3046,7 @@ this.绕中心点飞行ToolStripMenuItem, this.绕眼睛飞行ToolStripMenuItem}); this.飞行ToolStripMenuItem.Name = "飞行ToolStripMenuItem"; - this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.飞行ToolStripMenuItem.Text = "飞行"; // // 自定义飞行ToolStripMenuItem @@ -3082,7 +3092,7 @@ this.红线工具ToolStripMenuItem, this.标注管理ToolStripMenuItem}); this.标注ToolStripMenuItem.Name = "标注ToolStripMenuItem"; - this.标注ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.标注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.标注ToolStripMenuItem.Text = "标注"; // // 标高标注ToolStripMenuItem @@ -3177,76 +3187,76 @@ this.关键字查询ToolStripMenuItem, this.附属物查询ToolStripMenuItem}); this.查询ToolStripMenuItem.Name = "查询ToolStripMenuItem"; - this.查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.查询ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.查询ToolStripMenuItem.Text = "查询"; // // 空间查询ToolStripMenuItem // this.空间查询ToolStripMenuItem.Name = "空间查询ToolStripMenuItem"; - this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.空间查询ToolStripMenuItem.Text = "空间查询"; this.空间查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch1_Click); // // 编号查询ToolStripMenuItem // this.编号查询ToolStripMenuItem.Name = "编号查询ToolStripMenuItem"; - this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.编号查询ToolStripMenuItem.Text = "编号查询"; this.编号查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch2_Click); // // 坐标查询ToolStripMenuItem // this.坐标查询ToolStripMenuItem.Name = "坐标查询ToolStripMenuItem"; - this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.坐标查询ToolStripMenuItem.Text = "坐标查询"; this.坐标查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch3_Click); // // 管径查询ToolStripMenuItem // this.管径查询ToolStripMenuItem.Name = "管径查询ToolStripMenuItem"; - this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.管径查询ToolStripMenuItem.Text = "管径查询"; this.管径查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch4_Click); // // 材质查询ToolStripMenuItem // this.材质查询ToolStripMenuItem.Name = "材质查询ToolStripMenuItem"; - this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.材质查询ToolStripMenuItem.Text = "材质查询"; this.材质查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch5_Click); // // 基本查询ToolStripMenuItem // this.基本查询ToolStripMenuItem.Name = "基本查询ToolStripMenuItem"; - this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.基本查询ToolStripMenuItem.Text = "基本查询"; this.基本查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch6_Click); // // 复合查询ToolStripMenuItem // this.复合查询ToolStripMenuItem.Name = "复合查询ToolStripMenuItem"; - this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.复合查询ToolStripMenuItem.Text = "复合查询"; this.复合查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch7_Click); // // 关联查询ToolStripMenuItem // this.关联查询ToolStripMenuItem.Name = "关联查询ToolStripMenuItem"; - this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关联查询ToolStripMenuItem.Text = "关联查询"; this.关联查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch8_Click); // // 关键字查询ToolStripMenuItem // this.关键字查询ToolStripMenuItem.Name = "关键字查询ToolStripMenuItem"; - this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关键字查询ToolStripMenuItem.Text = "关键字查询"; this.关键字查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch9_Click); // // 附属物查询ToolStripMenuItem // this.附属物查询ToolStripMenuItem.Name = "附属物查询ToolStripMenuItem"; - this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.附属物查询ToolStripMenuItem.Text = "附属物查询"; this.附属物查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch10_Click); // @@ -3264,7 +3274,7 @@ this.标识器分类统计ToolStripMenuItem, this.标识器街道统计ToolStripMenuItem}); this.全区域统计ToolStripMenuItem.Name = "全区域统计ToolStripMenuItem"; - this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.全区域统计ToolStripMenuItem.Text = "全区域统计"; // // 管线长度统计ToolStripMenuItem @@ -3351,7 +3361,7 @@ this.标识器分类统计ToolStripMenuItem1, this.标识器街道统计ToolStripMenuItem1}); this.绘制区域统计ToolStripMenuItem.Name = "绘制区域统计ToolStripMenuItem"; - this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.绘制区域统计ToolStripMenuItem.Text = "绘制区域统计"; // // 管线长度统计ToolStripMenuItem1 @@ -3432,7 +3442,7 @@ this.道路断面分析ToolStripMenuItem, this.基线剖面分析ToolStripMenuItem}); this.断面分析ToolStripMenuItem.Name = "断面分析ToolStripMenuItem"; - this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.断面分析ToolStripMenuItem.Text = "断面分析"; // // 横断面分析ToolStripMenuItem @@ -3474,7 +3484,7 @@ this.连通分析ToolStripMenuItem, this.爆管分析ToolStripMenuItem}); this.拓扑分析ToolStripMenuItem.Name = "拓扑分析ToolStripMenuItem"; - this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.拓扑分析ToolStripMenuItem.Text = "拓扑分析"; // // 创建拓扑ToolStripMenuItem @@ -3536,7 +3546,7 @@ this.隐藏隧道ToolStripMenuItem, this.删除隧道ToolStripMenuItem}); this.开挖分析ToolStripMenuItem.Name = "开挖分析ToolStripMenuItem"; - this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.开挖分析ToolStripMenuItem.Text = "开挖分析"; // // 多边形开挖ToolStripMenuItem @@ -3588,7 +3598,7 @@ this.可视域分析ToolStripMenuItem, this.可视包络分析ToolStripMenuItem}); this.视域分析ToolStripMenuItem.Name = "视域分析ToolStripMenuItem"; - this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.视域分析ToolStripMenuItem.Text = "视域分析"; // // 通视分析ToolStripMenuItem @@ -3619,7 +3629,7 @@ this.附属物分析ToolStripMenuItem, this.无源淹没分析ToolStripMenuItem}); this.区域分析ToolStripMenuItem.Name = "区域分析ToolStripMenuItem"; - this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.区域分析ToolStripMenuItem.Text = "区域分析"; // // 缓冲区分析ToolStripMenuItem @@ -3646,7 +3656,7 @@ // 清除分析ToolStripMenuItem // this.清除分析ToolStripMenuItem.Name = "清除分析ToolStripMenuItem"; - this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.清除分析ToolStripMenuItem.Text = "清除分析"; this.清除分析ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemClear_Click); // @@ -4112,9 +4122,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4158,6 +4168,142 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + 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, 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, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(737, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Visible = false; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4183,6 +4329,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -5560,143 +5707,6 @@ this.buttonItem_Event.Text = "事件管理"; this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - 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, 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, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(737, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Visible = false; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6005,6 +6015,7 @@ // 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"; @@ -6014,7 +6025,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -6387,16 +6397,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6470,9 +6470,9 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index fbe2109..40c1911 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index b004c5c..aeb901e 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4561fbf..2c39f54 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmLogin.cs b/FrmLogin.cs index 041d377..c054626 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -129,7 +129,7 @@ private bool ValidateUser() { string passWord = Utility.MD5Encrypt2(textBoxPassWord.Text.Trim()); - string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "'"; + string sql = "select * from casic_userinfotest where USERNAME='" + txtUser.Text.Trim() + "' and PASSWORD='" + passWord + "' AND SYSNAME='EMS'"; DataTable dt = OledbHelper.QueryTable(sql); if (dt != null && dt.Rows.Count > 0) diff --git a/FrmLogin.resx b/FrmLogin.resx index 32ab2fa..dfcf8bc 100644 --- a/FrmLogin.resx +++ b/FrmLogin.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAYAAADo08FDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxEAAAsRAX9kX5EAAP+WSURBVHhe7P13kxzJsiV43u8v + MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACxAAAAsQAa0jvXUAAP+WSURBVHhe7P13kxzJsiV43u8v +yV29p8VGZmRWdntnp5p8t67/cildYujCDjnvAooGms/dT+Rmg6PRCaQYFXhggN3N6KmpqZm7qEnLPIP m/2xP/bH/tgf+2N/7I9XPH799ddD2HUct9zbOJa67HFy/LI5Pl63/hp+/vWXI/HLL6+HNZkda3VOgjWZ HT/98vMbxVqbR2FNxrvEjz//9G7x0y/vFD/89OMhLPV79tPPW3z/40+F5z8c4NnzHzff/fDj5unzHwqu diff --git a/MainFrm.cs b/MainFrm.cs index e5a3d98..7375063 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1170,7 +1170,7 @@ { XmlDocument doc = new XmlDocument(); doc.Load(filename); - XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild"); + XmlNodeList xmlLayerNodes = doc.SelectNodes("//layerchild");///Params/layers foreach (XmlNode xmlLayerNode in xmlLayerNodes) { diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 7d21d00..06700ee 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -365,6 +366,15 @@ this.可编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSJGL = new DevComponents.DotNetBar.ButtonItem(); @@ -532,15 +542,6 @@ 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(); - this.buttonItem88 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem27 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_device = new DevComponents.DotNetBar.ButtonItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -647,9 +647,9 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2884,7 +2894,7 @@ this.区域分析ToolStripMenuItem, this.清除分析ToolStripMenuItem}); this.toolRightMenu.Name = "toolRightMenu"; - this.toolRightMenu.Size = new System.Drawing.Size(153, 312); + this.toolRightMenu.Size = new System.Drawing.Size(149, 290); // // 量算ToolStripMenuItem // @@ -2897,7 +2907,7 @@ this.水平面积ToolStripMenuItem1, this.地表面积ToolStripMenuItem1}); this.量算ToolStripMenuItem.Name = "量算ToolStripMenuItem"; - this.量算ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.量算ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.量算ToolStripMenuItem.Text = "量算"; // // 水平距离ToolStripMenuItem1 @@ -2960,7 +2970,7 @@ this.前进ToolStripMenuItem, this.删除模型ToolStripMenuItem}); this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.编辑ToolStripMenuItem.Text = "编辑"; // // 平移对象ToolStripMenuItem @@ -3036,7 +3046,7 @@ this.绕中心点飞行ToolStripMenuItem, this.绕眼睛飞行ToolStripMenuItem}); this.飞行ToolStripMenuItem.Name = "飞行ToolStripMenuItem"; - this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.飞行ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.飞行ToolStripMenuItem.Text = "飞行"; // // 自定义飞行ToolStripMenuItem @@ -3082,7 +3092,7 @@ this.红线工具ToolStripMenuItem, this.标注管理ToolStripMenuItem}); this.标注ToolStripMenuItem.Name = "标注ToolStripMenuItem"; - this.标注ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.标注ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.标注ToolStripMenuItem.Text = "标注"; // // 标高标注ToolStripMenuItem @@ -3177,76 +3187,76 @@ this.关键字查询ToolStripMenuItem, this.附属物查询ToolStripMenuItem}); this.查询ToolStripMenuItem.Name = "查询ToolStripMenuItem"; - this.查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.查询ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.查询ToolStripMenuItem.Text = "查询"; // // 空间查询ToolStripMenuItem // this.空间查询ToolStripMenuItem.Name = "空间查询ToolStripMenuItem"; - this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.空间查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.空间查询ToolStripMenuItem.Text = "空间查询"; this.空间查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch1_Click); // // 编号查询ToolStripMenuItem // this.编号查询ToolStripMenuItem.Name = "编号查询ToolStripMenuItem"; - this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编号查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.编号查询ToolStripMenuItem.Text = "编号查询"; this.编号查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch2_Click); // // 坐标查询ToolStripMenuItem // this.坐标查询ToolStripMenuItem.Name = "坐标查询ToolStripMenuItem"; - this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.坐标查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.坐标查询ToolStripMenuItem.Text = "坐标查询"; this.坐标查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch3_Click); // // 管径查询ToolStripMenuItem // this.管径查询ToolStripMenuItem.Name = "管径查询ToolStripMenuItem"; - this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.管径查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.管径查询ToolStripMenuItem.Text = "管径查询"; this.管径查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch4_Click); // // 材质查询ToolStripMenuItem // this.材质查询ToolStripMenuItem.Name = "材质查询ToolStripMenuItem"; - this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.材质查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.材质查询ToolStripMenuItem.Text = "材质查询"; this.材质查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch5_Click); // // 基本查询ToolStripMenuItem // this.基本查询ToolStripMenuItem.Name = "基本查询ToolStripMenuItem"; - this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.基本查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.基本查询ToolStripMenuItem.Text = "基本查询"; this.基本查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch6_Click); // // 复合查询ToolStripMenuItem // this.复合查询ToolStripMenuItem.Name = "复合查询ToolStripMenuItem"; - this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.复合查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.复合查询ToolStripMenuItem.Text = "复合查询"; this.复合查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch7_Click); // // 关联查询ToolStripMenuItem // this.关联查询ToolStripMenuItem.Name = "关联查询ToolStripMenuItem"; - this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关联查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关联查询ToolStripMenuItem.Text = "关联查询"; this.关联查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch8_Click); // // 关键字查询ToolStripMenuItem // this.关键字查询ToolStripMenuItem.Name = "关键字查询ToolStripMenuItem"; - this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关键字查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.关键字查询ToolStripMenuItem.Text = "关键字查询"; this.关键字查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch9_Click); // // 附属物查询ToolStripMenuItem // this.附属物查询ToolStripMenuItem.Name = "附属物查询ToolStripMenuItem"; - this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.附属物查询ToolStripMenuItem.Size = new System.Drawing.Size(136, 22); this.附属物查询ToolStripMenuItem.Text = "附属物查询"; this.附属物查询ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemSearch10_Click); // @@ -3264,7 +3274,7 @@ this.标识器分类统计ToolStripMenuItem, this.标识器街道统计ToolStripMenuItem}); this.全区域统计ToolStripMenuItem.Name = "全区域统计ToolStripMenuItem"; - this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.全区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.全区域统计ToolStripMenuItem.Text = "全区域统计"; // // 管线长度统计ToolStripMenuItem @@ -3351,7 +3361,7 @@ this.标识器分类统计ToolStripMenuItem1, this.标识器街道统计ToolStripMenuItem1}); this.绘制区域统计ToolStripMenuItem.Name = "绘制区域统计ToolStripMenuItem"; - this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.绘制区域统计ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.绘制区域统计ToolStripMenuItem.Text = "绘制区域统计"; // // 管线长度统计ToolStripMenuItem1 @@ -3432,7 +3442,7 @@ this.道路断面分析ToolStripMenuItem, this.基线剖面分析ToolStripMenuItem}); this.断面分析ToolStripMenuItem.Name = "断面分析ToolStripMenuItem"; - this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.断面分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.断面分析ToolStripMenuItem.Text = "断面分析"; // // 横断面分析ToolStripMenuItem @@ -3474,7 +3484,7 @@ this.连通分析ToolStripMenuItem, this.爆管分析ToolStripMenuItem}); this.拓扑分析ToolStripMenuItem.Name = "拓扑分析ToolStripMenuItem"; - this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.拓扑分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.拓扑分析ToolStripMenuItem.Text = "拓扑分析"; // // 创建拓扑ToolStripMenuItem @@ -3536,7 +3546,7 @@ this.隐藏隧道ToolStripMenuItem, this.删除隧道ToolStripMenuItem}); this.开挖分析ToolStripMenuItem.Name = "开挖分析ToolStripMenuItem"; - this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.开挖分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.开挖分析ToolStripMenuItem.Text = "开挖分析"; // // 多边形开挖ToolStripMenuItem @@ -3588,7 +3598,7 @@ this.可视域分析ToolStripMenuItem, this.可视包络分析ToolStripMenuItem}); this.视域分析ToolStripMenuItem.Name = "视域分析ToolStripMenuItem"; - this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.视域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.视域分析ToolStripMenuItem.Text = "视域分析"; // // 通视分析ToolStripMenuItem @@ -3619,7 +3629,7 @@ this.附属物分析ToolStripMenuItem, this.无源淹没分析ToolStripMenuItem}); this.区域分析ToolStripMenuItem.Name = "区域分析ToolStripMenuItem"; - this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.区域分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.区域分析ToolStripMenuItem.Text = "区域分析"; // // 缓冲区分析ToolStripMenuItem @@ -3646,7 +3656,7 @@ // 清除分析ToolStripMenuItem // this.清除分析ToolStripMenuItem.Name = "清除分析ToolStripMenuItem"; - this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.清除分析ToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.清除分析ToolStripMenuItem.Text = "清除分析"; this.清除分析ToolStripMenuItem.Click += new System.EventHandler(this.buttonItemClear_Click); // @@ -4112,9 +4122,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4158,6 +4168,142 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + 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, 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, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem87, + this.buttonItem88, + this.buttonItem27, + this.sliderGroundTransSet1, + this.buttonItem91, + this.buttonItem1, + this.btnlegendSet, + this.buttonItem89}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(737, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + // + // buttonItem87 + // + this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; + this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem87.Name = "buttonItem87"; + this.buttonItem87.SubItemsExpandWidth = 14; + this.buttonItem87.Text = "地上模式"; + this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); + // + // buttonItem88 + // + this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; + this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem88.Name = "buttonItem88"; + this.buttonItem88.SubItemsExpandWidth = 14; + this.buttonItem88.Text = "地下模式"; + this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); + // + // buttonItem27 + // + this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; + this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem27.Name = "buttonItem27"; + this.buttonItem27.SubItemsExpandWidth = 14; + this.buttonItem27.Text = "行走模式"; + this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // buttonItem1 + // + this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Visible = false; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4183,6 +4329,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -5560,143 +5707,6 @@ this.buttonItem_Event.Text = "事件管理"; this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - 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, 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, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem87, - this.buttonItem88, - this.buttonItem27, - this.sliderGroundTransSet1, - this.buttonItem91, - this.buttonItem1, - this.btnlegendSet, - this.buttonItem89}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(737, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - // - // buttonItem87 - // - this.buttonItem87.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__86; - this.buttonItem87.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem87.Name = "buttonItem87"; - this.buttonItem87.SubItemsExpandWidth = 14; - this.buttonItem87.Text = "地上模式"; - this.buttonItem87.Click += new System.EventHandler(this.buttonItem87_Click); - // - // buttonItem88 - // - this.buttonItem88.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__87; - this.buttonItem88.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem88.Name = "buttonItem88"; - this.buttonItem88.SubItemsExpandWidth = 14; - this.buttonItem88.Text = "地下模式"; - this.buttonItem88.Click += new System.EventHandler(this.buttonItem88_Click); - // - // buttonItem27 - // - this.buttonItem27.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__88; - this.buttonItem27.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem27.Name = "buttonItem27"; - this.buttonItem27.SubItemsExpandWidth = 14; - this.buttonItem27.Text = "行走模式"; - this.buttonItem27.Click += new System.EventHandler(this.buttonItem27_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__92; - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // buttonItem1 - // - this.buttonItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__94; - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__93; - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__90; - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Visible = false; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -6005,6 +6015,7 @@ // 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"; @@ -6014,7 +6025,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_08_hover; this.ribbonTabItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon_08; this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -6387,16 +6397,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -6470,9 +6470,9 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index fbe2109..40c1911 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index b004c5c..aeb901e 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/login.xml b/bin/x86/Debug/login.xml index 27656b9..6af26a4 100644 --- a/bin/x86/Debug/login.xml +++ b/bin/x86/Debug/login.xml @@ -1,6 +1,6 @@  - szht - szht@1234 + liuyeming + liuyeming123 true \ No newline at end of file