diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/FrmShResult.cs b/FrmShResult.cs index aa96875..11ae753 100644 --- a/FrmShResult.cs +++ b/FrmShResult.cs @@ -121,7 +121,9 @@ /// private void dgridShVResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShVResult.Rows[e.RowIndex].Cells[0].Value.ToString()); @@ -139,7 +141,9 @@ /// private void dgridShHResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShHResult.Rows[e.RowIndex].Cells[0].Value.ToString()); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/FrmShResult.cs b/FrmShResult.cs index aa96875..11ae753 100644 --- a/FrmShResult.cs +++ b/FrmShResult.cs @@ -121,7 +121,9 @@ /// private void dgridShVResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShVResult.Rows[e.RowIndex].Cells[0].Value.ToString()); @@ -139,7 +141,9 @@ /// private void dgridShHResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShHResult.Rows[e.RowIndex].Cells[0].Value.ToString()); diff --git a/MainFrm.cs b/MainFrm.cs index 9f38293..73e8f26 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5053,10 +5053,20 @@ string database = Utility.sgdbname; string user = Utility.sgdbuser; string pass = Utility.sgdbpwd; - shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + shds = globeControl1.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); if (shds == null) { - MessageBox.Show("施工数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + shds = globeControl1.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; } FrmPipelineModelDB frm = new FrmPipelineModelDB(globeControl1, shds, true); if (frm.ShowDialog() == DialogResult.OK) @@ -8239,5 +8249,11 @@ return pt; } + private void ribbonBar21_ItemClick(object sender, EventArgs e) + { + + } + + } } \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/FrmShResult.cs b/FrmShResult.cs index aa96875..11ae753 100644 --- a/FrmShResult.cs +++ b/FrmShResult.cs @@ -121,7 +121,9 @@ /// private void dgridShVResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShVResult.Rows[e.RowIndex].Cells[0].Value.ToString()); @@ -139,7 +141,9 @@ /// private void dgridShHResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShHResult.Rows[e.RowIndex].Cells[0].Value.ToString()); diff --git a/MainFrm.cs b/MainFrm.cs index 9f38293..73e8f26 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5053,10 +5053,20 @@ string database = Utility.sgdbname; string user = Utility.sgdbuser; string pass = Utility.sgdbpwd; - shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + shds = globeControl1.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); if (shds == null) { - MessageBox.Show("施工数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + shds = globeControl1.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; } FrmPipelineModelDB frm = new FrmPipelineModelDB(globeControl1, shds, true); if (frm.ShowDialog() == DialogResult.OK) @@ -8239,5 +8249,11 @@ return pt; } + private void ribbonBar21_ItemClick(object sender, EventArgs e) + { + + } + + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1a71ef4..5c2dfe2 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,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(); @@ -238,13 +239,14 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -256,9 +258,23 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + 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.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -313,31 +329,9 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - 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.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -347,6 +341,13 @@ 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -518,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -529,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -957,6 +957,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; @@ -2101,15 +2113,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2153,121 +2165,125 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel1 + // ribbonPanel7 // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; // - // ribbonBar21 + // gxdw_ribbonbar // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // // // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // - // buttonItem1 + // buttonItem9 // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - // buttonItem91 + // buttonItem10 // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // - // btnlegendSet + // buttonItem11 // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem89 + // buttonItem12 // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // btnOutputJPG + // buttonItem13 // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + // + // buttonItem14 + // + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel12 // @@ -2275,10 +2291,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); // // // @@ -2317,7 +2333,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 92); + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -2369,7 +2385,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 92); + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -2439,75 +2455,305 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel4 + // ribbonPanel1 // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // - // ribbonBar1 + // ribbonBar21 // - this.ribbonBar1.AutoOverflowEnabled = true; + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; // // // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; // // // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); // - // btn_document_info + // buttonItem1 // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + 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, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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, 59); + 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); + // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // // ribbonPanel15 // @@ -2981,206 +3227,205 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel7 + // ribbonPanel4 // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; // - // gxdw_ribbonbar + // ribbonBar1 // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; + this.ribbonBar1.AutoOverflowEnabled = true; // // // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 92); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; // // // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; // - // buttonItem9 + // btn_document_info // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // buttonItem10 + // ribbonPanel2 // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); + 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); // - // buttonItem11 // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem12 + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItem13 // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - // buttonItem14 // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel3 + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // ribbonBar3 // + this.ribbonBar3.AutoOverflowEnabled = true; // // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.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.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; // - // ribbonBar4 + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonBar4.AutoOverflowEnabled = true; // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; + 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.Click += new System.EventHandler(this.btn_resc_info_Click); // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; + 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_flag + // btn_password_edit // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + 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); // - // slider4ground + // buttonItemPasswordReset // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + 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); // // ribbonPanel6 // @@ -3293,238 +3538,6 @@ 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); - // - // 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, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // 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, 92); - 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.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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3588,6 +3601,7 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -3598,7 +3612,6 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4461,7 +4474,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(39100, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(41476, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4555,7 +4568,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(39099, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(41475, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5741,18 +5754,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5795,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/FrmShResult.cs b/FrmShResult.cs index aa96875..11ae753 100644 --- a/FrmShResult.cs +++ b/FrmShResult.cs @@ -121,7 +121,9 @@ /// private void dgridShVResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShVResult.Rows[e.RowIndex].Cells[0].Value.ToString()); @@ -139,7 +141,9 @@ /// private void dgridShHResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShHResult.Rows[e.RowIndex].Cells[0].Value.ToString()); diff --git a/MainFrm.cs b/MainFrm.cs index 9f38293..73e8f26 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5053,10 +5053,20 @@ string database = Utility.sgdbname; string user = Utility.sgdbuser; string pass = Utility.sgdbpwd; - shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + shds = globeControl1.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); if (shds == null) { - MessageBox.Show("施工数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + shds = globeControl1.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; } FrmPipelineModelDB frm = new FrmPipelineModelDB(globeControl1, shds, true); if (frm.ShowDialog() == DialogResult.OK) @@ -8239,5 +8249,11 @@ return pt; } + private void ribbonBar21_ItemClick(object sender, EventArgs e) + { + + } + + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1a71ef4..5c2dfe2 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,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(); @@ -238,13 +239,14 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -256,9 +258,23 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + 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.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -313,31 +329,9 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - 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.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -347,6 +341,13 @@ 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -518,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -529,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -957,6 +957,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; @@ -2101,15 +2113,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2153,121 +2165,125 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel1 + // ribbonPanel7 // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; // - // ribbonBar21 + // gxdw_ribbonbar // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // // // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // - // buttonItem1 + // buttonItem9 // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - // buttonItem91 + // buttonItem10 // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // - // btnlegendSet + // buttonItem11 // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem89 + // buttonItem12 // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // btnOutputJPG + // buttonItem13 // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + // + // buttonItem14 + // + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel12 // @@ -2275,10 +2291,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); // // // @@ -2317,7 +2333,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 92); + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -2369,7 +2385,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 92); + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -2439,75 +2455,305 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel4 + // ribbonPanel1 // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // - // ribbonBar1 + // ribbonBar21 // - this.ribbonBar1.AutoOverflowEnabled = true; + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; // // // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; // // // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); // - // btn_document_info + // buttonItem1 // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + 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, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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, 59); + 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); + // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // // ribbonPanel15 // @@ -2981,206 +3227,205 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel7 + // ribbonPanel4 // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; // - // gxdw_ribbonbar + // ribbonBar1 // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; + this.ribbonBar1.AutoOverflowEnabled = true; // // // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 92); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; // // // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; // - // buttonItem9 + // btn_document_info // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // buttonItem10 + // ribbonPanel2 // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); + 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); // - // buttonItem11 // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem12 + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItem13 // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - // buttonItem14 // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel3 + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // ribbonBar3 // + this.ribbonBar3.AutoOverflowEnabled = true; // // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.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.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; // - // ribbonBar4 + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonBar4.AutoOverflowEnabled = true; // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; + 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.Click += new System.EventHandler(this.btn_resc_info_Click); // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; + 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_flag + // btn_password_edit // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + 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); // - // slider4ground + // buttonItemPasswordReset // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + 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); // // ribbonPanel6 // @@ -3293,238 +3538,6 @@ 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); - // - // 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, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // 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, 92); - 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.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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3588,6 +3601,7 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -3598,7 +3612,6 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4461,7 +4474,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(39100, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(41476, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4555,7 +4568,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(39099, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(41475, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5741,18 +5754,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5795,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 25b90f6..46caa31 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,506 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL + ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH + s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW + uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx + xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd + iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ + qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW + GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE + NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n + KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw + qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI + HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq + wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q + 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n + W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 + eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv + 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP + I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f + n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV + x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et + V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD + D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u + 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n + z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V + rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ + 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm + oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 + ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H + 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC + RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo + KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O + 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd + rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o + 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C + s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI + jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs + FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm + LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml + CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV + hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q + bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX + YCSg/AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL + SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 + 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P + zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 + 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj + L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 + RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf + nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P + 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj + ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G + xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H + dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 + LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob + gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 + ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi + UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd + XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 + 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN + jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF + Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn + ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYxRjlCRTY3NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 + MTg4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYxRjlCRTY2NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 + MTg4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5JUenqAAACPElEQVRIS7WT3UsUURjGhyCiixbaUC/awuyq7OOuq2y3smxT + +1LT1LL+h6ib/odAKFBiIyssHNJKy740EZGC+hO6qhshDBKSIt6e58w5NXM8M9MQPfCD877nfZ53Z3fH + E5H/irdh885/whUaxmnKgis0jNOUhVS5TFlIlcsUw2kwreFZ9VNlBhNQwS0dF2Rm7q2CZ/Z4p2PipUNc + BMHt52V69o0sf/8ZgT3ecYazOm6ldNiK4GaYX87My9K3H4lwhrP00Ktj/0iHGorltj6ZnJqTxa/LmaCH + Xmbo6EDWglL5VJ9MvJiVhcWlTNBD7/qN25oQuypIh6wFxaYTZ0Vx8pyMTb6WjwtfEuEMZ40vV1PXhtjV + QTpkLSgdxpA/PiUjj1/JoeO9YuoPnz5HYI93nOGsqXPVW7oQuyZIh6wFxcZjPaKAcXjsuQyPPovWgGf2 + eBeuSa66rh2xsQtKB1t75Lb/VIb8J3KgtVvsmvDMHu/sGl9RB2Ljn2B/8xlRtHRL5f6EVO6NR2vAM3u8 + C9ck9QlKGBq8+0gG7jyU4tEusWvCM3u8s+u0J/Dyhfre/Kb6eRqvD43KtVsPZF+5UwWxJjyzxztT5wvb + 3+MHvozIAohfAPEvVoNHvQjTuwYE9d/0pb/iS8ORTgXP7PGOweuqaq/AswfsoFdnBHIs4EuyFlSBrfhU + l7hoL4Kv3hhR8GwF7+as9tAb+6L9BnIu+utgI1d4GCiyCOzSJAcbuUJdQGZRXpMcbOQKy0KyPO8X3VzO + Z+EVt84AAAAASUVORK5CYII= + + + + + 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 + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkI4QTVDNDc0NEM2NzExRTQ5NTE5REU3N0RCMjJE + QjdBIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkI4QTVDNDczNEM2NzExRTQ5NTE5REU3N0RCMjJE + QjdBIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzQ5NEZCOEM2MzRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4VEc0+AAADBUlEQVRIS62Ve0iTURTAr1ZaBkoWOTWn+bYyNTENMh/5yCSd + cyMf03xsva0/jEqjF2JIRL4yiGnaNFYRCkYtR2OWMtOm5ivFxyTTqS0VN2UU1el+X2MYVMjnDvz44Nxz + z4/LPZcPfdc2MjCJ/4BYI2r+II59TA8A/BdiQ2JdoU/PkwJ35VJqb/v0LMyJOQghoxULHuW5Ti3OsGAp + NVedJ9taHlxksI6240ZyKugFNbku6rlPu6Ff5EAyNbwLyrPtp6QS/nUsAFxMCRxyUiA8T1eqhrZBm8AG + mu9bw5DcDe6etNUJeH/dvByIIAUPz9ooFXJ7GJDRoavRDjokdlCcbjVtMIHglH1vyRFrTWHqlm+l6faL + txI3TZdm2A0Qgtj4lQviiGlpaa661NstfvXlc6dIMfiYRzDQK0wvKatMGh75CFQgBbowYjGDTRSKYa+R + kSG/AP/t63DOBLN6YmLCDNf5UoXszslCIk6W8Xv8bcfIdYjwkjHGiCxaEvj4y38HRLCPr5/oG70M/aP5 + mAL4MHoFmDzUER6V4I3HdBY3ooRewOBazEnlbHghC8cEwcumwxCZhLpCw1l+K3wHs6QgKh3Ja6W+UP3c + HcprXYH/1BP2MlCPAQS/jxCWsqa/SLAVbvKdIb/MBa4VOYLfQdRnMEEgk6YOiNnwNTCO9sM/2mLGcz/q + 3xmOGg0miGFyQ5qaW4dfv3mr6OruaxgfH0/DaTOM6cLCghdZSTFIAQ4jrVYbgptFEKhUKjecW4UxzJia + OGfyLXdw35l7cCXIIbNCR2Fg8KG1sfFcJ9zIkQp6Ac07c7JSMgbV0jEQ6ED0ZGFEVKLvCu/AkRSYOqWJ + cyo6gVfYCieKW+HMHRkgW+Yzg10yoqfUc240QWxuAxzIrgdWTh0gWrTEYAJLj9TZYJ4QgjKqYF/qPdiT + VAbIKlJmMIG5M3two1v8T3PHaC3dO2HG2pOtRJvDJEGhDM+E5NN95y7kAxX0AhzG8/PzeXhEpzQaTY9Y + LHbBOfIdqNVqV1xH/MApAPJfzP33dTxioZgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzMkNDMkY0NEFEMDExRTQ4MDc0ODRFNENDMkU3 + RDczIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzMkNDMkYzNEFEMDExRTQ4MDc0ODRFNENDMkU3 + RDczIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MjdGOUQzNUFDRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5/YJCyAAABkUlEQVRIS7WUvUoDQRSFtxErBVfShFUEG4mKYGUh+AS+QB7H + p9BWtLFLZ2EjkUDAHyISFFEUIkhAIigYDGE8J7MTbiYzJjvigY9d7r3n3NliJ1JK/SvR7Pzqn3CFSpym + LLhCJU5TFkbKZcrCSFmGIigDFQi9xTRaCwVJ+ax6qTpdFQS9zEijtawFqv3dtU81NsaL2AmdDqEwsODz + q2OGNsHGuFjeGGilwf0FrY+2GVoDybhY3jzQSoP7C5qtTzNEk90fwgjvA15dheQwm43me/AC6dVVSA6z + +fjyFrxAenUVksNs3j69Bi+QXl2F5DCb1/eN4AXSq6uQHGbzvP4cvEB6dRWSw2xWag+9oRCMF7HeBeXd + g5I6vbgLYu+wpOKkUEOsd0Exnlup4jl0OnJSrfdw9UicLF9N5RZ2EOv90Vjib74OelcFjceVGyfscUZA + D73eq4IlXlQc4CkSfPI+g1zM5JeOMLPIuRR66PVedk6gaVAAW2A7he+sseeXK9AGmgQ5YE5qYI09v1yB + WfhdUfQD3zQ4bV9fKQQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkM4QUEwRERENEFENDExRTRBQTE0RThCQzEyOEQy + OTc1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkM4QUEwRERDNEFENDExRTRBQTE0RThCQzEyOEQy + OTc1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7dyRkqAAAD9ElEQVRIS7WWe0xbZRiH95+T6DQxcc7NLfrHTBaR4NyFmDAy + ljFwwERGpmRxxmyY6QbqgogDhqluOpFLlm6AFslGRVlXKISVS7tByzgUOF1vtLUtLVBogQ4YsLoN9ec5 + 3+xXyIiJWdrkyfed9/u979PLSdsVz6wPfyQA/Cehf3DPQsiBECHkBVj4CyGBn00E9xb+DglU4L/35xIM + 7j78qCpAlVqAg6KNkOtqMTPnx9TcLOzjFty5u4CJWR9u++/AM+NBh7WRnM3/cX/JHCqY899fwu35u/BN + z2HM60NcURjB7hwmNX4/PjmNWzPzZL/v3FPIEK9DQskTNOudmML0rD8oiD0d9hAutxej4z6yZ3pZaA0D + ZO8c8dDM8d9egtSxGxetMTiri8Ih8XpS79cZ4fZOBgVu7y2YrINg9QOIPvU4QcPqyWp1DJM6vwbOUivW + QGSMgdi8E7mqSGQqIpAoXE3OmuRtuKHRwjU6HhQMe6dgG/LA4hhBVM5KJJatJmsPa8TNARup8xm+1tnd + R9bkc88hicsllnGrcC2p1Te1QKliYLQ6SZ4KhriLYe80oaa9Ghk/JEMkqYJS3Q0DF3a4J7D9s1V4s2QN + Nmc+hviTLyOvIgv55SeQe/4YUgu3QlRXjbbrN6A12TDoniSzqMDh9lEszjEoGQbF4u/wa+tlmOxu2Ecm + 0dglR86FjxEteBZx2Zsgab4KhaoH17lXJFO04nKLDCrus+L7A7OowOLyUsxODwy2EaTm78BrWU/io6KD + YE126KxDaFDKEZ4Rhg8E+1HbKAOjNZP6TYsL0mtNaFYrUCmrAGu2YWBwLCgw2Ecf4qeGakRmPo203D1Q + dPWjz8TdBGYX0guSIK5vgLyDQa/BDr3NTdAYrYg68iI2HliJiitV6DM6ggLWwt0p/8J9PeFMsRDnJSLE + H38DsXEJSEhKAaOzod88hMjXt+KTz/PQ2WtCLyfl8wE2RbyKkyWFqJLUQdqu4ASvPBBojE4KH9wVtxel + v5Tj5zopuU5MSQOjt6NG0swJtmHtCxtwrUePHsMDQaA3J/9rfJpTgDY1CwWjDwq6dHYK37BzdwJqZe3I + E3yP9ENHsG//u+TsvcNH8dXZMryVlo4ioYjmA73ZnCA7T4BO1gqV1hp8izr6f6fwDafOlKLgdAlidsXj + 29JKJHOCFrWOnAXga4F8gIjN21Df1k1nUYFSY6bwwUvSVjy/bgN2cILKmnokvf0O8r8pRvr7H5JMcwdL + zvkcn1/cvxgqaGVMFL6BX6Nj9+BLQREuXLyCvSkHEB65BcXll2ju8LETyPqikOaXgwqudhlCQkAQ8p/M + R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1606,7 +2106,7 @@ TJ65mM1/9adCvki+8p7nYPunBqvfgM/pcrxVz6sAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1618,163 +2118,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYxRjlCRTY3NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 - MTg4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYxRjlCRTY2NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 - MTg4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5JUenqAAACPElEQVRIS7WT3UsUURjGhyCiixbaUC/awuyq7OOuq2y3smxT - +1LT1LL+h6ib/odAKFBiIyssHNJKy740EZGC+hO6qhshDBKSIt6e58w5NXM8M9MQPfCD877nfZ53Z3fH - E5H/irdh885/whUaxmnKgis0jNOUhVS5TFlIlcsUw2kwreFZ9VNlBhNQwS0dF2Rm7q2CZ/Z4p2PipUNc - BMHt52V69o0sf/8ZgT3ecYazOm6ldNiK4GaYX87My9K3H4lwhrP00Ktj/0iHGorltj6ZnJqTxa/LmaCH - Xmbo6EDWglL5VJ9MvJiVhcWlTNBD7/qN25oQuypIh6wFxaYTZ0Vx8pyMTb6WjwtfEuEMZ40vV1PXhtjV - QTpkLSgdxpA/PiUjj1/JoeO9YuoPnz5HYI93nOGsqXPVW7oQuyZIh6wFxcZjPaKAcXjsuQyPPovWgGf2 - eBeuSa66rh2xsQtKB1t75Lb/VIb8J3KgtVvsmvDMHu/sGl9RB2Ljn2B/8xlRtHRL5f6EVO6NR2vAM3u8 - C9ck9QlKGBq8+0gG7jyU4tEusWvCM3u8s+u0J/Dyhfre/Kb6eRqvD43KtVsPZF+5UwWxJjyzxztT5wvb - 3+MHvozIAohfAPEvVoNHvQjTuwYE9d/0pb/iS8ORTgXP7PGOweuqaq/AswfsoFdnBHIs4EuyFlSBrfhU - l7hoL4Kv3hhR8GwF7+as9tAb+6L9BnIu+utgI1d4GCiyCOzSJAcbuUJdQGZRXpMcbOQKy0KyPO8X3VzO - Z+EVt84AAAAASUVORK5CYII= - - - - - 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 - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkI4QTVDNDc0NEM2NzExRTQ5NTE5REU3N0RCMjJE - QjdBIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkI4QTVDNDczNEM2NzExRTQ5NTE5REU3N0RCMjJE - QjdBIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzQ5NEZCOEM2MzRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4VEc0+AAADBUlEQVRIS62Ve0iTURTAr1ZaBkoWOTWn+bYyNTENMh/5yCSd - cyMf03xsva0/jEqjF2JIRL4yiGnaNFYRCkYtR2OWMtOm5ivFxyTTqS0VN2UU1el+X2MYVMjnDvz44Nxz - z4/LPZcPfdc2MjCJ/4BYI2r+II59TA8A/BdiQ2JdoU/PkwJ35VJqb/v0LMyJOQghoxULHuW5Ti3OsGAp - NVedJ9taHlxksI6240ZyKugFNbku6rlPu6Ff5EAyNbwLyrPtp6QS/nUsAFxMCRxyUiA8T1eqhrZBm8AG - mu9bw5DcDe6etNUJeH/dvByIIAUPz9ooFXJ7GJDRoavRDjokdlCcbjVtMIHglH1vyRFrTWHqlm+l6faL - txI3TZdm2A0Qgtj4lQviiGlpaa661NstfvXlc6dIMfiYRzDQK0wvKatMGh75CFQgBbowYjGDTRSKYa+R - kSG/AP/t63DOBLN6YmLCDNf5UoXszslCIk6W8Xv8bcfIdYjwkjHGiCxaEvj4y38HRLCPr5/oG70M/aP5 - mAL4MHoFmDzUER6V4I3HdBY3ooRewOBazEnlbHghC8cEwcumwxCZhLpCw1l+K3wHs6QgKh3Ja6W+UP3c - HcprXYH/1BP2MlCPAQS/jxCWsqa/SLAVbvKdIb/MBa4VOYLfQdRnMEEgk6YOiNnwNTCO9sM/2mLGcz/q - 3xmOGg0miGFyQ5qaW4dfv3mr6OruaxgfH0/DaTOM6cLCghdZSTFIAQ4jrVYbgptFEKhUKjecW4UxzJia - OGfyLXdw35l7cCXIIbNCR2Fg8KG1sfFcJ9zIkQp6Ac07c7JSMgbV0jEQ6ED0ZGFEVKLvCu/AkRSYOqWJ - cyo6gVfYCieKW+HMHRkgW+Yzg10yoqfUc240QWxuAxzIrgdWTh0gWrTEYAJLj9TZYJ4QgjKqYF/qPdiT - VAbIKlJmMIG5M3two1v8T3PHaC3dO2HG2pOtRJvDJEGhDM+E5NN95y7kAxX0AhzG8/PzeXhEpzQaTY9Y - LHbBOfIdqNVqV1xH/MApAPJfzP33dTxioZgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzMkNDMkY0NEFEMDExRTQ4MDc0ODRFNENDMkU3 - RDczIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzMkNDMkYzNEFEMDExRTQ4MDc0ODRFNENDMkU3 - RDczIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MjdGOUQzNUFDRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5/YJCyAAABkUlEQVRIS7WUvUoDQRSFtxErBVfShFUEG4mKYGUh+AS+QB7H - p9BWtLFLZ2EjkUDAHyISFFEUIkhAIigYDGE8J7MTbiYzJjvigY9d7r3n3NliJ1JK/SvR7Pzqn3CFSpym - LLhCJU5TFkbKZcrCSFmGIigDFQi9xTRaCwVJ+ax6qTpdFQS9zEijtawFqv3dtU81NsaL2AmdDqEwsODz - q2OGNsHGuFjeGGilwf0FrY+2GVoDybhY3jzQSoP7C5qtTzNEk90fwgjvA15dheQwm43me/AC6dVVSA6z - +fjyFrxAenUVksNs3j69Bi+QXl2F5DCb1/eN4AXSq6uQHGbzvP4cvEB6dRWSw2xWag+9oRCMF7HeBeXd - g5I6vbgLYu+wpOKkUEOsd0Exnlup4jl0OnJSrfdw9UicLF9N5RZ2EOv90Vjib74OelcFjceVGyfscUZA - D73eq4IlXlQc4CkSfPI+g1zM5JeOMLPIuRR66PVedk6gaVAAW2A7he+sseeXK9AGmgQ5YE5qYI09v1yB - WfhdUfQD3zQ4bV9fKQQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkM4QUEwRERENEFENDExRTRBQTE0RThCQzEyOEQy - OTc1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkM4QUEwRERDNEFENDExRTRBQTE0RThCQzEyOEQy - OTc1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -2160,369 +2523,6 @@ OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL - ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH - s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW - uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx - xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd - iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ - qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW - GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE - NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n - KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw - qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI - HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq - wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q - 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n - W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 - eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv - 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP - I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f - n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV - x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et - V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD - D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u - 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n - z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V - rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ - 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm - oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 - ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H - 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC - RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo - KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O - 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd - rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o - 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C - s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI - jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs - FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm - LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml - CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV - hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q - bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX - YCSg/AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL - SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 - 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P - zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 - 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj - L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 - RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf - nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P - 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj - ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G - xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H - dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 - LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob - gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 - ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi - UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd - XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 - 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN - jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF - Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn - ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 5024697..ebc2ef5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Forms/FrmMnModify.cs b/Forms/FrmMnModify.cs index d426461..4d22c30 100644 --- a/Forms/FrmMnModify.cs +++ b/Forms/FrmMnModify.cs @@ -68,6 +68,8 @@ /// private void questionGrid_CellContentClick(object sender, DataGridViewCellEventArgs e) { + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; if (questionGrid.SelectedCells.Count > 0) { DataGridViewRow row = questionGrid.Rows[questionGrid.SelectedCells[0].RowIndex]; diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 11a891f..87ecfb9 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -30,7 +30,7 @@ private bool invalidate() { - if (comboBoxLayer.SelectedItem.ToString().Trim() == "") + if (comboBoxLayer.Text.Trim() == "") { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return false; diff --git a/FrmCheckHistory.cs b/FrmCheckHistory.cs index 0b3819b..085e943 100644 --- a/FrmCheckHistory.cs +++ b/FrmCheckHistory.cs @@ -81,7 +81,7 @@ } } - if (!String.IsNullOrEmpty(combo_staff.Text)) + if (!String.IsNullOrEmpty(combo_staff.Text) && combo_staff.Text != "不限") { sqlData += "and t.sh_staff='" + combo_staff.Text + "' "; sqlCount += "and t.sh_staff='" + combo_staff.Text + "' "; @@ -155,6 +155,9 @@ string sql = null; DataTable table = null; + combo_kind.Items.Add(new ComboBoxItem("A", "不限")); + combo_staff.Items.Add(new ComboBoxItem("A", "不限")); + sql = "select distinct t.sh_layer from casic_audit_result t"; table = OledbHelper.ExecuteDataTable(sql); //combo_layer.Items.Add(new ComboBoxItem("", "")); diff --git a/FrmDatabaseParaSetting.cs b/FrmDatabaseParaSetting.cs index dfafac7..00d6dee 100644 --- a/FrmDatabaseParaSetting.cs +++ b/FrmDatabaseParaSetting.cs @@ -114,7 +114,16 @@ return; } - ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + ds = ctl.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); + if (ds == null) + { + ds = ctl.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } if (ds == null) { MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 9a558a6..c970e85 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -247,9 +247,9 @@ string sqlCount = "select count(*) from equipment where status = 'USING'"; string sqlData = "select descirption as 设备描述,DBID as 编号,macid as MAC地址,owner as 设备所有人,"+ - "case when status = 'USING' then '可用' when status = 'DAMAGE' then '损坏' end as 设备状态 " + + "case when status = 'USING' then '可用' end as 设备状态 " + "from (select t.*,rownum row_num from equipment t where status = 'USING' order by dbid desc)b " + - " where 1=1"; + " where 1=1 and status = 'USING'"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); diff --git a/FrmEquipmentManage.designer.cs b/FrmEquipmentManage.designer.cs index 66197c1..0fec6cb 100644 --- a/FrmEquipmentManage.designer.cs +++ b/FrmEquipmentManage.designer.cs @@ -71,7 +71,7 @@ this.btnAddDev}); this.bar1.Location = new System.Drawing.Point(0, 0); this.bar1.Name = "bar1"; - this.bar1.Size = new System.Drawing.Size(702, 25); + this.bar1.Size = new System.Drawing.Size(702, 27); this.bar1.Stretch = true; this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.bar1.TabIndex = 2; @@ -84,11 +84,11 @@ this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 25); + this.winGridViewPager1.Location = new System.Drawing.Point(0, 27); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(702, 298); + this.winGridViewPager1.Size = new System.Drawing.Size(702, 296); this.winGridViewPager1.TabIndex = 3; // // FrmEquipmentManage diff --git a/FrmFlagDatabase.cs b/FrmFlagDatabase.cs index 5a137c0..eb2c767 100644 --- a/FrmFlagDatabase.cs +++ b/FrmFlagDatabase.cs @@ -38,10 +38,19 @@ } try { - ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + //ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + ds = ctl.Globe.DataManager.GetDataSourceByName(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim() + "_" + txt_user.Text.Trim()); if (ds == null) { - MessageBox.Show("数据库连接失败！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Warning); + ds = ctl.Globe.DataManager.OpenOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + ds = ctl.Globe.DataManager.CreateOracleDataSource(txt_ip.Text.Trim() + "/" + txt_db.Text.Trim(), "", "", txt_user.Text.Trim(), txt_pwd.Text.Trim()); + } + if (ds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } else diff --git a/FrmGBJCresult.cs b/FrmGBJCresult.cs index c1931c0..813fe37 100644 --- a/FrmGBJCresult.cs +++ b/FrmGBJCresult.cs @@ -43,7 +43,8 @@ private void dataGridViewX1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex == -1) return; + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; globeControl1.Globe.MemoryLayer.RemoveAllFeature(); globeControl2.Globe.MemoryLayer.RemoveAllFeature(); diff --git a/FrmPatrolerManager.designer.cs b/FrmPatrolerManager.designer.cs index 4510fa5..8124bd4 100644 --- a/FrmPatrolerManager.designer.cs +++ b/FrmPatrolerManager.designer.cs @@ -53,10 +53,9 @@ this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.注销ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); this.重置密码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // labelItem1 @@ -178,54 +177,54 @@ // // contextMenuStrip1 // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.日志ToolStripMenuItem, - this.任务ToolStripMenuItem, - this.定位ToolStripMenuItem, - this.编辑ToolStripMenuItem, - this.注销ToolStripMenuItem, - this.重置密码ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 158); + this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); // // 日志ToolStripMenuItem // this.日志ToolStripMenuItem.Name = "日志ToolStripMenuItem"; - this.日志ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.日志ToolStripMenuItem.Text = "日志"; this.日志ToolStripMenuItem.Click += new System.EventHandler(this.日志ToolStripMenuItem_Click); // // 任务ToolStripMenuItem // this.任务ToolStripMenuItem.Name = "任务ToolStripMenuItem"; - this.任务ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.任务ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.任务ToolStripMenuItem.Text = "任务"; this.任务ToolStripMenuItem.Click += new System.EventHandler(this.任务ToolStripMenuItem_Click); // // 定位ToolStripMenuItem // this.定位ToolStripMenuItem.Name = "定位ToolStripMenuItem"; - this.定位ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.定位ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.定位ToolStripMenuItem.Text = "定位"; this.定位ToolStripMenuItem.Click += new System.EventHandler(this.定位ToolStripMenuItem_Click); // // 编辑ToolStripMenuItem // this.编辑ToolStripMenuItem.Name = "编辑ToolStripMenuItem"; - this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.编辑ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.编辑ToolStripMenuItem.Text = "编辑"; this.编辑ToolStripMenuItem.Click += new System.EventHandler(this.编辑ToolStripMenuItem_Click); // // 注销ToolStripMenuItem // this.注销ToolStripMenuItem.Name = "注销ToolStripMenuItem"; - this.注销ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.注销ToolStripMenuItem.Size = new System.Drawing.Size(352, 22); this.注销ToolStripMenuItem.Text = "注销"; this.注销ToolStripMenuItem.Click += new System.EventHandler(this.注销ToolStripMenuItem_Click); // + // 重置密码ToolStripMenuItem + // + this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; + this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.重置密码ToolStripMenuItem.Text = "重置密码"; + this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); + // // winGridViewPager1 // - this.winGridViewPager1.AppendedMenu = null; + this.winGridViewPager1.AppendedMenu = this.contextMenuStrip1; this.winGridViewPager1.ContextMenuStrip = this.contextMenuStrip1; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; @@ -237,13 +236,6 @@ this.winGridViewPager1.Size = new System.Drawing.Size(756, 309); this.winGridViewPager1.TabIndex = 3; // - // 重置密码ToolStripMenuItem - // - this.重置密码ToolStripMenuItem.Name = "重置密码ToolStripMenuItem"; - this.重置密码ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.重置密码ToolStripMenuItem.Text = "重置密码"; - this.重置密码ToolStripMenuItem.Click += new System.EventHandler(this.重置密码ToolStripMenuItem_Click); - // // FrmPatrolerManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -261,21 +253,8 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPatrolerManager_FormClosing); this.Load += new System.EventHandler(this.FrmPatrolerManager_Load); ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[4].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; - - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "编辑"; - //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "注销"; - - winGridViewPager1.AppendedMenu = this.contextMenuStrip1; - } #endregion diff --git a/FrmSetFlytoPos.cs b/FrmSetFlytoPos.cs index e1f7644..8f753df 100644 --- a/FrmSetFlytoPos.cs +++ b/FrmSetFlytoPos.cs @@ -35,7 +35,10 @@ private void SetLatLonPos_Load(object sender, EventArgs e) { - + if (globeControl1 != null) + { + globeControl1.MouseClick += new MouseEventHandler(globeControl1_MouseClick); + } } /// /// 确定按钮事件处理 @@ -48,40 +51,40 @@ double m_strLat; double m_strAlt; - if (textbox1.Text == "") + if (textBoxXLon.Text == "") { MessageBox.Show("经度不能为空！"); return; } - bool bl = double.TryParse(textbox1.Text,out m_strLon); + bool bl = double.TryParse(textBoxXLon.Text,out m_strLon); if (!bl) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } if (m_strLon > 180 || m_strLon < -180) { MessageBox.Show("请输入正确的经度！"); - textbox1.Text = ""; + textBoxXLon.Text = ""; return; } - if (textBox2.Text == "") + if (textBoxXLat.Text == "") { MessageBox.Show("纬度不能为空！"); return; } - bl = double.TryParse(textBox2.Text, out m_strLat); + bl = double.TryParse(textBoxXLat.Text, out m_strLat); if (!bl) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (m_strLat > 85 || m_strLat < -85) { MessageBox.Show("请输入正确的纬度！"); - textBox2.Text = ""; + textBoxXLat.Text = ""; return; } if (textBox3.Text == "") @@ -121,5 +124,25 @@ { Close(); } + + private void globeControl1_MouseClick(object sender, MouseEventArgs e) + { + try + { + if (e.Button == MouseButtons.Left) + { + GSOPoint3d p = globeControl1.Globe.ScreenToScene(e.X, e.Y); + textBoxXLon.Text = p.X.ToString(); + textBoxXLat.Text = p.Y.ToString(); + } + } + catch (Exception ex) + { + MessageBox.Show("运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + } } diff --git a/FrmSetFlytoPos.designer.cs b/FrmSetFlytoPos.designer.cs index 4c4fbbc..3aef52d 100644 --- a/FrmSetFlytoPos.designer.cs +++ b/FrmSetFlytoPos.designer.cs @@ -33,86 +33,78 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSetFlytoPos)); - this.textbox1 = new System.Windows.Forms.TextBox(); + this.textBoxXLon = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBoxXLat = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // textbox1 + // textBoxXLon // - this.textbox1.Location = new System.Drawing.Point(103, 35); - this.textbox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textbox1.Name = "textbox1"; - this.textbox1.Size = new System.Drawing.Size(271, 25); - this.textbox1.TabIndex = 1; + this.textBoxXLon.Location = new System.Drawing.Point(77, 28); + this.textBoxXLon.Name = "textBoxXLon"; + this.textBoxXLon.Size = new System.Drawing.Size(204, 21); + this.textBoxXLon.TabIndex = 1; // // groupBox1 // this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.textBox2); + this.groupBox1.Controls.Add(this.textBoxXLat); this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.textbox1); - this.groupBox1.Location = new System.Drawing.Point(15, 16); - this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBox1.Controls.Add(this.textBoxXLon); + this.groupBox1.Location = new System.Drawing.Point(11, 13); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.groupBox1.Size = new System.Drawing.Size(413, 152); + this.groupBox1.Size = new System.Drawing.Size(310, 122); this.groupBox1.TabIndex = 8; this.groupBox1.TabStop = false; this.groupBox1.Text = "输入要到达的坐标,例如：116.6，39.9，1000"; // // textBox3 // - this.textBox3.Location = new System.Drawing.Point(103, 102); - this.textBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.textBox3.Location = new System.Drawing.Point(77, 82); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(271, 25); + this.textBox3.Size = new System.Drawing.Size(204, 21); this.textBox3.TabIndex = 6; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(40, 109); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(30, 87); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(52, 15); + this.label3.Size = new System.Drawing.Size(41, 12); this.label3.TabIndex = 5; this.label3.Text = "高度："; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(40, 39); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(30, 31); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(52, 15); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 4; this.label2.Text = "经度："; // - // textBox2 + // textBoxXLat // - this.textBox2.Location = new System.Drawing.Point(103, 69); - this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(271, 25); - this.textBox2.TabIndex = 3; + this.textBoxXLat.Location = new System.Drawing.Point(77, 55); + this.textBoxXLat.Name = "textBoxXLat"; + this.textBoxXLat.Size = new System.Drawing.Size(204, 21); + this.textBoxXLat.TabIndex = 3; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(40, 76); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(30, 61); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.Size = new System.Drawing.Size(41, 12); this.label1.TabIndex = 2; this.label1.Text = "纬度："; // @@ -121,10 +113,9 @@ this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonX1.Location = new System.Drawing.Point(84, 176); - this.buttonX1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX1.Location = new System.Drawing.Point(63, 141); this.buttonX1.Name = "buttonX1"; - this.buttonX1.Size = new System.Drawing.Size(81, 28); + this.buttonX1.Size = new System.Drawing.Size(61, 22); this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX1.TabIndex = 11; this.buttonX1.Text = "确定"; @@ -135,10 +126,9 @@ this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; this.buttonX2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonX2.Location = new System.Drawing.Point(296, 176); - this.buttonX2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.buttonX2.Location = new System.Drawing.Point(222, 141); this.buttonX2.Name = "buttonX2"; - this.buttonX2.Size = new System.Drawing.Size(81, 28); + this.buttonX2.Size = new System.Drawing.Size(61, 22); this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.buttonX2.TabIndex = 12; this.buttonX2.Text = "取消"; @@ -146,9 +136,9 @@ // // FrmSetFlytoPos // - 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(444, 212); + this.ClientSize = new System.Drawing.Size(333, 170); this.Controls.Add(this.buttonX2); this.Controls.Add(this.buttonX1); this.Controls.Add(this.groupBox1); @@ -156,7 +146,6 @@ this.EnableGlass = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmSetFlytoPos"; @@ -172,10 +161,10 @@ #endregion - private TextBox textbox1; + private TextBox textBoxXLon; private GroupBox groupBox1; private Label label2; - private TextBox textBox2; + private TextBox textBoxXLat; private Label label1; private TextBox textBox3; private Label label3; diff --git a/FrmShResult.cs b/FrmShResult.cs index aa96875..11ae753 100644 --- a/FrmShResult.cs +++ b/FrmShResult.cs @@ -121,7 +121,9 @@ /// private void dgridShVResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShVResult.Rows[e.RowIndex].Cells[0].Value.ToString()); @@ -139,7 +141,9 @@ /// private void dgridShHResult_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - if (e.RowIndex != -1) + if (e.RowIndex < 0 || e.ColumnIndex < 0) + return; + else { GSOLayer gsoLayer = globleControl1.Globe.Layers.GetLayerByCaption( dgridShHResult.Rows[e.RowIndex].Cells[0].Value.ToString()); diff --git a/MainFrm.cs b/MainFrm.cs index 9f38293..73e8f26 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -5053,10 +5053,20 @@ string database = Utility.sgdbname; string user = Utility.sgdbuser; string pass = Utility.sgdbpwd; - shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + //shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + shds = globeControl1.Globe.DataManager.GetDataSourceByName(dbIp + "/" + database + "_" + user); if (shds == null) { - MessageBox.Show("施工数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + shds = globeControl1.Globe.DataManager.CreateOracleDataSource(dbIp + "/" + database, "", "", user, pass); + } + if (shds == null) + { + MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); + return; } FrmPipelineModelDB frm = new FrmPipelineModelDB(globeControl1, shds, true); if (frm.ShowDialog() == DialogResult.OK) @@ -8239,5 +8249,11 @@ return pt; } + private void ribbonBar21_ItemClick(object sender, EventArgs e) + { + + } + + } } \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1a71ef4..5c2dfe2 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,6 +90,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(); @@ -238,13 +239,14 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -256,9 +258,23 @@ this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); this.btn_check_history = 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + 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.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -313,31 +329,9 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - 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.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -347,6 +341,13 @@ 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.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -518,7 +519,6 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -529,15 +529,15 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); - this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel3.SuspendLayout(); - this.ribbonPanel6.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); + this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); + this.ribbonPanel4.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); + this.ribbonPanel6.SuspendLayout(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.statusStrip2.SuspendLayout(); @@ -957,6 +957,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; @@ -2101,15 +2113,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel6); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); + this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2153,121 +2165,125 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // - // ribbonPanel1 + // ribbonPanel7 // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - this.ribbonPanel1.Visible = false; + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; // - // ribbonBar21 + // gxdw_ribbonbar // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; + this.gxdw_ribbonbar.AutoOverflowEnabled = true; // // // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 92); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; // // // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; // - // buttonItem1 + // buttonItem9 // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // - // buttonItem91 + // buttonItem10 // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); // - // btnlegendSet + // buttonItem11 // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem89 + // buttonItem12 // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // btnOutputJPG + // buttonItem13 // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + // + // buttonItem14 + // + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // // ribbonPanel12 // @@ -2275,10 +2291,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); // // // @@ -2317,7 +2333,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 92); + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -2369,7 +2385,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 92); + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -2439,75 +2455,305 @@ this.btn_check_history.Text = "审核历史"; this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); // - // ribbonPanel4 + // ribbonPanel1 // - this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel4.Controls.Add(this.ribbonBar1); - this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel4.Name = "ribbonPanel4"; - this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel4.Style.Class = ""; - this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseDown.Class = ""; - this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel4.StyleMouseOver.Class = ""; - this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel4.TabIndex = 36; - this.ribbonPanel4.Visible = false; + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // - // ribbonBar1 + // ribbonBar21 // - this.ribbonBar1.AutoOverflowEnabled = true; + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; // // // - this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.BackgroundStyle.Class = ""; - this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.ContainerControlProcessDialogKey = true; - this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_document_info}); - this.ribbonBar1.Location = new System.Drawing.Point(3, 0); - this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 92); - this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar1.TabIndex = 0; + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; // // // - this.ribbonBar1.TitleStyle.Class = ""; - this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonBar1.TitleStyleMouseOver.Class = ""; - this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar1.TitleVisible = false; + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); // - // btn_document_info + // buttonItem1 // - this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); - this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_document_info.Name = "btn_document_info"; - this.btn_document_info.SubItemsExpandWidth = 14; - this.btn_document_info.Text = "文档管理"; - this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + 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, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + 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, 59); + 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); + // + // ribbonPanel3 + // + this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel3.Controls.Add(this.ribbonBar4); + this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel3.Name = "ribbonPanel3"; + this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // // ribbonPanel15 // @@ -2981,206 +3227,205 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel7 + // ribbonPanel4 // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel4.Controls.Add(this.ribbonBar1); + this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Name = "ribbonPanel4"; + this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); // // // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.Style.Class = ""; + this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.StyleMouseDown.Class = ""; + this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; + this.ribbonPanel4.StyleMouseOver.Class = ""; + this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel4.TabIndex = 36; + this.ribbonPanel4.Visible = false; // - // gxdw_ribbonbar + // ribbonBar1 // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; + this.ribbonBar1.AutoOverflowEnabled = true; // // // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 92); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; + this.ribbonBar1.BackgroundStyle.Class = ""; + this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.ContainerControlProcessDialogKey = true; + this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_document_info}); + this.ribbonBar1.Location = new System.Drawing.Point(3, 0); + this.ribbonBar1.Name = "ribbonBar1"; + this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar1.TabIndex = 0; // // // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleStyle.Class = ""; + this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; + this.ribbonBar1.TitleStyleMouseOver.Class = ""; + this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar1.TitleVisible = false; // - // buttonItem9 + // btn_document_info // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image"))); + this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_document_info.Name = "btn_document_info"; + this.btn_document_info.SubItemsExpandWidth = 14; + this.btn_document_info.Text = "文档管理"; + this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // buttonItem10 + // ribbonPanel2 // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); + 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); // - // buttonItem11 // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); // - // buttonItem12 + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); // - // buttonItem13 // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - // buttonItem14 // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); // - // ribbonPanel3 + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; // - this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel3.Controls.Add(this.ribbonBar4); - this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel3.Name = "ribbonPanel3"; - this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); + // ribbonBar3 // + this.ribbonBar3.AutoOverflowEnabled = true; // // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; // + this.ribbonBar3.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar3.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.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.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; // - // ribbonBar4 + this.ribbonBar3.TitleStyle.Class = ""; + this.ribbonBar3.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; // - this.ribbonBar4.AutoOverflowEnabled = true; // // + this.ribbonBar3.TitleStyleMouseOver.Class = ""; + this.ribbonBar3.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar3.TitleVisible = false; // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; + 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.Click += new System.EventHandler(this.btn_resc_info_Click); // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // 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.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; + 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_flag + // btn_password_edit // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + 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); // - // slider4ground + // buttonItemPasswordReset // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + 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); // // ribbonPanel6 // @@ -3293,238 +3538,6 @@ 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); - // - // 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, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // 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, 92); - 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.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); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -3588,6 +3601,7 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -3598,7 +3612,6 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4461,7 +4474,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(39100, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(41476, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4555,7 +4568,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(39099, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(41475, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5741,18 +5754,6 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5795,15 +5796,15 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); - this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel3.ResumeLayout(false); - this.ribbonPanel6.ResumeLayout(false); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); + this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); + this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); + this.ribbonPanel6.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); diff --git a/MainFrm.resx b/MainFrm.resx index 25b90f6..46caa31 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -351,6 +351,506 @@ 766, 54 + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL + ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH + s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW + uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx + xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd + iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ + qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW + GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE + NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n + KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw + qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI + HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq + wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q + 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n + W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 + eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv + 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP + I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f + n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV + x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et + V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD + D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u + 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n + z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V + rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ + 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm + oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 + ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H + 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC + RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo + KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O + 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd + rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o + 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C + s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI + jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs + FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm + LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml + CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV + hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q + bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX + YCSg/AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL + SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 + 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P + zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 + 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj + L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 + RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf + nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P + 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj + ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G + xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H + dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 + LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob + gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 + ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi + UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd + XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 + 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN + jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF + Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn + ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYxRjlCRTY3NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 + MTg4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYxRjlCRTY2NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 + MTg4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5JUenqAAACPElEQVRIS7WT3UsUURjGhyCiixbaUC/awuyq7OOuq2y3smxT + +1LT1LL+h6ib/odAKFBiIyssHNJKy740EZGC+hO6qhshDBKSIt6e58w5NXM8M9MQPfCD877nfZ53Z3fH + E5H/irdh885/whUaxmnKgis0jNOUhVS5TFlIlcsUw2kwreFZ9VNlBhNQwS0dF2Rm7q2CZ/Z4p2PipUNc + BMHt52V69o0sf/8ZgT3ecYazOm6ldNiK4GaYX87My9K3H4lwhrP00Ktj/0iHGorltj6ZnJqTxa/LmaCH + Xmbo6EDWglL5VJ9MvJiVhcWlTNBD7/qN25oQuypIh6wFxaYTZ0Vx8pyMTb6WjwtfEuEMZ40vV1PXhtjV + QTpkLSgdxpA/PiUjj1/JoeO9YuoPnz5HYI93nOGsqXPVW7oQuyZIh6wFxcZjPaKAcXjsuQyPPovWgGf2 + eBeuSa66rh2xsQtKB1t75Lb/VIb8J3KgtVvsmvDMHu/sGl9RB2Ljn2B/8xlRtHRL5f6EVO6NR2vAM3u8 + C9ck9QlKGBq8+0gG7jyU4tEusWvCM3u8s+u0J/Dyhfre/Kb6eRqvD43KtVsPZF+5UwWxJjyzxztT5wvb + 3+MHvozIAohfAPEvVoNHvQjTuwYE9d/0pb/iS8ORTgXP7PGOweuqaq/AswfsoFdnBHIs4EuyFlSBrfhU + l7hoL4Kv3hhR8GwF7+as9tAb+6L9BnIu+utgI1d4GCiyCOzSJAcbuUJdQGZRXpMcbOQKy0KyPO8X3VzO + Z+EVt84AAAAASUVORK5CYII= + + + + + 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 + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkI4QTVDNDc0NEM2NzExRTQ5NTE5REU3N0RCMjJE + QjdBIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkI4QTVDNDczNEM2NzExRTQ5NTE5REU3N0RCMjJE + QjdBIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzQ5NEZCOEM2MzRDRTQxMTg4NERE + MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4VEc0+AAADBUlEQVRIS62Ve0iTURTAr1ZaBkoWOTWn+bYyNTENMh/5yCSd + cyMf03xsva0/jEqjF2JIRL4yiGnaNFYRCkYtR2OWMtOm5ivFxyTTqS0VN2UU1el+X2MYVMjnDvz44Nxz + z4/LPZcPfdc2MjCJ/4BYI2r+II59TA8A/BdiQ2JdoU/PkwJ35VJqb/v0LMyJOQghoxULHuW5Ti3OsGAp + NVedJ9taHlxksI6240ZyKugFNbku6rlPu6Ff5EAyNbwLyrPtp6QS/nUsAFxMCRxyUiA8T1eqhrZBm8AG + mu9bw5DcDe6etNUJeH/dvByIIAUPz9ooFXJ7GJDRoavRDjokdlCcbjVtMIHglH1vyRFrTWHqlm+l6faL + txI3TZdm2A0Qgtj4lQviiGlpaa661NstfvXlc6dIMfiYRzDQK0wvKatMGh75CFQgBbowYjGDTRSKYa+R + kSG/AP/t63DOBLN6YmLCDNf5UoXszslCIk6W8Xv8bcfIdYjwkjHGiCxaEvj4y38HRLCPr5/oG70M/aP5 + mAL4MHoFmDzUER6V4I3HdBY3ooRewOBazEnlbHghC8cEwcumwxCZhLpCw1l+K3wHs6QgKh3Ja6W+UP3c + HcprXYH/1BP2MlCPAQS/jxCWsqa/SLAVbvKdIb/MBa4VOYLfQdRnMEEgk6YOiNnwNTCO9sM/2mLGcz/q + 3xmOGg0miGFyQ5qaW4dfv3mr6OruaxgfH0/DaTOM6cLCghdZSTFIAQ4jrVYbgptFEKhUKjecW4UxzJia + OGfyLXdw35l7cCXIIbNCR2Fg8KG1sfFcJ9zIkQp6Ac07c7JSMgbV0jEQ6ED0ZGFEVKLvCu/AkRSYOqWJ + cyo6gVfYCieKW+HMHRkgW+Yzg10yoqfUc240QWxuAxzIrgdWTh0gWrTEYAJLj9TZYJ4QgjKqYF/qPdiT + VAbIKlJmMIG5M3two1v8T3PHaC3dO2HG2pOtRJvDJEGhDM+E5NN95y7kAxX0AhzG8/PzeXhEpzQaTY9Y + LHbBOfIdqNVqV1xH/MApAPJfzP33dTxioZgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzMkNDMkY0NEFEMDExRTQ4MDc0ODRFNENDMkU3 + RDczIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzMkNDMkYzNEFEMDExRTQ4MDc0ODRFNENDMkU3 + RDczIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MjdGOUQzNUFDRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz5/YJCyAAABkUlEQVRIS7WUvUoDQRSFtxErBVfShFUEG4mKYGUh+AS+QB7H + p9BWtLFLZ2EjkUDAHyISFFEUIkhAIigYDGE8J7MTbiYzJjvigY9d7r3n3NliJ1JK/SvR7Pzqn3CFSpym + LLhCJU5TFkbKZcrCSFmGIigDFQi9xTRaCwVJ+ax6qTpdFQS9zEijtawFqv3dtU81NsaL2AmdDqEwsODz + q2OGNsHGuFjeGGilwf0FrY+2GVoDybhY3jzQSoP7C5qtTzNEk90fwgjvA15dheQwm43me/AC6dVVSA6z + +fjyFrxAenUVksNs3j69Bi+QXl2F5DCb1/eN4AXSq6uQHGbzvP4cvEB6dRWSw2xWag+9oRCMF7HeBeXd + g5I6vbgLYu+wpOKkUEOsd0Exnlup4jl0OnJSrfdw9UicLF9N5RZ2EOv90Vjib74OelcFjceVGyfscUZA + D73eq4IlXlQc4CkSfPI+g1zM5JeOMLPIuRR66PVedk6gaVAAW2A7he+sseeXK9AGmgQ5YE5qYI09v1yB + WfhdUfQD3zQ4bV9fKQQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkM4QUEwRERENEFENDExRTRBQTE0RThCQzEyOEQy + OTc1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkM4QUEwRERDNEFENDExRTRBQTE0RThCQzEyOEQy + OTc1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7dyRkqAAAD9ElEQVRIS7WWe0xbZRiH95+T6DQxcc7NLfrHTBaR4NyFmDAy + ljFwwERGpmRxxmyY6QbqgogDhqluOpFLlm6AFslGRVlXKISVS7tByzgUOF1vtLUtLVBogQ4YsLoN9ec5 + 3+xXyIiJWdrkyfed9/u979PLSdsVz6wPfyQA/Cehf3DPQsiBECHkBVj4CyGBn00E9xb+DglU4L/35xIM + 7j78qCpAlVqAg6KNkOtqMTPnx9TcLOzjFty5u4CJWR9u++/AM+NBh7WRnM3/cX/JHCqY899fwu35u/BN + z2HM60NcURjB7hwmNX4/PjmNWzPzZL/v3FPIEK9DQskTNOudmML0rD8oiD0d9hAutxej4z6yZ3pZaA0D + ZO8c8dDM8d9egtSxGxetMTiri8Ih8XpS79cZ4fZOBgVu7y2YrINg9QOIPvU4QcPqyWp1DJM6vwbOUivW + QGSMgdi8E7mqSGQqIpAoXE3OmuRtuKHRwjU6HhQMe6dgG/LA4hhBVM5KJJatJmsPa8TNARup8xm+1tnd + R9bkc88hicsllnGrcC2p1Te1QKliYLQ6SZ4KhriLYe80oaa9Ghk/JEMkqYJS3Q0DF3a4J7D9s1V4s2QN + Nmc+hviTLyOvIgv55SeQe/4YUgu3QlRXjbbrN6A12TDoniSzqMDh9lEszjEoGQbF4u/wa+tlmOxu2Ecm + 0dglR86FjxEteBZx2Zsgab4KhaoH17lXJFO04nKLDCrus+L7A7OowOLyUsxODwy2EaTm78BrWU/io6KD + YE126KxDaFDKEZ4Rhg8E+1HbKAOjNZP6TYsL0mtNaFYrUCmrAGu2YWBwLCgw2Ecf4qeGakRmPo203D1Q + dPWjz8TdBGYX0guSIK5vgLyDQa/BDr3NTdAYrYg68iI2HliJiitV6DM6ggLWwt0p/8J9PeFMsRDnJSLE + H38DsXEJSEhKAaOzod88hMjXt+KTz/PQ2WtCLyfl8wE2RbyKkyWFqJLUQdqu4ASvPBBojE4KH9wVtxel + v5Tj5zopuU5MSQOjt6NG0swJtmHtCxtwrUePHsMDQaA3J/9rfJpTgDY1CwWjDwq6dHYK37BzdwJqZe3I + E3yP9ENHsG//u+TsvcNH8dXZMryVlo4ioYjmA73ZnCA7T4BO1gqV1hp8izr6f6fwDafOlKLgdAlidsXj + 29JKJHOCFrWOnAXga4F8gIjN21Df1k1nUYFSY6bwwUvSVjy/bgN2cILKmnokvf0O8r8pRvr7H5JMcwdL + zvkcn1/cvxgqaGVMFL6BX6Nj9+BLQREuXLyCvSkHEB65BcXll2ju8LETyPqikOaXgwqudhlCQkAQ8p/M + R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 @@ -1606,7 +2106,7 @@ TJ65mM1/9adCvki+8p7nYPunBqvfgM/pcrxVz6sAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl @@ -1618,163 +2118,26 @@ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjYxRjlCRTY3NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 - MTg4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjYxRjlCRTY2NEFEMjExRTQ4MTU2QUUzNEE5ODQ3 - MTg4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5JUenqAAACPElEQVRIS7WT3UsUURjGhyCiixbaUC/awuyq7OOuq2y3smxT - +1LT1LL+h6ib/odAKFBiIyssHNJKy740EZGC+hO6qhshDBKSIt6e58w5NXM8M9MQPfCD877nfZ53Z3fH - E5H/irdh885/whUaxmnKgis0jNOUhVS5TFlIlcsUw2kwreFZ9VNlBhNQwS0dF2Rm7q2CZ/Z4p2PipUNc - BMHt52V69o0sf/8ZgT3ecYazOm6ldNiK4GaYX87My9K3H4lwhrP00Ktj/0iHGorltj6ZnJqTxa/LmaCH - Xmbo6EDWglL5VJ9MvJiVhcWlTNBD7/qN25oQuypIh6wFxaYTZ0Vx8pyMTb6WjwtfEuEMZ40vV1PXhtjV - QTpkLSgdxpA/PiUjj1/JoeO9YuoPnz5HYI93nOGsqXPVW7oQuyZIh6wFxcZjPaKAcXjsuQyPPovWgGf2 - eBeuSa66rh2xsQtKB1t75Lb/VIb8J3KgtVvsmvDMHu/sGl9RB2Ljn2B/8xlRtHRL5f6EVO6NR2vAM3u8 - C9ck9QlKGBq8+0gG7jyU4tEusWvCM3u8s+u0J/Dyhfre/Kb6eRqvD43KtVsPZF+5UwWxJjyzxztT5wvb - 3+MHvozIAohfAPEvVoNHvQjTuwYE9d/0pb/iS8ORTgXP7PGOweuqaq/AswfsoFdnBHIs4EuyFlSBrfhU - l7hoL4Kv3hhR8GwF7+as9tAb+6L9BnIu+utgI1d4GCiyCOzSJAcbuUJdQGZRXpMcbOQKy0KyPO8X3VzO - Z+EVt84AAAAASUVORK5CYII= - - - - - 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 - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkI4QTVDNDc0NEM2NzExRTQ5NTE5REU3N0RCMjJE - QjdBIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkI4QTVDNDczNEM2NzExRTQ5NTE5REU3N0RCMjJE - QjdBIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzQ5NEZCOEM2MzRDRTQxMTg4NERE - MUVBOEQ4QTgyNTUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4VEc0+AAADBUlEQVRIS62Ve0iTURTAr1ZaBkoWOTWn+bYyNTENMh/5yCSd - cyMf03xsva0/jEqjF2JIRL4yiGnaNFYRCkYtR2OWMtOm5ivFxyTTqS0VN2UU1el+X2MYVMjnDvz44Nxz - z4/LPZcPfdc2MjCJ/4BYI2r+II59TA8A/BdiQ2JdoU/PkwJ35VJqb/v0LMyJOQghoxULHuW5Ti3OsGAp - NVedJ9taHlxksI6240ZyKugFNbku6rlPu6Ff5EAyNbwLyrPtp6QS/nUsAFxMCRxyUiA8T1eqhrZBm8AG - mu9bw5DcDe6etNUJeH/dvByIIAUPz9ooFXJ7GJDRoavRDjokdlCcbjVtMIHglH1vyRFrTWHqlm+l6faL - txI3TZdm2A0Qgtj4lQviiGlpaa661NstfvXlc6dIMfiYRzDQK0wvKatMGh75CFQgBbowYjGDTRSKYa+R - kSG/AP/t63DOBLN6YmLCDNf5UoXszslCIk6W8Xv8bcfIdYjwkjHGiCxaEvj4y38HRLCPr5/oG70M/aP5 - mAL4MHoFmDzUER6V4I3HdBY3ooRewOBazEnlbHghC8cEwcumwxCZhLpCw1l+K3wHs6QgKh3Ja6W+UP3c - HcprXYH/1BP2MlCPAQS/jxCWsqa/SLAVbvKdIb/MBa4VOYLfQdRnMEEgk6YOiNnwNTCO9sM/2mLGcz/q - 3xmOGg0miGFyQ5qaW4dfv3mr6OruaxgfH0/DaTOM6cLCghdZSTFIAQ4jrVYbgptFEKhUKjecW4UxzJia - OGfyLXdw35l7cCXIIbNCR2Fg8KG1sfFcJ9zIkQp6Ac07c7JSMgbV0jEQ6ED0ZGFEVKLvCu/AkRSYOqWJ - cyo6gVfYCieKW+HMHRkgW+Yzg10yoqfUc240QWxuAxzIrgdWTh0gWrTEYAJLj9TZYJ4QgjKqYF/qPdiT - VAbIKlJmMIG5M3two1v8T3PHaC3dO2HG2pOtRJvDJEGhDM+E5NN95y7kAxX0AhzG8/PzeXhEpzQaTY9Y - LHbBOfIdqNVqV1xH/MApAPJfzP33dTxioZgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzMkNDMkY0NEFEMDExRTQ4MDc0ODRFNENDMkU3 - RDczIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzMkNDMkYzNEFEMDExRTQ4MDc0ODRFNENDMkU3 - RDczIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MjdGOUQzNUFDRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz5/YJCyAAABkUlEQVRIS7WUvUoDQRSFtxErBVfShFUEG4mKYGUh+AS+QB7H - p9BWtLFLZ2EjkUDAHyISFFEUIkhAIigYDGE8J7MTbiYzJjvigY9d7r3n3NliJ1JK/SvR7Pzqn3CFSpym - LLhCJU5TFkbKZcrCSFmGIigDFQi9xTRaCwVJ+ax6qTpdFQS9zEijtawFqv3dtU81NsaL2AmdDqEwsODz - q2OGNsHGuFjeGGilwf0FrY+2GVoDybhY3jzQSoP7C5qtTzNEk90fwgjvA15dheQwm43me/AC6dVVSA6z - +fjyFrxAenUVksNs3j69Bi+QXl2F5DCb1/eN4AXSq6uQHGbzvP4cvEB6dRWSw2xWag+9oRCMF7HeBeXd - g5I6vbgLYu+wpOKkUEOsd0Exnlup4jl0OnJSrfdw9UicLF9N5RZ2EOv90Vjib74OelcFjceVGyfscUZA - D73eq4IlXlQc4CkSfPI+g1zM5JeOMLPIuRR66PVedk6gaVAAW2A7he+sseeXK9AGmgQ5YE5qYI09v1yB - WfhdUfQD3zQ4bV9fKQQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkM4QUEwRERENEFENDExRTRBQTE0RThCQzEyOEQy - OTc1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkM4QUEwRERDNEFENDExRTRBQTE0RThCQzEyOEQy - OTc1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RjI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= @@ -2160,369 +2523,6 @@ OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL - ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH - s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW - uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx - xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd - iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ - qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW - GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE - NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n - KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw - qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI - HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq - wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q - 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n - W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 - eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv - 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP - I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f - n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV - x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et - V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD - D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u - 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n - z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V - rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ - 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm - oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 - ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H - 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC - RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo - KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O - 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd - rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o - 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C - s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI - jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs - FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm - LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml - CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV - hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q - bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX - YCSg/AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL - SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 - 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P - zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 - 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj - L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 - RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf - nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P - 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj - ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G - xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H - dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 - LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob - gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 - ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi - UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd - XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 - 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN - jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF - Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn - ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/PaginationFeaturesUtil.cs b/PaginationFeaturesUtil.cs index 5ba7831..15ce642 100644 --- a/PaginationFeaturesUtil.cs +++ b/PaginationFeaturesUtil.cs @@ -86,7 +86,7 @@ result.Columns.Add(t, typeof(String)); } int i = 0; - while (i < begin) i++; + //while (i < begin) i++; for (; i < features.Length && i < begin + pagesize; i++) { GSOFeature feature = features[i];