diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs
index 96029a6..dabc29c 100644
--- a/FrmMetadataStat.cs
+++ b/FrmMetadataStat.cs
@@ -22,9 +22,9 @@
string sql = "select LAYERNAME from casic_metadataLayer where LAYERNAME like '%"
+ keywordsTxt.Text.Trim() + "%'";
DataTable table = OledbHelper.QueryTable(sql);
- int num = 0;
+ int num = 0;
- resultList.Clear();
+ listBox1.Items.Clear();
consLblC.Text = "";
descLblC.Text = "";
authorLblC.Text = "";
@@ -35,7 +35,7 @@
num = table.Rows.Count;
for (int i = 0; i < num;i++ )
{
- resultList.Items.Add(table.Rows[i][0].ToString());
+ listBox1.Items.Add(table.Rows[i][0].ToString());
}
}
resultLbl.Text = "共有"+num+"个查询结果";
@@ -101,22 +101,22 @@
}
//选择list
- private void resultList_SelectedIndexChanged(object sender, EventArgs e)
+ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(resultList.SelectedItems[0].Text);
- string layer = resultList.SelectedItems[0].Text;
+ if (listBox1.SelectedItem == null) return;
+ string layer = listBox1.SelectedItem.ToString();
searchLayerInfo(layer);
}
+
//查询元数据
private void searchLayerInfo(String layername)
{
- ////MessageBox.Show(layername);
string sql = "select casic_metadatacontent.MDABSTRACT,casic_metadatacontent.MDDESCRIPTION,"
+ "casic_metadatacontent.MDAUTHOR,casic_metadatacontent.NT from casic_metadatacontent "
+ "join casic_metadatalayer on casic_metadatalayer.LAYERID = casic_metadatacontent.LAYERID "
+ "where casic_metadatalayer.LAYERNAME='" + layername + "'";
DataTable table = OledbHelper.QueryTable(sql);
- //MessageBox.Show(num.ToString());
+
if (table != null && table.Rows.Count > 0)
{
consLblC.Text = table.Rows[0][0].ToString();
@@ -133,5 +133,7 @@
ntLblC.Text = "";
}
}
+
+
}
}
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs
index 96029a6..dabc29c 100644
--- a/FrmMetadataStat.cs
+++ b/FrmMetadataStat.cs
@@ -22,9 +22,9 @@
string sql = "select LAYERNAME from casic_metadataLayer where LAYERNAME like '%"
+ keywordsTxt.Text.Trim() + "%'";
DataTable table = OledbHelper.QueryTable(sql);
- int num = 0;
+ int num = 0;
- resultList.Clear();
+ listBox1.Items.Clear();
consLblC.Text = "";
descLblC.Text = "";
authorLblC.Text = "";
@@ -35,7 +35,7 @@
num = table.Rows.Count;
for (int i = 0; i < num;i++ )
{
- resultList.Items.Add(table.Rows[i][0].ToString());
+ listBox1.Items.Add(table.Rows[i][0].ToString());
}
}
resultLbl.Text = "共有"+num+"个查询结果";
@@ -101,22 +101,22 @@
}
//选择list
- private void resultList_SelectedIndexChanged(object sender, EventArgs e)
+ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(resultList.SelectedItems[0].Text);
- string layer = resultList.SelectedItems[0].Text;
+ if (listBox1.SelectedItem == null) return;
+ string layer = listBox1.SelectedItem.ToString();
searchLayerInfo(layer);
}
+
//查询元数据
private void searchLayerInfo(String layername)
{
- ////MessageBox.Show(layername);
string sql = "select casic_metadatacontent.MDABSTRACT,casic_metadatacontent.MDDESCRIPTION,"
+ "casic_metadatacontent.MDAUTHOR,casic_metadatacontent.NT from casic_metadatacontent "
+ "join casic_metadatalayer on casic_metadatalayer.LAYERID = casic_metadatacontent.LAYERID "
+ "where casic_metadatalayer.LAYERNAME='" + layername + "'";
DataTable table = OledbHelper.QueryTable(sql);
- //MessageBox.Show(num.ToString());
+
if (table != null && table.Rows.Count > 0)
{
consLblC.Text = table.Rows[0][0].ToString();
@@ -133,5 +133,7 @@
ntLblC.Text = "";
}
}
+
+
}
}
diff --git a/FrmMetadataStat.designer.cs b/FrmMetadataStat.designer.cs
index f844cab..697620b 100644
--- a/FrmMetadataStat.designer.cs
+++ b/FrmMetadataStat.designer.cs
@@ -36,12 +36,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
this.keywordsLbl = new DevComponents.DotNetBar.LabelX();
this.searchBtn = new DevComponents.DotNetBar.ButtonX();
this.keywordsTxt = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.resultList = new DevComponents.DotNetBar.Controls.ListViewEx();
- this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -58,6 +56,7 @@
this.consLbl = new DevComponents.DotNetBar.LabelX();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
+ this.listBox1 = new System.Windows.Forms.ListBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.ntLbl.SuspendLayout();
@@ -103,34 +102,6 @@
this.keywordsTxt.Size = new System.Drawing.Size(131, 21);
this.keywordsTxt.TabIndex = 2;
//
- // resultList
- //
- //
- //
- //
- this.resultList.Border.Class = "ListViewBorder";
- this.resultList.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.resultList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1});
- this.resultList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.resultList.FullRowSelect = true;
- this.resultList.GridLines = true;
- this.resultList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.resultList.LabelWrap = false;
- this.resultList.Location = new System.Drawing.Point(78, 55);
- this.resultList.MultiSelect = false;
- this.resultList.Name = "resultList";
- this.resultList.ShowItemToolTips = true;
- this.resultList.Size = new System.Drawing.Size(199, 262);
- this.resultList.TabIndex = 5;
- this.resultList.UseCompatibleStateImageBehavior = false;
- this.resultList.View = System.Windows.Forms.View.List;
- this.resultList.SelectedIndexChanged += new System.EventHandler(this.resultList_SelectedIndexChanged);
- //
- // columnHeader1
- //
- this.columnHeader1.Width = 200;
- //
// labelX1
//
//
@@ -161,12 +132,12 @@
//
// tabPage1
//
+ this.tabPage1.Controls.Add(this.listBox1);
this.tabPage1.Controls.Add(this.resultLbl);
this.tabPage1.Controls.Add(this.ntLbl);
this.tabPage1.Controls.Add(this.keywordsLbl);
this.tabPage1.Controls.Add(this.labelX1);
this.tabPage1.Controls.Add(this.keywordsTxt);
- this.tabPage1.Controls.Add(this.resultList);
this.tabPage1.Controls.Add(this.searchBtn);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@@ -327,11 +298,11 @@
//
// chart1
//
- chartArea1.AxisX.MajorGrid.Enabled = false;
- chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
- chartArea1.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
- chartArea1.Name = "ChartArea1";
- this.chart1.ChartAreas.Add(chartArea1);
+ chartArea4.AxisX.MajorGrid.Enabled = false;
+ chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
+ chartArea4.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
+ chartArea4.Name = "ChartArea1";
+ this.chart1.ChartAreas.Add(chartArea4);
this.chart1.Dock = System.Windows.Forms.DockStyle.Fill;
this.chart1.Location = new System.Drawing.Point(3, 3);
this.chart1.Name = "chart1";
@@ -339,6 +310,16 @@
this.chart1.TabIndex = 2;
this.chart1.Text = "chart1";
//
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.ItemHeight = 12;
+ this.listBox1.Location = new System.Drawing.Point(78, 69);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(199, 244);
+ this.listBox1.TabIndex = 11;
+ this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+ //
// FrmMetadataStat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -365,8 +346,6 @@
private LabelX keywordsLbl;
private ButtonX searchBtn;
private TextBoxX keywordsTxt;
- private ListViewEx resultList;
- private ColumnHeader columnHeader1;
private LabelX labelX1;
private StyleManager styleManager1;
private TabControl tabControl1;
@@ -383,5 +362,6 @@
private LabelX consLblC;
private LabelX resultLbl;
private Chart chart1;
+ private ListBox listBox1;
}
}
\ No newline at end of file
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs
index 96029a6..dabc29c 100644
--- a/FrmMetadataStat.cs
+++ b/FrmMetadataStat.cs
@@ -22,9 +22,9 @@
string sql = "select LAYERNAME from casic_metadataLayer where LAYERNAME like '%"
+ keywordsTxt.Text.Trim() + "%'";
DataTable table = OledbHelper.QueryTable(sql);
- int num = 0;
+ int num = 0;
- resultList.Clear();
+ listBox1.Items.Clear();
consLblC.Text = "";
descLblC.Text = "";
authorLblC.Text = "";
@@ -35,7 +35,7 @@
num = table.Rows.Count;
for (int i = 0; i < num;i++ )
{
- resultList.Items.Add(table.Rows[i][0].ToString());
+ listBox1.Items.Add(table.Rows[i][0].ToString());
}
}
resultLbl.Text = "共有"+num+"个查询结果";
@@ -101,22 +101,22 @@
}
//选择list
- private void resultList_SelectedIndexChanged(object sender, EventArgs e)
+ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(resultList.SelectedItems[0].Text);
- string layer = resultList.SelectedItems[0].Text;
+ if (listBox1.SelectedItem == null) return;
+ string layer = listBox1.SelectedItem.ToString();
searchLayerInfo(layer);
}
+
//查询元数据
private void searchLayerInfo(String layername)
{
- ////MessageBox.Show(layername);
string sql = "select casic_metadatacontent.MDABSTRACT,casic_metadatacontent.MDDESCRIPTION,"
+ "casic_metadatacontent.MDAUTHOR,casic_metadatacontent.NT from casic_metadatacontent "
+ "join casic_metadatalayer on casic_metadatalayer.LAYERID = casic_metadatacontent.LAYERID "
+ "where casic_metadatalayer.LAYERNAME='" + layername + "'";
DataTable table = OledbHelper.QueryTable(sql);
- //MessageBox.Show(num.ToString());
+
if (table != null && table.Rows.Count > 0)
{
consLblC.Text = table.Rows[0][0].ToString();
@@ -133,5 +133,7 @@
ntLblC.Text = "";
}
}
+
+
}
}
diff --git a/FrmMetadataStat.designer.cs b/FrmMetadataStat.designer.cs
index f844cab..697620b 100644
--- a/FrmMetadataStat.designer.cs
+++ b/FrmMetadataStat.designer.cs
@@ -36,12 +36,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
this.keywordsLbl = new DevComponents.DotNetBar.LabelX();
this.searchBtn = new DevComponents.DotNetBar.ButtonX();
this.keywordsTxt = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.resultList = new DevComponents.DotNetBar.Controls.ListViewEx();
- this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -58,6 +56,7 @@
this.consLbl = new DevComponents.DotNetBar.LabelX();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
+ this.listBox1 = new System.Windows.Forms.ListBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.ntLbl.SuspendLayout();
@@ -103,34 +102,6 @@
this.keywordsTxt.Size = new System.Drawing.Size(131, 21);
this.keywordsTxt.TabIndex = 2;
//
- // resultList
- //
- //
- //
- //
- this.resultList.Border.Class = "ListViewBorder";
- this.resultList.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.resultList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1});
- this.resultList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.resultList.FullRowSelect = true;
- this.resultList.GridLines = true;
- this.resultList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.resultList.LabelWrap = false;
- this.resultList.Location = new System.Drawing.Point(78, 55);
- this.resultList.MultiSelect = false;
- this.resultList.Name = "resultList";
- this.resultList.ShowItemToolTips = true;
- this.resultList.Size = new System.Drawing.Size(199, 262);
- this.resultList.TabIndex = 5;
- this.resultList.UseCompatibleStateImageBehavior = false;
- this.resultList.View = System.Windows.Forms.View.List;
- this.resultList.SelectedIndexChanged += new System.EventHandler(this.resultList_SelectedIndexChanged);
- //
- // columnHeader1
- //
- this.columnHeader1.Width = 200;
- //
// labelX1
//
//
@@ -161,12 +132,12 @@
//
// tabPage1
//
+ this.tabPage1.Controls.Add(this.listBox1);
this.tabPage1.Controls.Add(this.resultLbl);
this.tabPage1.Controls.Add(this.ntLbl);
this.tabPage1.Controls.Add(this.keywordsLbl);
this.tabPage1.Controls.Add(this.labelX1);
this.tabPage1.Controls.Add(this.keywordsTxt);
- this.tabPage1.Controls.Add(this.resultList);
this.tabPage1.Controls.Add(this.searchBtn);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@@ -327,11 +298,11 @@
//
// chart1
//
- chartArea1.AxisX.MajorGrid.Enabled = false;
- chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
- chartArea1.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
- chartArea1.Name = "ChartArea1";
- this.chart1.ChartAreas.Add(chartArea1);
+ chartArea4.AxisX.MajorGrid.Enabled = false;
+ chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
+ chartArea4.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
+ chartArea4.Name = "ChartArea1";
+ this.chart1.ChartAreas.Add(chartArea4);
this.chart1.Dock = System.Windows.Forms.DockStyle.Fill;
this.chart1.Location = new System.Drawing.Point(3, 3);
this.chart1.Name = "chart1";
@@ -339,6 +310,16 @@
this.chart1.TabIndex = 2;
this.chart1.Text = "chart1";
//
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.ItemHeight = 12;
+ this.listBox1.Location = new System.Drawing.Point(78, 69);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(199, 244);
+ this.listBox1.TabIndex = 11;
+ this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+ //
// FrmMetadataStat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -365,8 +346,6 @@
private LabelX keywordsLbl;
private ButtonX searchBtn;
private TextBoxX keywordsTxt;
- private ListViewEx resultList;
- private ColumnHeader columnHeader1;
private LabelX labelX1;
private StyleManager styleManager1;
private TabControl tabControl1;
@@ -383,5 +362,6 @@
private LabelX consLblC;
private LabelX resultLbl;
private Chart chart1;
+ private ListBox listBox1;
}
}
\ No newline at end of file
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 6166c35..a6a7320 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -314,6 +314,13 @@
this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_2 = 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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar();
this.btn_user_info = new DevComponents.DotNetBar.ButtonItem();
@@ -350,13 +357,6 @@
this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
- this.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();
@@ -552,12 +552,12 @@
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
+ this.ribbonPanel1.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
- this.ribbonPanel1.SuspendLayout();
this.ribbonPanel7.SuspendLayout();
this.ribbonPanel3.SuspendLayout();
this.panelOfTable.SuspendLayout();
@@ -2123,13 +2123,13 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
this.ribbonControl1.Controls.Add(this.ribbonPanel1);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
this.ribbonControl1.Controls.Add(this.ribbonPanel12);
this.ribbonControl1.Controls.Add(this.ribbonPanel4);
- this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel7);
this.ribbonControl1.Controls.Add(this.ribbonPanel3);
this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -2200,6 +2200,7 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
+ this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -2650,6 +2651,123 @@
this.buttonItemXT4_2.Text = "人员修改";
this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click);
//
+ // ribbonPanel1
+ //
+ this.ribbonPanel1.AutoSize = true;
+ this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
+ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel1.Controls.Add(this.ribbonBar21);
+ this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel1.Name = "ribbonPanel1";
+ this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel1.Style.Class = "";
+ this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseDown.Class = "";
+ this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseOver.Class = "";
+ this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel1.TabIndex = 1;
+ this.ribbonPanel1.Visible = false;
+ //
+ // ribbonBar21
+ //
+ this.ribbonBar21.AutoOverflowEnabled = true;
+ this.ribbonBar21.BackColor = System.Drawing.Color.White;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundStyle.Class = "";
+ this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.ContainerControlProcessDialogKey = true;
+ this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.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.ribbonBar21.TitleStyle.Class = "";
+ this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.TitleStyleMouseOver.Class = "";
+ this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.TitleVisible = false;
+ this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
+ //
+ // buttonItem1
+ //
+ 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);
+ //
// ribbonPanel2
//
this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3147,7 +3265,6 @@
this.ribbonPanel6.StyleMouseOver.Class = "";
this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel6.TabIndex = 38;
- this.ribbonPanel6.Visible = false;
//
// ribbonBar6
//
@@ -3233,123 +3350,6 @@
this.buttonItemGBJC.Text = "国标检测";
this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
//
- // ribbonPanel1
- //
- this.ribbonPanel1.AutoSize = true;
- this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
- this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel1.Controls.Add(this.ribbonBar21);
- this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel1.Name = "ribbonPanel1";
- this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel1.Style.Class = "";
- this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseDown.Class = "";
- this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseOver.Class = "";
- this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel1.TabIndex = 1;
- this.ribbonPanel1.Visible = false;
- //
- // ribbonBar21
- //
- this.ribbonBar21.AutoOverflowEnabled = true;
- this.ribbonBar21.BackColor = System.Drawing.Color.White;
- //
- //
- //
- this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.BackgroundStyle.Class = "";
- this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.ContainerControlProcessDialogKey = true;
- this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.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.ribbonBar21.TitleStyle.Class = "";
- this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.TitleStyleMouseOver.Class = "";
- this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.TitleVisible = false;
- this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
- //
- // buttonItem1
- //
- 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);
- //
// ribbonPanel7
//
this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3585,6 +3585,7 @@
// ribbonTabItem9
//
this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.ribbonTabItem9.Checked = true;
this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage")));
this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image")));
this.ribbonTabItem9.Name = "ribbonTabItem9";
@@ -3605,7 +3606,6 @@
// ribbonTabItem14
//
this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem14.Checked = true;
this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage")));
this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image")));
this.ribbonTabItem14.Name = "ribbonTabItem14";
@@ -4555,7 +4555,7 @@
this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(45931, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(46525, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -4665,7 +4665,7 @@
this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(45930, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(46524, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -6002,12 +6002,12 @@
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
this.ribbonPanel15.ResumeLayout(false);
+ this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
- this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel7.ResumeLayout(false);
this.ribbonPanel3.ResumeLayout(false);
this.panelOfTable.ResumeLayout(false);
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs
index 96029a6..dabc29c 100644
--- a/FrmMetadataStat.cs
+++ b/FrmMetadataStat.cs
@@ -22,9 +22,9 @@
string sql = "select LAYERNAME from casic_metadataLayer where LAYERNAME like '%"
+ keywordsTxt.Text.Trim() + "%'";
DataTable table = OledbHelper.QueryTable(sql);
- int num = 0;
+ int num = 0;
- resultList.Clear();
+ listBox1.Items.Clear();
consLblC.Text = "";
descLblC.Text = "";
authorLblC.Text = "";
@@ -35,7 +35,7 @@
num = table.Rows.Count;
for (int i = 0; i < num;i++ )
{
- resultList.Items.Add(table.Rows[i][0].ToString());
+ listBox1.Items.Add(table.Rows[i][0].ToString());
}
}
resultLbl.Text = "共有"+num+"个查询结果";
@@ -101,22 +101,22 @@
}
//选择list
- private void resultList_SelectedIndexChanged(object sender, EventArgs e)
+ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(resultList.SelectedItems[0].Text);
- string layer = resultList.SelectedItems[0].Text;
+ if (listBox1.SelectedItem == null) return;
+ string layer = listBox1.SelectedItem.ToString();
searchLayerInfo(layer);
}
+
//查询元数据
private void searchLayerInfo(String layername)
{
- ////MessageBox.Show(layername);
string sql = "select casic_metadatacontent.MDABSTRACT,casic_metadatacontent.MDDESCRIPTION,"
+ "casic_metadatacontent.MDAUTHOR,casic_metadatacontent.NT from casic_metadatacontent "
+ "join casic_metadatalayer on casic_metadatalayer.LAYERID = casic_metadatacontent.LAYERID "
+ "where casic_metadatalayer.LAYERNAME='" + layername + "'";
DataTable table = OledbHelper.QueryTable(sql);
- //MessageBox.Show(num.ToString());
+
if (table != null && table.Rows.Count > 0)
{
consLblC.Text = table.Rows[0][0].ToString();
@@ -133,5 +133,7 @@
ntLblC.Text = "";
}
}
+
+
}
}
diff --git a/FrmMetadataStat.designer.cs b/FrmMetadataStat.designer.cs
index f844cab..697620b 100644
--- a/FrmMetadataStat.designer.cs
+++ b/FrmMetadataStat.designer.cs
@@ -36,12 +36,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
this.keywordsLbl = new DevComponents.DotNetBar.LabelX();
this.searchBtn = new DevComponents.DotNetBar.ButtonX();
this.keywordsTxt = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.resultList = new DevComponents.DotNetBar.Controls.ListViewEx();
- this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -58,6 +56,7 @@
this.consLbl = new DevComponents.DotNetBar.LabelX();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
+ this.listBox1 = new System.Windows.Forms.ListBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.ntLbl.SuspendLayout();
@@ -103,34 +102,6 @@
this.keywordsTxt.Size = new System.Drawing.Size(131, 21);
this.keywordsTxt.TabIndex = 2;
//
- // resultList
- //
- //
- //
- //
- this.resultList.Border.Class = "ListViewBorder";
- this.resultList.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.resultList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1});
- this.resultList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.resultList.FullRowSelect = true;
- this.resultList.GridLines = true;
- this.resultList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.resultList.LabelWrap = false;
- this.resultList.Location = new System.Drawing.Point(78, 55);
- this.resultList.MultiSelect = false;
- this.resultList.Name = "resultList";
- this.resultList.ShowItemToolTips = true;
- this.resultList.Size = new System.Drawing.Size(199, 262);
- this.resultList.TabIndex = 5;
- this.resultList.UseCompatibleStateImageBehavior = false;
- this.resultList.View = System.Windows.Forms.View.List;
- this.resultList.SelectedIndexChanged += new System.EventHandler(this.resultList_SelectedIndexChanged);
- //
- // columnHeader1
- //
- this.columnHeader1.Width = 200;
- //
// labelX1
//
//
@@ -161,12 +132,12 @@
//
// tabPage1
//
+ this.tabPage1.Controls.Add(this.listBox1);
this.tabPage1.Controls.Add(this.resultLbl);
this.tabPage1.Controls.Add(this.ntLbl);
this.tabPage1.Controls.Add(this.keywordsLbl);
this.tabPage1.Controls.Add(this.labelX1);
this.tabPage1.Controls.Add(this.keywordsTxt);
- this.tabPage1.Controls.Add(this.resultList);
this.tabPage1.Controls.Add(this.searchBtn);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@@ -327,11 +298,11 @@
//
// chart1
//
- chartArea1.AxisX.MajorGrid.Enabled = false;
- chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
- chartArea1.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
- chartArea1.Name = "ChartArea1";
- this.chart1.ChartAreas.Add(chartArea1);
+ chartArea4.AxisX.MajorGrid.Enabled = false;
+ chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
+ chartArea4.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
+ chartArea4.Name = "ChartArea1";
+ this.chart1.ChartAreas.Add(chartArea4);
this.chart1.Dock = System.Windows.Forms.DockStyle.Fill;
this.chart1.Location = new System.Drawing.Point(3, 3);
this.chart1.Name = "chart1";
@@ -339,6 +310,16 @@
this.chart1.TabIndex = 2;
this.chart1.Text = "chart1";
//
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.ItemHeight = 12;
+ this.listBox1.Location = new System.Drawing.Point(78, 69);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(199, 244);
+ this.listBox1.TabIndex = 11;
+ this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+ //
// FrmMetadataStat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -365,8 +346,6 @@
private LabelX keywordsLbl;
private ButtonX searchBtn;
private TextBoxX keywordsTxt;
- private ListViewEx resultList;
- private ColumnHeader columnHeader1;
private LabelX labelX1;
private StyleManager styleManager1;
private TabControl tabControl1;
@@ -383,5 +362,6 @@
private LabelX consLblC;
private LabelX resultLbl;
private Chart chart1;
+ private ListBox listBox1;
}
}
\ No newline at end of file
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 6166c35..a6a7320 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -314,6 +314,13 @@
this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_2 = 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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar();
this.btn_user_info = new DevComponents.DotNetBar.ButtonItem();
@@ -350,13 +357,6 @@
this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
- this.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();
@@ -552,12 +552,12 @@
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
+ this.ribbonPanel1.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
- this.ribbonPanel1.SuspendLayout();
this.ribbonPanel7.SuspendLayout();
this.ribbonPanel3.SuspendLayout();
this.panelOfTable.SuspendLayout();
@@ -2123,13 +2123,13 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
this.ribbonControl1.Controls.Add(this.ribbonPanel1);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
this.ribbonControl1.Controls.Add(this.ribbonPanel12);
this.ribbonControl1.Controls.Add(this.ribbonPanel4);
- this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel7);
this.ribbonControl1.Controls.Add(this.ribbonPanel3);
this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -2200,6 +2200,7 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
+ this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -2650,6 +2651,123 @@
this.buttonItemXT4_2.Text = "人员修改";
this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click);
//
+ // ribbonPanel1
+ //
+ this.ribbonPanel1.AutoSize = true;
+ this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
+ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel1.Controls.Add(this.ribbonBar21);
+ this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel1.Name = "ribbonPanel1";
+ this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel1.Style.Class = "";
+ this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseDown.Class = "";
+ this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseOver.Class = "";
+ this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel1.TabIndex = 1;
+ this.ribbonPanel1.Visible = false;
+ //
+ // ribbonBar21
+ //
+ this.ribbonBar21.AutoOverflowEnabled = true;
+ this.ribbonBar21.BackColor = System.Drawing.Color.White;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundStyle.Class = "";
+ this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.ContainerControlProcessDialogKey = true;
+ this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.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.ribbonBar21.TitleStyle.Class = "";
+ this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.TitleStyleMouseOver.Class = "";
+ this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.TitleVisible = false;
+ this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
+ //
+ // buttonItem1
+ //
+ 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);
+ //
// ribbonPanel2
//
this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3147,7 +3265,6 @@
this.ribbonPanel6.StyleMouseOver.Class = "";
this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel6.TabIndex = 38;
- this.ribbonPanel6.Visible = false;
//
// ribbonBar6
//
@@ -3233,123 +3350,6 @@
this.buttonItemGBJC.Text = "国标检测";
this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
//
- // ribbonPanel1
- //
- this.ribbonPanel1.AutoSize = true;
- this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
- this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel1.Controls.Add(this.ribbonBar21);
- this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel1.Name = "ribbonPanel1";
- this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel1.Style.Class = "";
- this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseDown.Class = "";
- this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseOver.Class = "";
- this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel1.TabIndex = 1;
- this.ribbonPanel1.Visible = false;
- //
- // ribbonBar21
- //
- this.ribbonBar21.AutoOverflowEnabled = true;
- this.ribbonBar21.BackColor = System.Drawing.Color.White;
- //
- //
- //
- this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.BackgroundStyle.Class = "";
- this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.ContainerControlProcessDialogKey = true;
- this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.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.ribbonBar21.TitleStyle.Class = "";
- this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.TitleStyleMouseOver.Class = "";
- this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.TitleVisible = false;
- this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
- //
- // buttonItem1
- //
- 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);
- //
// ribbonPanel7
//
this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3585,6 +3585,7 @@
// ribbonTabItem9
//
this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.ribbonTabItem9.Checked = true;
this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage")));
this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image")));
this.ribbonTabItem9.Name = "ribbonTabItem9";
@@ -3605,7 +3606,6 @@
// ribbonTabItem14
//
this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem14.Checked = true;
this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage")));
this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image")));
this.ribbonTabItem14.Name = "ribbonTabItem14";
@@ -4555,7 +4555,7 @@
this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(45931, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(46525, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -4665,7 +4665,7 @@
this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(45930, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(46524, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -6002,12 +6002,12 @@
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
this.ribbonPanel15.ResumeLayout(false);
+ this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
- this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel7.ResumeLayout(false);
this.ribbonPanel3.ResumeLayout(false);
this.panelOfTable.ResumeLayout(false);
diff --git a/MainFrm.resx b/MainFrm.resx
index 8e80d52..ea7021a 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -351,6 +351,142 @@
766, 54
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
+ NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
+ NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6
+ iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z
+ zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s
+ hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa
+ BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n
+ WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ
+ BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY
+ s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn
+ ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg
+ 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef
+ rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q
+ qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK
+ Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6
+ RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO
+ RK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE
+ NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE
+ NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM
+ 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t
+ lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl
+ DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q
+ rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th
+ pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S
+ T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt
+ SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/
+ oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND
+ MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND
+ MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4
+ l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg
+ S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj
+ CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X
+ 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF
+ 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu
+ F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee
+ SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4
+ 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY
+ VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3
+ 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53
+ edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA
+ S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw
+ p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if
+ SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES
+ 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U
+ IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL
+ 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze
+ r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq
+ nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5
+ Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5
+ Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE
+ NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R
+ Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33
+ nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA
+ AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8
+ OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy
+ BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F
+ mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd
+ v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul
+ AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj
+ dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg
+ 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2
+ OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC
+
+
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -2387,142 +2523,6 @@
++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
- NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
- NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6
- iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z
- zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s
- hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa
- BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n
- WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ
- BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY
- s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn
- ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg
- 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef
- rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q
- qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK
- Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6
- RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO
- RK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE
- NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE
- NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM
- 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t
- lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl
- DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q
- rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th
- pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S
- T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt
- SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/
- oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND
- MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND
- MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4
- l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg
- S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj
- CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X
- 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF
- 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu
- F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee
- SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4
- 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY
- VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3
- 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53
- edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA
- S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw
- p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if
- SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES
- 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U
- IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL
- 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze
- r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq
- nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5
- Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5
- Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE
- NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R
- Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33
- nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA
- AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8
- OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy
- BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F
- mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd
- v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul
- AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj
- dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg
- 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2
- OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC
-
-
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 616ecec..8b9c935 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmMetadataStat.cs b/FrmMetadataStat.cs
index 96029a6..dabc29c 100644
--- a/FrmMetadataStat.cs
+++ b/FrmMetadataStat.cs
@@ -22,9 +22,9 @@
string sql = "select LAYERNAME from casic_metadataLayer where LAYERNAME like '%"
+ keywordsTxt.Text.Trim() + "%'";
DataTable table = OledbHelper.QueryTable(sql);
- int num = 0;
+ int num = 0;
- resultList.Clear();
+ listBox1.Items.Clear();
consLblC.Text = "";
descLblC.Text = "";
authorLblC.Text = "";
@@ -35,7 +35,7 @@
num = table.Rows.Count;
for (int i = 0; i < num;i++ )
{
- resultList.Items.Add(table.Rows[i][0].ToString());
+ listBox1.Items.Add(table.Rows[i][0].ToString());
}
}
resultLbl.Text = "共有"+num+"个查询结果";
@@ -101,22 +101,22 @@
}
//选择list
- private void resultList_SelectedIndexChanged(object sender, EventArgs e)
+ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
- //MessageBox.Show(resultList.SelectedItems[0].Text);
- string layer = resultList.SelectedItems[0].Text;
+ if (listBox1.SelectedItem == null) return;
+ string layer = listBox1.SelectedItem.ToString();
searchLayerInfo(layer);
}
+
//查询元数据
private void searchLayerInfo(String layername)
{
- ////MessageBox.Show(layername);
string sql = "select casic_metadatacontent.MDABSTRACT,casic_metadatacontent.MDDESCRIPTION,"
+ "casic_metadatacontent.MDAUTHOR,casic_metadatacontent.NT from casic_metadatacontent "
+ "join casic_metadatalayer on casic_metadatalayer.LAYERID = casic_metadatacontent.LAYERID "
+ "where casic_metadatalayer.LAYERNAME='" + layername + "'";
DataTable table = OledbHelper.QueryTable(sql);
- //MessageBox.Show(num.ToString());
+
if (table != null && table.Rows.Count > 0)
{
consLblC.Text = table.Rows[0][0].ToString();
@@ -133,5 +133,7 @@
ntLblC.Text = "";
}
}
+
+
}
}
diff --git a/FrmMetadataStat.designer.cs b/FrmMetadataStat.designer.cs
index f844cab..697620b 100644
--- a/FrmMetadataStat.designer.cs
+++ b/FrmMetadataStat.designer.cs
@@ -36,12 +36,10 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+ System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
this.keywordsLbl = new DevComponents.DotNetBar.LabelX();
this.searchBtn = new DevComponents.DotNetBar.ButtonX();
this.keywordsTxt = new DevComponents.DotNetBar.Controls.TextBoxX();
- this.resultList = new DevComponents.DotNetBar.Controls.ListViewEx();
- this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.labelX1 = new DevComponents.DotNetBar.LabelX();
this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -58,6 +56,7 @@
this.consLbl = new DevComponents.DotNetBar.LabelX();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
+ this.listBox1 = new System.Windows.Forms.ListBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.ntLbl.SuspendLayout();
@@ -103,34 +102,6 @@
this.keywordsTxt.Size = new System.Drawing.Size(131, 21);
this.keywordsTxt.TabIndex = 2;
//
- // resultList
- //
- //
- //
- //
- this.resultList.Border.Class = "ListViewBorder";
- this.resultList.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.resultList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1});
- this.resultList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.resultList.FullRowSelect = true;
- this.resultList.GridLines = true;
- this.resultList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.resultList.LabelWrap = false;
- this.resultList.Location = new System.Drawing.Point(78, 55);
- this.resultList.MultiSelect = false;
- this.resultList.Name = "resultList";
- this.resultList.ShowItemToolTips = true;
- this.resultList.Size = new System.Drawing.Size(199, 262);
- this.resultList.TabIndex = 5;
- this.resultList.UseCompatibleStateImageBehavior = false;
- this.resultList.View = System.Windows.Forms.View.List;
- this.resultList.SelectedIndexChanged += new System.EventHandler(this.resultList_SelectedIndexChanged);
- //
- // columnHeader1
- //
- this.columnHeader1.Width = 200;
- //
// labelX1
//
//
@@ -161,12 +132,12 @@
//
// tabPage1
//
+ this.tabPage1.Controls.Add(this.listBox1);
this.tabPage1.Controls.Add(this.resultLbl);
this.tabPage1.Controls.Add(this.ntLbl);
this.tabPage1.Controls.Add(this.keywordsLbl);
this.tabPage1.Controls.Add(this.labelX1);
this.tabPage1.Controls.Add(this.keywordsTxt);
- this.tabPage1.Controls.Add(this.resultList);
this.tabPage1.Controls.Add(this.searchBtn);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
@@ -327,11 +298,11 @@
//
// chart1
//
- chartArea1.AxisX.MajorGrid.Enabled = false;
- chartArea1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
- chartArea1.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
- chartArea1.Name = "ChartArea1";
- this.chart1.ChartAreas.Add(chartArea1);
+ chartArea4.AxisX.MajorGrid.Enabled = false;
+ chartArea4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(219)))), ((int)(((byte)(255)))));
+ chartArea4.BackGradientStyle = System.Windows.Forms.DataVisualization.Charting.GradientStyle.TopBottom;
+ chartArea4.Name = "ChartArea1";
+ this.chart1.ChartAreas.Add(chartArea4);
this.chart1.Dock = System.Windows.Forms.DockStyle.Fill;
this.chart1.Location = new System.Drawing.Point(3, 3);
this.chart1.Name = "chart1";
@@ -339,6 +310,16 @@
this.chart1.TabIndex = 2;
this.chart1.Text = "chart1";
//
+ // listBox1
+ //
+ this.listBox1.FormattingEnabled = true;
+ this.listBox1.ItemHeight = 12;
+ this.listBox1.Location = new System.Drawing.Point(78, 69);
+ this.listBox1.Name = "listBox1";
+ this.listBox1.Size = new System.Drawing.Size(199, 244);
+ this.listBox1.TabIndex = 11;
+ this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+ //
// FrmMetadataStat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -365,8 +346,6 @@
private LabelX keywordsLbl;
private ButtonX searchBtn;
private TextBoxX keywordsTxt;
- private ListViewEx resultList;
- private ColumnHeader columnHeader1;
private LabelX labelX1;
private StyleManager styleManager1;
private TabControl tabControl1;
@@ -383,5 +362,6 @@
private LabelX consLblC;
private LabelX resultLbl;
private Chart chart1;
+ private ListBox listBox1;
}
}
\ No newline at end of file
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 6166c35..a6a7320 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -314,6 +314,13 @@
this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemXT4_2 = 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.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar3 = new DevComponents.DotNetBar.RibbonBar();
this.btn_user_info = new DevComponents.DotNetBar.ButtonItem();
@@ -350,13 +357,6 @@
this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
- this.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();
@@ -552,12 +552,12 @@
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
+ this.ribbonPanel1.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
- this.ribbonPanel1.SuspendLayout();
this.ribbonPanel7.SuspendLayout();
this.ribbonPanel3.SuspendLayout();
this.panelOfTable.SuspendLayout();
@@ -2123,13 +2123,13 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
this.ribbonControl1.Controls.Add(this.ribbonPanel1);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
this.ribbonControl1.Controls.Add(this.ribbonPanel12);
this.ribbonControl1.Controls.Add(this.ribbonPanel4);
- this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel7);
this.ribbonControl1.Controls.Add(this.ribbonPanel3);
this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top;
@@ -2200,6 +2200,7 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
+ this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -2650,6 +2651,123 @@
this.buttonItemXT4_2.Text = "人员修改";
this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click);
//
+ // ribbonPanel1
+ //
+ this.ribbonPanel1.AutoSize = true;
+ this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
+ this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel1.Controls.Add(this.ribbonBar21);
+ this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel1.Name = "ribbonPanel1";
+ this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel1.Style.Class = "";
+ this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseDown.Class = "";
+ this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel1.StyleMouseOver.Class = "";
+ this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel1.TabIndex = 1;
+ this.ribbonPanel1.Visible = false;
+ //
+ // ribbonBar21
+ //
+ this.ribbonBar21.AutoOverflowEnabled = true;
+ this.ribbonBar21.BackColor = System.Drawing.Color.White;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.BackgroundStyle.Class = "";
+ this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.ContainerControlProcessDialogKey = true;
+ this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.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.ribbonBar21.TitleStyle.Class = "";
+ this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar21.TitleStyleMouseOver.Class = "";
+ this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar21.TitleVisible = false;
+ this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
+ //
+ // buttonItem1
+ //
+ 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);
+ //
// ribbonPanel2
//
this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3147,7 +3265,6 @@
this.ribbonPanel6.StyleMouseOver.Class = "";
this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel6.TabIndex = 38;
- this.ribbonPanel6.Visible = false;
//
// ribbonBar6
//
@@ -3233,123 +3350,6 @@
this.buttonItemGBJC.Text = "国标检测";
this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
//
- // ribbonPanel1
- //
- this.ribbonPanel1.AutoSize = true;
- this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray;
- this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel1.Controls.Add(this.ribbonBar21);
- this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel1.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel1.Name = "ribbonPanel1";
- this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel1.Style.Class = "";
- this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseDown.Class = "";
- this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel1.StyleMouseOver.Class = "";
- this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel1.TabIndex = 1;
- this.ribbonPanel1.Visible = false;
- //
- // ribbonBar21
- //
- this.ribbonBar21.AutoOverflowEnabled = true;
- this.ribbonBar21.BackColor = System.Drawing.Color.White;
- //
- //
- //
- this.ribbonBar21.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.BackgroundStyle.Class = "";
- this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.ContainerControlProcessDialogKey = true;
- this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.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.ribbonBar21.TitleStyle.Class = "";
- this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar21.TitleStyleMouseOver.Class = "";
- this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar21.TitleVisible = false;
- this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick);
- //
- // buttonItem1
- //
- 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);
- //
// ribbonPanel7
//
this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -3585,6 +3585,7 @@
// ribbonTabItem9
//
this.ribbonTabItem9.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+ this.ribbonTabItem9.Checked = true;
this.ribbonTabItem9.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.HoverImage")));
this.ribbonTabItem9.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem9.Image")));
this.ribbonTabItem9.Name = "ribbonTabItem9";
@@ -3605,7 +3606,6 @@
// ribbonTabItem14
//
this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem14.Checked = true;
this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage")));
this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image")));
this.ribbonTabItem14.Name = "ribbonTabItem14";
@@ -4555,7 +4555,7 @@
this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(45931, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(46525, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -4665,7 +4665,7 @@
this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(45930, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(46524, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -6002,12 +6002,12 @@
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
this.ribbonPanel15.ResumeLayout(false);
+ this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
- this.ribbonPanel1.ResumeLayout(false);
this.ribbonPanel7.ResumeLayout(false);
this.ribbonPanel3.ResumeLayout(false);
this.panelOfTable.ResumeLayout(false);
diff --git a/MainFrm.resx b/MainFrm.resx
index 8e80d52..ea7021a 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -351,6 +351,142 @@
766, 54
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
+ NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
+ NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6
+ iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z
+ zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s
+ hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa
+ BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n
+ WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ
+ BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY
+ s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn
+ ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg
+ 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef
+ rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q
+ qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK
+ Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6
+ RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO
+ RK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE
+ NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE
+ NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM
+ 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t
+ lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl
+ DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q
+ rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th
+ pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S
+ T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt
+ SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/
+ oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND
+ MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND
+ MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD
+ QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4
+ l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg
+ S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj
+ CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X
+ 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF
+ 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu
+ F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee
+ SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4
+ 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY
+ VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3
+ 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53
+ edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA
+ S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw
+ p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if
+ SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES
+ 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U
+ IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL
+ 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze
+ r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq
+ nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5
+ Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5
+ Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE
+ NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R
+ Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33
+ nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA
+ AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8
+ OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy
+ BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F
+ mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd
+ v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul
+ AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj
+ dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg
+ 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2
+ OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC
+
+
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -2387,142 +2523,6 @@
++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
- NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2
- NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6
- iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z
- zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s
- hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa
- BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n
- WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ
- BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY
- s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn
- ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg
- 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef
- rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q
- qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK
- Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6
- RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO
- RK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE
- NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE
- NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM
- 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t
- lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl
- DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q
- rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th
- pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S
- T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt
- SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/
- oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND
- MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND
- MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD
- QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4
- l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg
- S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj
- CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X
- 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF
- 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu
- F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee
- SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4
- 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY
- VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3
- 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53
- edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA
- S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw
- p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if
- SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES
- 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U
- IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL
- 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze
- r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq
- nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5
- Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5
- Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE
- NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R
- Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33
- nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA
- AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8
- OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy
- BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F
- mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd
- v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul
- AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj
- dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg
- 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2
- OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC
-
-
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index ff9cf31..e5ecc62 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ