diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = ""; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/TreeUtils.cs b/TreeUtils.cs index cf0572b..d394a2d 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -68,6 +68,10 @@ /// public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) { + if (node.Text.Equals("道路")&&node.Tag==null) + {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 + node.Tag = globeControl.Globe.Layers.GetLayerByCaption("道路"); + } if (node.Tag != null) { if (node.Tag is GSOLayer)//图层 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/TreeUtils.cs b/TreeUtils.cs index cf0572b..d394a2d 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -68,6 +68,10 @@ /// public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) { + if (node.Text.Equals("道路")&&node.Tag==null) + {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 + node.Tag = globeControl.Globe.Layers.GetLayerByCaption("道路"); + } if (node.Tag != null) { if (node.Tag is GSOLayer)//图层 diff --git a/Utility.cs b/Utility.cs index f7aa6b7..d4382dc 100644 --- a/Utility.cs +++ b/Utility.cs @@ -381,7 +381,8 @@ List layers = layerType.layers; foreach (var layer in layers) { - dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); + if(!dictionaryNetLayerNameAndCaption.ContainsKey(layer.layer)) + dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); if (layer.layer.EndsWith("管线")) { LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2)); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/TreeUtils.cs b/TreeUtils.cs index cf0572b..d394a2d 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -68,6 +68,10 @@ /// public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) { + if (node.Text.Equals("道路")&&node.Tag==null) + {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 + node.Tag = globeControl.Globe.Layers.GetLayerByCaption("道路"); + } if (node.Tag != null) { if (node.Tag is GSOLayer)//图层 diff --git a/Utility.cs b/Utility.cs index f7aa6b7..d4382dc 100644 --- a/Utility.cs +++ b/Utility.cs @@ -381,7 +381,8 @@ List layers = layerType.layers; foreach (var layer in layers) { - dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); + if(!dictionaryNetLayerNameAndCaption.ContainsKey(layer.layer)) + dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); if (layer.layer.EndsWith("管线")) { LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2)); diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index b7dafa9..6803210 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -5,7 +5,7 @@ szhtdb2 192.168.0.203 release - 127.0.0.1 + 192.168.0.203 1500 http://192.168.0.203/images/ http://192.168.0.203/images/default.jpg diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/TreeUtils.cs b/TreeUtils.cs index cf0572b..d394a2d 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -68,6 +68,10 @@ /// public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) { + if (node.Text.Equals("道路")&&node.Tag==null) + {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 + node.Tag = globeControl.Globe.Layers.GetLayerByCaption("道路"); + } if (node.Tag != null) { if (node.Tag is GSOLayer)//图层 diff --git a/Utility.cs b/Utility.cs index f7aa6b7..d4382dc 100644 --- a/Utility.cs +++ b/Utility.cs @@ -381,7 +381,8 @@ List layers = layerType.layers; foreach (var layer in layers) { - dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); + if(!dictionaryNetLayerNameAndCaption.ContainsKey(layer.layer)) + dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); if (layer.layer.EndsWith("管线")) { LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2)); diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index b7dafa9..6803210 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -5,7 +5,7 @@ szhtdb2 192.168.0.203 release - 127.0.0.1 + 192.168.0.203 1500 http://192.168.0.203/images/ http://192.168.0.203/images/default.jpg diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 06a7613..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 41f54d4..3927161 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index cfa1b3d..95f2339 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -36,13 +36,13 @@ //编号为空，为了限制删除的仅是用户自己添加的feature string bh = feature.GetFieldAsString("编号"); - if (bh!= null&&!bh.Trim().Equals("")) + if (bh == null) return false; + if (!bh.EndsWith("TMP")) { - MessageBox.Show("非自定义创建要素，不可删除"); return false; } feature.Delete();//地球上删除该feature - string sql = "delete from " + layerName + " where 编码 =" + feature.GetFieldAsString("编码") + " and 编号 is null"; + string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 } catch (Exception) @@ -52,5 +52,27 @@ return true; } + /// + /// 根据编码，获取要素的种类描述 + /// + /// + /// + public static string GetFeatureTypeByCode(string code) + { + if (code == null || code.Trim().Equals("")) return ""; + string result = ""; + foreach (PipelineType pipelineType in Utility.listPipelineType) + { + if (pipelineType == null || pipelineType.code.Trim() != code.Trim()) continue; + result = pipelineType.type; + if (!pipelineType.type.Equals(pipelineType.name)) + { + result += " " + pipelineType.name; + } + break; + } + return result; + } + } } diff --git a/Forms/FrmPaiShuiAttribute.cs b/Forms/FrmPaiShuiAttribute.cs index 6afda51..851b8f9 100644 --- a/Forms/FrmPaiShuiAttribute.cs +++ b/Forms/FrmPaiShuiAttribute.cs @@ -43,14 +43,8 @@ if (txtGuanJing.Text == ""||txtGuanJing .Text =="0") { - if (txtGuanJing.Text == "") - { - MessageBox.Show("管径不能为空！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } - else - { - MessageBox.Show("管径不能为零！", "提示！", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + MessageBox.Show(txtGuanJing.Text == "" ? "管径不能为空！" : "管径不能为零！", "提示！", MessageBoxButtons.OK, + MessageBoxIcon.Warning); return; } try @@ -303,8 +297,8 @@ layertype = "GD"; else if (layername.Contains("不明")) layertype = "BM"; - txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text +"_" - +Guid.NewGuid(); + txtBianHao.Text = "GX_" + layertype + "L_" + txtBianMa.Text + "_" + +Guid.NewGuid()+"TMP"; } } diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 2c0ea07..82ed140 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,13 +49,20 @@ pt.X = point.X; pt.Y = point.Y; pt.Z = point.Z; + GSOGeoModel model = new GSOGeoModel(); model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; feature = new GSOFeature(); +// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; +// if (featDataSet == null) return; +// feature = featDataSet.CreateFeature(); + string bianhao = "FSW" + Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); feature.Geometry = model; modelLayer.AddFeature(feature); + if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { modelLayer.Save(); diff --git a/FrmAddPipeFitting .cs b/FrmAddPipeFitting .cs index ad91a93..c295c89 100644 --- a/FrmAddPipeFitting .cs +++ b/FrmAddPipeFitting .cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using DevComponents.DotNetBar; using GeoScene.Data; +using GeoScene.Engine; using GeoScene.Globe; namespace Cyberpipe @@ -48,9 +49,13 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); feature.Geometry = model; - + string bianhao = "TZGD"+Guid.NewGuid() + "TMP"; + feature.SetValue("编号", bianhao); modelLayer.AddFeature(feature); if (MessageBox.Show("是否保存到数据库？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { diff --git a/FrmAddPipeFitting .designer.cs b/FrmAddPipeFitting .designer.cs index b362e56..76b37ce 100644 --- a/FrmAddPipeFitting .designer.cs +++ b/FrmAddPipeFitting .designer.cs @@ -60,10 +60,9 @@ this.groupPanel1.Controls.Add(this.label2); this.groupPanel1.Controls.Add(this.label1); this.groupPanel1.Controls.Add(this.listBoxType); - this.groupPanel1.Location = new System.Drawing.Point(15, 58); - this.groupPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel1.Location = new System.Drawing.Point(11, 46); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(611, 125); + this.groupPanel1.Size = new System.Drawing.Size(458, 100); // // // @@ -100,11 +99,10 @@ // listBoxSize // this.listBoxSize.FormattingEnabled = true; - this.listBoxSize.ItemHeight = 15; - this.listBoxSize.Location = new System.Drawing.Point(392, 11); - this.listBoxSize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxSize.ItemHeight = 12; + this.listBoxSize.Location = new System.Drawing.Point(294, 9); this.listBoxSize.Name = "listBoxSize"; - this.listBoxSize.Size = new System.Drawing.Size(205, 94); + this.listBoxSize.Size = new System.Drawing.Size(155, 76); this.listBoxSize.TabIndex = 8; this.listBoxSize.SelectedIndexChanged += new System.EventHandler(this.listBoxSize_SelectedIndexChanged); // @@ -113,10 +111,9 @@ this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("宋体", 9F); - this.label2.Location = new System.Drawing.Point(300, 11); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(225, 9); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; this.label2.Text = "管件规格："; // @@ -125,10 +122,9 @@ this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("宋体", 9F); - this.label1.Location = new System.Drawing.Point(4, 11); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(3, 9); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(82, 15); + this.label1.Size = new System.Drawing.Size(65, 12); this.label1.TabIndex = 1; this.label1.Text = "管件类型："; // @@ -136,11 +132,10 @@ // this.listBoxType.Font = new System.Drawing.Font("宋体", 9F); this.listBoxType.FormattingEnabled = true; - this.listBoxType.ItemHeight = 15; - this.listBoxType.Location = new System.Drawing.Point(96, 10); - this.listBoxType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.listBoxType.ItemHeight = 12; + this.listBoxType.Location = new System.Drawing.Point(72, 8); this.listBoxType.Name = "listBoxType"; - this.listBoxType.Size = new System.Drawing.Size(169, 94); + this.listBoxType.Size = new System.Drawing.Size(128, 76); this.listBoxType.TabIndex = 8; this.listBoxType.SelectedIndexChanged += new System.EventHandler(this.listBoxType_SelectedIndexChanged); // @@ -149,10 +144,9 @@ this.groupPanel2.CanvasColor = System.Drawing.SystemColors.Control; this.groupPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel2.Controls.Add(this.panel1); - this.groupPanel2.Location = new System.Drawing.Point(15, 190); - this.groupPanel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel2.Location = new System.Drawing.Point(11, 152); this.groupPanel2.Name = "groupPanel2"; - this.groupPanel2.Size = new System.Drawing.Size(611, 329); + this.groupPanel2.Size = new System.Drawing.Size(458, 263); // // // @@ -191,19 +185,17 @@ // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(605, 302); + this.panel1.Size = new System.Drawing.Size(452, 241); this.panel1.TabIndex = 0; // // btnCancel // this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCancel.Location = new System.Drawing.Point(527, 528); - this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnCancel.Location = new System.Drawing.Point(395, 422); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(100, 29); + this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.TabIndex = 16; this.btnCancel.Text = "关闭"; @@ -213,10 +205,9 @@ // this.btnAdd.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btnAdd.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnAdd.Location = new System.Drawing.Point(415, 528); - this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.btnAdd.Location = new System.Drawing.Point(311, 422); this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(100, 29); + this.btnAdd.Size = new System.Drawing.Size(75, 23); this.btnAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAdd.TabIndex = 15; this.btnAdd.Text = "添加"; @@ -230,10 +221,9 @@ this.groupPanel3.Controls.Add(this.textBoxXLon); this.groupPanel3.Controls.Add(this.labelLat); this.groupPanel3.Controls.Add(this.labelLon); - this.groupPanel3.Location = new System.Drawing.Point(15, 8); - this.groupPanel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupPanel3.Location = new System.Drawing.Point(11, 6); this.groupPanel3.Name = "groupPanel3"; - this.groupPanel3.Size = new System.Drawing.Size(611, 40); + this.groupPanel3.Size = new System.Drawing.Size(458, 32); // // // @@ -274,10 +264,9 @@ // this.textBoxXLat.Border.Class = "TextBoxBorder"; this.textBoxXLat.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLat.Location = new System.Drawing.Point(392, 2); - this.textBoxXLat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLat.Location = new System.Drawing.Point(294, 2); this.textBoxXLat.Name = "textBoxXLat"; - this.textBoxXLat.Size = new System.Drawing.Size(171, 30); + this.textBoxXLat.Size = new System.Drawing.Size(128, 21); this.textBoxXLat.TabIndex = 3; this.textBoxXLat.TextChanged += new System.EventHandler(this.textBoxXLat_TextChanged); // @@ -288,10 +277,9 @@ // this.textBoxXLon.Border.Class = "TextBoxBorder"; this.textBoxXLon.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxXLon.Location = new System.Drawing.Point(96, 2); - this.textBoxXLon.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBoxXLon.Location = new System.Drawing.Point(72, 2); this.textBoxXLon.Name = "textBoxXLon"; - this.textBoxXLon.Size = new System.Drawing.Size(171, 30); + this.textBoxXLon.Size = new System.Drawing.Size(128, 21); this.textBoxXLon.TabIndex = 2; this.textBoxXLon.TextChanged += new System.EventHandler(this.textBoxXLon_TextChanged); // @@ -300,10 +288,9 @@ this.labelLat.AutoSize = true; this.labelLat.BackColor = System.Drawing.Color.Transparent; this.labelLat.Font = new System.Drawing.Font("宋体", 9F); - this.labelLat.Location = new System.Drawing.Point(300, 11); - this.labelLat.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLat.Location = new System.Drawing.Point(225, 9); this.labelLat.Name = "labelLat"; - this.labelLat.Size = new System.Drawing.Size(52, 15); + this.labelLat.Size = new System.Drawing.Size(41, 12); this.labelLat.TabIndex = 1; this.labelLat.Text = "纬度："; // @@ -312,18 +299,17 @@ this.labelLon.AutoSize = true; this.labelLon.BackColor = System.Drawing.Color.Transparent; this.labelLon.Font = new System.Drawing.Font("宋体", 9F); - this.labelLon.Location = new System.Drawing.Point(4, 11); - this.labelLon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelLon.Location = new System.Drawing.Point(3, 9); this.labelLon.Name = "labelLon"; - this.labelLon.Size = new System.Drawing.Size(52, 15); + this.labelLon.Size = new System.Drawing.Size(41, 12); this.labelLon.TabIndex = 1; this.labelLon.Text = "经度："; // // FrmAddPipeFitting // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(641, 564); + this.ClientSize = new System.Drawing.Size(481, 451); this.Controls.Add(this.groupPanel3); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnAdd); @@ -332,7 +318,6 @@ this.DoubleBuffered = true; this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.Name = "FrmAddPipeFitting"; this.ShowIcon = false; diff --git a/FrmGBJC.cs.orig b/FrmGBJC.cs.orig new file mode 100644 index 0000000..a118875 --- /dev/null +++ b/FrmGBJC.cs.orig @@ -0,0 +1,124 @@ +using System; +using System.Data; +using System.Windows.Forms; +using DevComponents.DotNetBar; +using GeoScene.Data; +using GeoScene.Engine; +using GeoScene.Globe; + +namespace Cyberpipe +{ + public partial class FrmGBJC : Office2007Form + { + string sgIp, sgDb, sgUser, sgPwd; + GSOGlobeControl globeControl1 = null; + GSOGlobeControl globeControl2 = null; + + public FrmGBJC(GSOGlobeControl _globeControl1,GSOGlobeControl _globeControl2) + { + this.globeControl1 = _globeControl1; + this.globeControl2 = _globeControl2; + InitializeComponent(); + } + + void addListBox(GSODataSource ds,ListBox lt) + { + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; + } + + for (int i = 0; i < ds.DatasetCount; i++) + { + GSODataset dt = ds.GetDatasetAt(i); + + if (dt.Name.ToLower().Contains("network") || !dt.Name.ToLower().EndsWith("管线") || + dt.Name.Contains("SH")) + continue; + if (!dt.Name.Contains("给水") && !dt.Name.Contains("雨水") && !dt.Name.Contains("污水") && + !dt.Name.Contains("雨污") && !dt.Name.Contains("燃气") && !dt.Name.Contains("电力")) + continue; + lt.Items.Add(dt.Name); + } + } + + private void FrmGBJC_Load(object sender, EventArgs e) + { + //填充施工数据列表 + sgIp = Utility.sgdbip; + sgDb = Utility.sgdbname; + sgUser = Utility.sgdbuser; + sgPwd = Utility.sgdbpwd; + + GSODataSource sgDs = globeControl1.Globe.DataManager.OpenOracleDataSource(sgIp + "/" + sgDb, "", "", sgUser, sgPwd); + addListBox(sgDs, listBoxSG); + //填充实测数据列表 + GSODataSource scDs = Utility.dataSource; + addListBox(scDs, listBoxSC); + + for (int i = 0; i < listBoxSC.Items.Count; i++) + { + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(listBoxSC.Items[i].ToString()); + GSOFeatures fs = layer.GetAllFeatures(); + for (int j = 0; j < fs.Length; j++) + { + string road = fs[j].GetFieldAsString("所属道路"); + if (!comboBoxRoad.Items.Contains(road) && road != "") + comboBoxRoad.Items.Add(road); + } + } + } + + private void listBoxSG_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSG.SelectedItem == null) return; + textBoxSG.Text = listBoxSG.SelectedItem.ToString(); + } + + private void listBoxSC_SelectedIndexChanged(object sender, EventArgs e) + { + if (listBoxSC.SelectedItem == null) return; + textBoxSC.Text = listBoxSC.SelectedItem.ToString(); + } + + private bool InvalParam() + { + if (textBoxSC.Text.Trim().Equals("")) + { + MessageBox.Show("请选择实测管线图层！", "提示"); + return false; + } + if (textBoxSG.Text.Trim().Equals("")) + { + MessageBox.Show("请选择施工图层！", "提示"); + return false; + } + if (comboBoxRoad.SelectedItem == null) + { + MessageBox.Show("请选择道路！", "提示"); + return false; + } + return true; + } + + private void buttonOK_Click(object sender, EventArgs e) + { + bool isvalid = InvalParam(); + if (!isvalid) return; + GSOLayer scLayer = globeControl1.Globe.Layers.GetLayerByCaption(textBoxSC.Text); + GSOLayer sgLayer = globeControl2.Globe.Layers.GetLayerByCaption(textBoxSG.Text); + + if (scLayer == null || sgLayer == null) + return; + + DataTable dt = DoublePanelAnalysis.CompareLayerByRoad(scLayer, sgLayer, + comboBoxRoad.SelectedItem.ToString(), globeControl1, globeControl2); + + FrmGBJCresult rs = new FrmGBJCresult(globeControl1, globeControl2, dt); + rs.Show(); + this.Close(); + } + + } +} diff --git a/MainFrm.cs b/MainFrm.cs index 9e98658..eae78f7 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1158,11 +1158,11 @@ private void connectServer() { - globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 - //初始化TreeView - + globeControl1.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 +// globeControl2.Globe.ConnectServer(Utility.serverip, Utility.serverport, "", ""); //加载locaServer中的数据 + //初始化TreeView initLayerTree(); + } /// /// 加载地球1、2的图层 @@ -1232,10 +1232,6 @@ } } } - -// LoadDataForGlobalControl ss = connectServer; -// ss(); - this.Invoke((EventHandler) delegate { connectServer(); @@ -2337,34 +2333,10 @@ /// private string GetBubbleInfo(GSOFeature feature, GSOGlobeControl globeControl) { - if (feature == null) - { - return ""; - } - string str = ""; - str = "
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "
"; - string title = ""; - if (feature.GetFieldDefn("编码") != null) - { - string pipelinecode = feature.GetFieldAsString("编码"); - if (pipelinecode != null) - { - if (Utility.listPipelineType != null) - { - foreach (PipelineType pipelineType in Utility.listPipelineType) - { - if (pipelineType == null || pipelineType.code.Trim() != pipelinecode.Trim()) continue; - title = pipelineType.type + " " + pipelineType.name; - if (pipelineType.type == pipelineType.name) - { - title = pipelineType.type; - } - break; - } - } - } - } - + if (feature == null) return ""; + string str = "
"; + var code = feature.GetFieldAsString("编码"); + var title = FeatureTools.GetFeatureTypeByCode(code); str += ""; int rowCount = feature.GetFieldCount(); @@ -7408,23 +7380,22 @@ MessageBox.Show("请选中要删除的模型！", "提示"); return; } + int delSuccessCount = 0; for (int i = 0; i < selObjCount; i++) { GSOFeature f; GSOLayer layer; globeControl1.Globe.GetSelectObject(i, out f, out layer); -// if (f == null) continue; -// f.Delete(); -// if (layer != null) -// globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); - FeatureTools.DeleteFeature(f); - + if (layer != null) + globeControl1.Globe.AddToEditHistroy(layer, f, EnumEditType.Delete); + bool result = FeatureTools.DeleteFeature(f); + if (result) delSuccessCount++; globeControl1.Refresh(); } - MessageBox.Show("删除成功！", "提示"); + MessageBox.Show("成功删除"+delSuccessCount+"个模型！", "提示"); globeControl1.Globe.Action = EnumAction3D.ActionNull; } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2bd8c81..e57bf2b 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -89,6 +89,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(); @@ -298,22 +299,18 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); + this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); + this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); + this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -325,15 +322,13 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_resc_info = new DevComponents.DotNetBar.ButtonItem(); - this.btn_role_resc = new DevComponents.DotNetBar.ButtonItem(); - this.btn_user_role = new DevComponents.DotNetBar.ButtonItem(); - this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem2 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -344,6 +339,12 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -528,7 +529,6 @@ this.labelX16 = new DevComponents.DotNetBar.LabelX(); this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -540,12 +540,12 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,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, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -966,6 +966,18 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2158,11 +2170,11 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; @@ -2231,6 +2243,7 @@ this.ribbonPanel15.StyleMouseOver.Class = ""; this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel15.TabIndex = 35; + this.ribbonPanel15.Visible = false; // // ribbonBar20 // @@ -2685,6 +2698,137 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar3); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar3 + // + this.ribbonBar3.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.BackgroundStyle.Class = ""; + this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.ContainerControlProcessDialogKey = true; + this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_user_info, + this.btn_role_info, + this.btn_resc_info, + this.btn_role_resc, + this.btn_user_role, + this.btn_password_edit, + this.buttonItemPasswordReset}); + this.ribbonBar3.Location = new System.Drawing.Point(3, 0); + this.ribbonBar3.Name = "ribbonBar3"; + this.ribbonBar3.Size = new System.Drawing.Size(551, 59); + this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar3.TabIndex = 1; + // + // + // + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; + // + // btn_user_info + // + this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); + this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_info.Name = "btn_user_info"; + this.btn_user_info.SubItemsExpandWidth = 14; + this.btn_user_info.Text = "用户管理"; + this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + // + // btn_role_info + // + this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); + this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_info.Name = "btn_role_info"; + this.btn_role_info.SubItemsExpandWidth = 14; + this.btn_role_info.Text = "角色管理"; + this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + // + // btn_resc_info + // + this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); + this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_resc_info.Name = "btn_resc_info"; + this.btn_resc_info.SubItemsExpandWidth = 14; + this.btn_resc_info.Text = "资源管理"; + this.btn_resc_info.Visible = false; + this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + // + // btn_role_resc + // + this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); + this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_role_resc.Name = "btn_role_resc"; + this.btn_role_resc.SubItemsExpandWidth = 14; + this.btn_role_resc.Text = "角色授权"; + this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + // + // btn_user_role + // + this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); + this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_user_role.Name = "btn_user_role"; + this.btn_user_role.SubItemsExpandWidth = 14; + this.btn_user_role.Text = "用户授权"; + this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); + // + // btn_password_edit + // + this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); + this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_password_edit.Name = "btn_password_edit"; + this.btn_password_edit.SubItemsExpandWidth = 14; + this.btn_password_edit.Text = "密码修改"; + this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); + // + // buttonItemPasswordReset + // + this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); + this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; + this.buttonItemPasswordReset.SubItemsExpandWidth = 14; + this.buttonItemPasswordReset.Text = "重置密码"; + this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2755,219 +2899,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel6 - // - this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel6.Controls.Add(this.ribbonBar6); - this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel6.Name = "ribbonPanel6"; - this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel6.Style.Class = ""; - this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseDown.Class = ""; - this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel6.StyleMouseOver.Class = ""; - this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel6.TabIndex = 38; - this.ribbonPanel6.Visible = false; - // - // ribbonBar6 - // - this.ribbonBar6.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.BackgroundStyle.Class = ""; - this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.ContainerControlProcessDialogKey = true; - this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemSPSZ, - this.buttonItem8, - this.buttonItemLocation, - this.sliderItem2, - this.buttonItemGBJC}); - this.ribbonBar6.Location = new System.Drawing.Point(3, 0); - this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 92); - this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar6.TabIndex = 0; - // - // - // - this.ribbonBar6.TitleStyle.Class = ""; - this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar6.TitleStyleMouseOver.Class = ""; - this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar6.TitleVisible = false; - // - // buttonItemSPSZ - // - this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); - this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemSPSZ.Name = "buttonItemSPSZ"; - this.buttonItemSPSZ.SubItemsExpandWidth = 14; - this.buttonItemSPSZ.Text = "双屏设置"; - this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); - // - // buttonItem8 - // - this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); - this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem8.Name = "buttonItem8"; - this.buttonItem8.SubItemsExpandWidth = 14; - this.buttonItem8.Text = "双屏分析"; - this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); - // - // buttonItemLocation - // - this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); - this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemLocation.Name = "buttonItemLocation"; - this.buttonItemLocation.SubItemsExpandWidth = 14; - this.buttonItemLocation.Text = "快速定位"; - this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); - // - // sliderItem2 - // - this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem2.LabelWidth = 50; - this.sliderItem2.Name = "sliderItem2"; - this.sliderItem2.Text = "地面透明度"; - this.sliderItem2.TextColor = System.Drawing.Color.Black; - this.sliderItem2.Value = 0; - this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); - // - // buttonItemGBJC - // - this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); - this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemGBJC.Name = "buttonItemGBJC"; - this.buttonItemGBJC.SubItemsExpandWidth = 14; - this.buttonItemGBJC.Text = "国标检测"; - this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); - // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 92); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3138,136 +3069,115 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel2 + // ribbonPanel6 // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar3); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel6.Controls.Add(this.ribbonBar6); + this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Name = "ribbonPanel6"; + this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.Style.Class = ""; + this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.StyleMouseDown.Class = ""; + this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; + this.ribbonPanel6.StyleMouseOver.Class = ""; + this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel6.TabIndex = 38; // - // ribbonBar3 + // ribbonBar6 // - this.ribbonBar3.AutoOverflowEnabled = true; + this.ribbonBar6.AutoOverflowEnabled = true; // // // - this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.BackgroundStyle.Class = ""; - this.ribbonBar3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.ContainerControlProcessDialogKey = true; - this.ribbonBar3.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar3.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_user_info, - this.btn_role_info, - this.btn_resc_info, - this.btn_role_resc, - this.btn_user_role, - this.btn_password_edit, - this.buttonItemPasswordReset}); - this.ribbonBar3.Location = new System.Drawing.Point(3, 0); - this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(551, 59); - this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar3.TabIndex = 1; + this.ribbonBar6.BackgroundStyle.Class = ""; + this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.ContainerControlProcessDialogKey = true; + this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemSPSZ, + this.buttonItem8, + this.buttonItemLocation, + this.sliderItem2, + this.buttonItemGBJC}); + this.ribbonBar6.Location = new System.Drawing.Point(3, 0); + this.ribbonBar6.Name = "ribbonBar6"; + this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar6.TabIndex = 0; // // // - this.ribbonBar3.TitleStyle.Class = ""; - this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleStyle.Class = ""; + this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar3.TitleStyleMouseOver.Class = ""; - this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar3.TitleVisible = false; + this.ribbonBar6.TitleStyleMouseOver.Class = ""; + this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar6.TitleVisible = false; // - // btn_user_info + // buttonItemSPSZ // - this.btn_user_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_info.Image"))); - this.btn_user_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_info.Name = "btn_user_info"; - this.btn_user_info.SubItemsExpandWidth = 14; - this.btn_user_info.Text = "用户管理"; - this.btn_user_info.Click += new System.EventHandler(this.btn_user_info_Click); + this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image"))); + this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemSPSZ.Name = "buttonItemSPSZ"; + this.buttonItemSPSZ.SubItemsExpandWidth = 14; + this.buttonItemSPSZ.Text = "双屏设置"; + this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click); // - // btn_role_info + // buttonItem8 // - this.btn_role_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_info.Image"))); - this.btn_role_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_info.Name = "btn_role_info"; - this.btn_role_info.SubItemsExpandWidth = 14; - this.btn_role_info.Text = "角色管理"; - this.btn_role_info.Click += new System.EventHandler(this.btn_role_info_Click); + this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image"))); + this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem8.Name = "buttonItem8"; + this.buttonItem8.SubItemsExpandWidth = 14; + this.buttonItem8.Text = "双屏分析"; + this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click); // - // btn_resc_info + // buttonItemLocation // - this.btn_resc_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_resc_info.Image"))); - this.btn_resc_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_resc_info.Name = "btn_resc_info"; - this.btn_resc_info.SubItemsExpandWidth = 14; - this.btn_resc_info.Text = "资源管理"; - this.btn_resc_info.Visible = false; - this.btn_resc_info.Click += new System.EventHandler(this.btn_resc_info_Click); + this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image"))); + this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemLocation.Name = "buttonItemLocation"; + this.buttonItemLocation.SubItemsExpandWidth = 14; + this.buttonItemLocation.Text = "快速定位"; + this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click); // - // btn_role_resc + // sliderItem2 // - this.btn_role_resc.Image = ((System.Drawing.Image)(resources.GetObject("btn_role_resc.Image"))); - this.btn_role_resc.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_role_resc.Name = "btn_role_resc"; - this.btn_role_resc.SubItemsExpandWidth = 14; - this.btn_role_resc.Text = "角色授权"; - this.btn_role_resc.Click += new System.EventHandler(this.btn_role_resc_Click); + this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem2.LabelWidth = 50; + this.sliderItem2.Name = "sliderItem2"; + this.sliderItem2.Text = "地面透明度"; + this.sliderItem2.TextColor = System.Drawing.Color.Black; + this.sliderItem2.Value = 0; + this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged); // - // btn_user_role + // buttonItemGBJC // - this.btn_user_role.Image = ((System.Drawing.Image)(resources.GetObject("btn_user_role.Image"))); - this.btn_user_role.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_user_role.Name = "btn_user_role"; - this.btn_user_role.SubItemsExpandWidth = 14; - this.btn_user_role.Text = "用户授权"; - this.btn_user_role.Click += new System.EventHandler(this.btn_user_role_Click); - // - // btn_password_edit - // - this.btn_password_edit.Image = ((System.Drawing.Image)(resources.GetObject("btn_password_edit.Image"))); - this.btn_password_edit.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_password_edit.Name = "btn_password_edit"; - this.btn_password_edit.SubItemsExpandWidth = 14; - this.btn_password_edit.Text = "密码修改"; - this.btn_password_edit.Click += new System.EventHandler(this.btn_password_edit_Click); - // - // buttonItemPasswordReset - // - this.buttonItemPasswordReset.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemPasswordReset.Image"))); - this.buttonItemPasswordReset.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemPasswordReset.Name = "buttonItemPasswordReset"; - this.buttonItemPasswordReset.SubItemsExpandWidth = 14; - this.buttonItemPasswordReset.Text = "重置密码"; - this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click); + this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image"))); + this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemGBJC.Name = "buttonItemGBJC"; + this.buttonItemGBJC.SubItemsExpandWidth = 14; + this.buttonItemGBJC.Text = "国标检测"; + this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click); // // ribbonPanel1 // @@ -3415,6 +3325,108 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3448,6 +3460,7 @@ // ribbonTabItem9 // this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem9.Checked = true; this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage"))); this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image"))); this.ribbonTabItem9.Name = "ribbonTabItem9"; @@ -3468,7 +3481,6 @@ // ribbonTabItem14 // this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem14.Checked = true; this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage"))); this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image"))); this.ribbonTabItem14.Name = "ribbonTabItem14"; @@ -4463,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(27517, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(27814, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4557,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(27516, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(27813, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5731,18 +5743,6 @@ this.panelEx4.TabIndex = 26; this.panelEx4.Text = "panelEx4"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5787,12 +5787,12 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/MainFrm.resx b/MainFrm.resx index 44c653e..57cc13b 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,142 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2134,142 +2270,6 @@ AAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/TreeUtils.cs b/TreeUtils.cs index cf0572b..d394a2d 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -68,6 +68,10 @@ /// public static void TreeNodeCheckedChange(GSOGlobeControl globeControl, TreeNode node) { + if (node.Text.Equals("道路")&&node.Tag==null) + {//由于冰箱图层是异步加载的，刚开始执行道路加载不上,故单独处理一下 + node.Tag = globeControl.Globe.Layers.GetLayerByCaption("道路"); + } if (node.Tag != null) { if (node.Tag is GSOLayer)//图层 diff --git a/Utility.cs b/Utility.cs index f7aa6b7..d4382dc 100644 --- a/Utility.cs +++ b/Utility.cs @@ -381,7 +381,8 @@ List layers = layerType.layers; foreach (var layer in layers) { - dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); + if(!dictionaryNetLayerNameAndCaption.ContainsKey(layer.layer)) + dictionaryNetLayerNameAndCaption.Add(layer.layer, layer.label); if (layer.layer.EndsWith("管线")) { LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2)); diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index b7dafa9..6803210 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -5,7 +5,7 @@ szhtdb2 192.168.0.203 release - 127.0.0.1 + 192.168.0.203 1500 http://192.168.0.203/images/ http://192.168.0.203/images/default.jpg diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt index 06a7613..755455e 100644 --- a/bin/x86/Debug/glVersion.txt +++ b/bin/x86/Debug/glVersion.txt Binary files differ diff --git a/getpipeLineFields.cs b/getpipeLineFields.cs index 0f32478..9bf6f37 100644 --- a/getpipeLineFields.cs +++ b/getpipeLineFields.cs @@ -12,9 +12,7 @@ GSODataset ds; GSOFeatureDataset sourcefDataset; GSOLayer m_layer = m_globeControl.Globe.Layers.GetLayerByCaption(caption);//获取当前选择的layer图层 - if (m_layer == null) - return ""; - GSOFeatureLayer flayer = m_layer as GSOFeatureLayer; + if (m_layer == null) return ""; ds = m_layer.Dataset; sourcefDataset = ds as GSOFeatureDataset; sourcefDataset.Open(); @@ -46,7 +44,41 @@ } return fields; } - + + + public static string getFieldsForBubble(string caption, GSOGlobeControl m_globeControl) + { + GSODataset ds; + GSOFeatureDataset sourcefDataset; + GSOLayer m_layer = m_globeControl.Globe.Layers.GetLayerByCaption(caption);//获取当前选择的layer图层 + if (m_layer == null) return ""; + ds = m_layer.Dataset; + sourcefDataset = ds as GSOFeatureDataset; + if (sourcefDataset == null) return ""; + sourcefDataset.Open(); + string fields = ""; + for (int j = 0; j < sourcefDataset.FieldCount; j++) + { + + GSOFieldAttr fieldef = sourcefDataset.GetField(j); + string fieldName = fieldef.Name; + if (fieldName.Contains("高程") || fieldef.Name.Contains("埋深") || + fieldef.Name.Contains("沟道宽") || fieldef.Name.Contains("沟道高") || + fieldef.Name.Contains("间隙") || fieldef.Name.Contains("井深") || + fieldef.Name.Contains("深度") || fieldef.Name.Contains("高度")) + { + fieldName = fieldName + "_米"; + } + if (j < sourcefDataset.FieldCount - 1) + { + fields += fieldName + ","; + } + else + fields += fieldName; + + } + return fields; + } public static string get_Fields(string caption, GSOGlobeControl m_globeControl) {
" + title + " " + feature.GetFieldAsString(featureIDFieldName) + "