diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index dcd25b8..d0659d7 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5945,21 +5945,21 @@
shlayername = frmSh.rukuLayer.Name;
globeControl1.Refresh();
}
- #region wxl 下面unreachable
- if (frmShResult != null && !frmShResult.IsDisposed)
- {
- try
- {
- clearFeatureHighLight();
- ClearRedlineAnalyseResult();
- frmShResult.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- #endregion wxl
+ //#region wxl 下面unreachable
+ //if (frmShResult != null && !frmShResult.IsDisposed)
+ //{
+ // try
+ // {
+ // clearFeatureHighLight();
+ // ClearRedlineAnalyseResult();
+ // frmShResult.Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show(ex.Message);
+ // }
+ //}
+ //#endregion wxl
frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
Utility.m_PipelineLayerNames);
@@ -6145,31 +6145,28 @@
if (e.Button == MouseButtons.Left)
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex > -1)
+ if (hittestinfo.RowIndex < 0) return;
+ string featureName = "";
+ if (dataGridViewX1.Columns.Contains("编号"))
{
- string featureName = "";
- if (dataGridViewX1.Columns.Contains("编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
- }
- else if (dataGridViewX1.Columns.Contains("标识器编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
- }
- featureName = featureName.Trim();
-
- GSOLayer layer = null;
- layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
-
- if (layer == null) return;
-
- GSOFeatures features = layer.GetFeatureByName(featureName, false);
- if (features.Length == 0) return;
- GSOFeature rowFeature = features[0];
-
- ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
-
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
}
+ else if (dataGridViewX1.Columns.Contains("标识器编号"))
+ {
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
+ }
+ featureName = featureName.Trim();
+
+ GSOLayer layer = null;
+ layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
+
+ if (layer == null) return;
+
+ GSOFeatures features = layer.GetFeatureByName(featureName, false);
+ if (features.Length == 0) return;
+ GSOFeature rowFeature = features[0];
+
+ ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
}
}
else
@@ -6190,17 +6187,14 @@
try
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex >= 0)
- {
- string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
- string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
- FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
- panelOfTable, dataGridViewX1, layer, hxName);
- frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
- frm.Show(this);
-
- from = frm;
- }
+ if (hittestinfo.RowIndex < 0) return;
+ string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
+ string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
+ FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
+ panelOfTable, dataGridViewX1, layer, hxName);
+ frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
+ frm.Show(this);
+ from = frm;
}
catch (Exception ex)
{
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index dcd25b8..d0659d7 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5945,21 +5945,21 @@
shlayername = frmSh.rukuLayer.Name;
globeControl1.Refresh();
}
- #region wxl 下面unreachable
- if (frmShResult != null && !frmShResult.IsDisposed)
- {
- try
- {
- clearFeatureHighLight();
- ClearRedlineAnalyseResult();
- frmShResult.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- #endregion wxl
+ //#region wxl 下面unreachable
+ //if (frmShResult != null && !frmShResult.IsDisposed)
+ //{
+ // try
+ // {
+ // clearFeatureHighLight();
+ // ClearRedlineAnalyseResult();
+ // frmShResult.Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show(ex.Message);
+ // }
+ //}
+ //#endregion wxl
frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
Utility.m_PipelineLayerNames);
@@ -6145,31 +6145,28 @@
if (e.Button == MouseButtons.Left)
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex > -1)
+ if (hittestinfo.RowIndex < 0) return;
+ string featureName = "";
+ if (dataGridViewX1.Columns.Contains("编号"))
{
- string featureName = "";
- if (dataGridViewX1.Columns.Contains("编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
- }
- else if (dataGridViewX1.Columns.Contains("标识器编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
- }
- featureName = featureName.Trim();
-
- GSOLayer layer = null;
- layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
-
- if (layer == null) return;
-
- GSOFeatures features = layer.GetFeatureByName(featureName, false);
- if (features.Length == 0) return;
- GSOFeature rowFeature = features[0];
-
- ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
-
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
}
+ else if (dataGridViewX1.Columns.Contains("标识器编号"))
+ {
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
+ }
+ featureName = featureName.Trim();
+
+ GSOLayer layer = null;
+ layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
+
+ if (layer == null) return;
+
+ GSOFeatures features = layer.GetFeatureByName(featureName, false);
+ if (features.Length == 0) return;
+ GSOFeature rowFeature = features[0];
+
+ ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
}
}
else
@@ -6190,17 +6187,14 @@
try
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex >= 0)
- {
- string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
- string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
- FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
- panelOfTable, dataGridViewX1, layer, hxName);
- frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
- frm.Show(this);
-
- from = frm;
- }
+ if (hittestinfo.RowIndex < 0) return;
+ string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
+ string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
+ FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
+ panelOfTable, dataGridViewX1, layer, hxName);
+ frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
+ frm.Show(this);
+ from = frm;
}
catch (Exception ex)
{
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 2e6d4e4..bf46eb5 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,9 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+ this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -421,9 +424,6 @@
this.btn_user_role = new DevComponents.DotNetBar.ButtonItem();
this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
- this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
@@ -652,9 +652,9 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel4.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
- this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
@@ -2283,8 +2283,8 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2331,6 +2331,76 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel4
+ //
+ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+ this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel4.Name = "ribbonPanel4";
+ this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel4.Style.Class = "";
+ this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseDown.Class = "";
+ this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseOver.Class = "";
+ this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel4.TabIndex = 36;
+ this.ribbonPanel4.Visible = false;
+ //
+ // ribbonBar1
+ //
+ this.ribbonBar1.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundStyle.Class = "";
+ this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.ContainerControlProcessDialogKey = true;
+ this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.btn_document_info});
+ this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar1.Name = "ribbonBar1";
+ this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+ this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar1.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyle.Class = "";
+ this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyleMouseOver.Class = "";
+ this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.TitleVisible = false;
+ //
+ // btn_document_info
+ //
+ this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+ this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.btn_document_info.Name = "btn_document_info";
+ this.btn_document_info.SubItemsExpandWidth = 14;
+ this.btn_document_info.Text = "文档管理";
+ this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2356,7 +2426,6 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
- this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -3828,75 +3897,6 @@
this.buttonItemPasswordReset.Text = "重置密码";
this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click);
//
- // ribbonPanel4
- //
- this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel4.Controls.Add(this.ribbonBar1);
- this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel4.Name = "ribbonPanel4";
- this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel4.Style.Class = "";
- this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseDown.Class = "";
- this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseOver.Class = "";
- this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel4.TabIndex = 36;
- //
- // ribbonBar1
- //
- this.ribbonBar1.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.BackgroundStyle.Class = "";
- this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.ContainerControlProcessDialogKey = true;
- this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.btn_document_info});
- this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar1.Name = "ribbonBar1";
- this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
- this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar1.TabIndex = 0;
- //
- //
- //
- this.ribbonBar1.TitleStyle.Class = "";
- this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.TitleStyleMouseOver.Class = "";
- this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.TitleVisible = false;
- //
- // btn_document_info
- //
- this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
- this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.btn_document_info.Name = "btn_document_info";
- this.btn_document_info.SubItemsExpandWidth = 14;
- this.btn_document_info.Text = "文档管理";
- this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
- //
// ribbonPanel6
//
this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4475,7 +4475,6 @@
// ribbonTabItem4
//
this.ribbonTabItem4.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem4.Checked = true;
this.ribbonTabItem4.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.HoverImage")));
this.ribbonTabItem4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.Image")));
this.ribbonTabItem4.Name = "ribbonTabItem4";
@@ -4486,6 +4485,7 @@
// 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";
@@ -5480,7 +5480,7 @@
this.dataGridViewX2.ReadOnly = true;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(22171, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(22468, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
this.dataGridViewX3.ReadOnly = true;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(22170, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(22467, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5832,7 +5832,7 @@
this.dataGridViewX8.ReadOnly = true;
this.dataGridViewX8.RowHeadersVisible = false;
this.dataGridViewX8.RowTemplate.Height = 23;
- this.dataGridViewX8.Size = new System.Drawing.Size(23, 92);
+ this.dataGridViewX8.Size = new System.Drawing.Size(6, 92);
this.dataGridViewX8.TabIndex = 11;
//
// dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
this.dataGridViewX9.ReadOnly = true;
this.dataGridViewX9.RowHeadersVisible = false;
this.dataGridViewX9.RowTemplate.Height = 23;
- this.dataGridViewX9.Size = new System.Drawing.Size(22, 127);
+ this.dataGridViewX9.Size = new System.Drawing.Size(5, 127);
this.dataGridViewX9.TabIndex = 5;
this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
//
@@ -6791,9 +6791,9 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
- this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index dcd25b8..d0659d7 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5945,21 +5945,21 @@
shlayername = frmSh.rukuLayer.Name;
globeControl1.Refresh();
}
- #region wxl 下面unreachable
- if (frmShResult != null && !frmShResult.IsDisposed)
- {
- try
- {
- clearFeatureHighLight();
- ClearRedlineAnalyseResult();
- frmShResult.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- #endregion wxl
+ //#region wxl 下面unreachable
+ //if (frmShResult != null && !frmShResult.IsDisposed)
+ //{
+ // try
+ // {
+ // clearFeatureHighLight();
+ // ClearRedlineAnalyseResult();
+ // frmShResult.Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show(ex.Message);
+ // }
+ //}
+ //#endregion wxl
frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
Utility.m_PipelineLayerNames);
@@ -6145,31 +6145,28 @@
if (e.Button == MouseButtons.Left)
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex > -1)
+ if (hittestinfo.RowIndex < 0) return;
+ string featureName = "";
+ if (dataGridViewX1.Columns.Contains("编号"))
{
- string featureName = "";
- if (dataGridViewX1.Columns.Contains("编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
- }
- else if (dataGridViewX1.Columns.Contains("标识器编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
- }
- featureName = featureName.Trim();
-
- GSOLayer layer = null;
- layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
-
- if (layer == null) return;
-
- GSOFeatures features = layer.GetFeatureByName(featureName, false);
- if (features.Length == 0) return;
- GSOFeature rowFeature = features[0];
-
- ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
-
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
}
+ else if (dataGridViewX1.Columns.Contains("标识器编号"))
+ {
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
+ }
+ featureName = featureName.Trim();
+
+ GSOLayer layer = null;
+ layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
+
+ if (layer == null) return;
+
+ GSOFeatures features = layer.GetFeatureByName(featureName, false);
+ if (features.Length == 0) return;
+ GSOFeature rowFeature = features[0];
+
+ ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
}
}
else
@@ -6190,17 +6187,14 @@
try
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex >= 0)
- {
- string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
- string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
- FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
- panelOfTable, dataGridViewX1, layer, hxName);
- frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
- frm.Show(this);
-
- from = frm;
- }
+ if (hittestinfo.RowIndex < 0) return;
+ string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
+ string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
+ FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
+ panelOfTable, dataGridViewX1, layer, hxName);
+ frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
+ frm.Show(this);
+ from = frm;
}
catch (Exception ex)
{
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 2e6d4e4..bf46eb5 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,9 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+ this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -421,9 +424,6 @@
this.btn_user_role = new DevComponents.DotNetBar.ButtonItem();
this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
- this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
@@ -652,9 +652,9 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel4.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
- this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
@@ -2283,8 +2283,8 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2331,6 +2331,76 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel4
+ //
+ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+ this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel4.Name = "ribbonPanel4";
+ this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel4.Style.Class = "";
+ this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseDown.Class = "";
+ this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseOver.Class = "";
+ this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel4.TabIndex = 36;
+ this.ribbonPanel4.Visible = false;
+ //
+ // ribbonBar1
+ //
+ this.ribbonBar1.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundStyle.Class = "";
+ this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.ContainerControlProcessDialogKey = true;
+ this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.btn_document_info});
+ this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar1.Name = "ribbonBar1";
+ this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+ this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar1.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyle.Class = "";
+ this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyleMouseOver.Class = "";
+ this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.TitleVisible = false;
+ //
+ // btn_document_info
+ //
+ this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+ this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.btn_document_info.Name = "btn_document_info";
+ this.btn_document_info.SubItemsExpandWidth = 14;
+ this.btn_document_info.Text = "文档管理";
+ this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2356,7 +2426,6 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
- this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -3828,75 +3897,6 @@
this.buttonItemPasswordReset.Text = "重置密码";
this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click);
//
- // ribbonPanel4
- //
- this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel4.Controls.Add(this.ribbonBar1);
- this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel4.Name = "ribbonPanel4";
- this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel4.Style.Class = "";
- this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseDown.Class = "";
- this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseOver.Class = "";
- this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel4.TabIndex = 36;
- //
- // ribbonBar1
- //
- this.ribbonBar1.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.BackgroundStyle.Class = "";
- this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.ContainerControlProcessDialogKey = true;
- this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.btn_document_info});
- this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar1.Name = "ribbonBar1";
- this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
- this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar1.TabIndex = 0;
- //
- //
- //
- this.ribbonBar1.TitleStyle.Class = "";
- this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.TitleStyleMouseOver.Class = "";
- this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.TitleVisible = false;
- //
- // btn_document_info
- //
- this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
- this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.btn_document_info.Name = "btn_document_info";
- this.btn_document_info.SubItemsExpandWidth = 14;
- this.btn_document_info.Text = "文档管理";
- this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
- //
// ribbonPanel6
//
this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4475,7 +4475,6 @@
// ribbonTabItem4
//
this.ribbonTabItem4.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem4.Checked = true;
this.ribbonTabItem4.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.HoverImage")));
this.ribbonTabItem4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.Image")));
this.ribbonTabItem4.Name = "ribbonTabItem4";
@@ -4486,6 +4485,7 @@
// 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";
@@ -5480,7 +5480,7 @@
this.dataGridViewX2.ReadOnly = true;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(22171, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(22468, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
this.dataGridViewX3.ReadOnly = true;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(22170, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(22467, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5832,7 +5832,7 @@
this.dataGridViewX8.ReadOnly = true;
this.dataGridViewX8.RowHeadersVisible = false;
this.dataGridViewX8.RowTemplate.Height = 23;
- this.dataGridViewX8.Size = new System.Drawing.Size(23, 92);
+ this.dataGridViewX8.Size = new System.Drawing.Size(6, 92);
this.dataGridViewX8.TabIndex = 11;
//
// dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
this.dataGridViewX9.ReadOnly = true;
this.dataGridViewX9.RowHeadersVisible = false;
this.dataGridViewX9.RowTemplate.Height = 23;
- this.dataGridViewX9.Size = new System.Drawing.Size(22, 127);
+ this.dataGridViewX9.Size = new System.Drawing.Size(5, 127);
this.dataGridViewX9.TabIndex = 5;
this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
//
@@ -6791,9 +6791,9 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
- this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
diff --git a/MainFrm.resx b/MainFrm.resx
index c5f0bc5..b3f6584 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -351,40 +351,6 @@
766, 54
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
- NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
- cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
- p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
- frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
- BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
- Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
- eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
- x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
- mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
- FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
- 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
- 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
- DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
- ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
-
-
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -4039,6 +4005,40 @@
++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
+ NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
+ cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
+ p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
+ frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
+ BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
+ Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
+ eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
+ x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
+ mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
+ FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
+ 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
+ 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
+ DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
+ ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index dcd25b8..d0659d7 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5945,21 +5945,21 @@
shlayername = frmSh.rukuLayer.Name;
globeControl1.Refresh();
}
- #region wxl 下面unreachable
- if (frmShResult != null && !frmShResult.IsDisposed)
- {
- try
- {
- clearFeatureHighLight();
- ClearRedlineAnalyseResult();
- frmShResult.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- #endregion wxl
+ //#region wxl 下面unreachable
+ //if (frmShResult != null && !frmShResult.IsDisposed)
+ //{
+ // try
+ // {
+ // clearFeatureHighLight();
+ // ClearRedlineAnalyseResult();
+ // frmShResult.Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show(ex.Message);
+ // }
+ //}
+ //#endregion wxl
frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
Utility.m_PipelineLayerNames);
@@ -6145,31 +6145,28 @@
if (e.Button == MouseButtons.Left)
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex > -1)
+ if (hittestinfo.RowIndex < 0) return;
+ string featureName = "";
+ if (dataGridViewX1.Columns.Contains("编号"))
{
- string featureName = "";
- if (dataGridViewX1.Columns.Contains("编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
- }
- else if (dataGridViewX1.Columns.Contains("标识器编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
- }
- featureName = featureName.Trim();
-
- GSOLayer layer = null;
- layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
-
- if (layer == null) return;
-
- GSOFeatures features = layer.GetFeatureByName(featureName, false);
- if (features.Length == 0) return;
- GSOFeature rowFeature = features[0];
-
- ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
-
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
}
+ else if (dataGridViewX1.Columns.Contains("标识器编号"))
+ {
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
+ }
+ featureName = featureName.Trim();
+
+ GSOLayer layer = null;
+ layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
+
+ if (layer == null) return;
+
+ GSOFeatures features = layer.GetFeatureByName(featureName, false);
+ if (features.Length == 0) return;
+ GSOFeature rowFeature = features[0];
+
+ ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
}
}
else
@@ -6190,17 +6187,14 @@
try
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex >= 0)
- {
- string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
- string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
- FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
- panelOfTable, dataGridViewX1, layer, hxName);
- frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
- frm.Show(this);
-
- from = frm;
- }
+ if (hittestinfo.RowIndex < 0) return;
+ string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
+ string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
+ FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
+ panelOfTable, dataGridViewX1, layer, hxName);
+ frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
+ frm.Show(this);
+ from = frm;
}
catch (Exception ex)
{
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 2e6d4e4..bf46eb5 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,9 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+ this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -421,9 +424,6 @@
this.btn_user_role = new DevComponents.DotNetBar.ButtonItem();
this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
- this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
@@ -652,9 +652,9 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel4.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
- this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
@@ -2283,8 +2283,8 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2331,6 +2331,76 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel4
+ //
+ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+ this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel4.Name = "ribbonPanel4";
+ this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel4.Style.Class = "";
+ this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseDown.Class = "";
+ this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseOver.Class = "";
+ this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel4.TabIndex = 36;
+ this.ribbonPanel4.Visible = false;
+ //
+ // ribbonBar1
+ //
+ this.ribbonBar1.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundStyle.Class = "";
+ this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.ContainerControlProcessDialogKey = true;
+ this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.btn_document_info});
+ this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar1.Name = "ribbonBar1";
+ this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+ this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar1.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyle.Class = "";
+ this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyleMouseOver.Class = "";
+ this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.TitleVisible = false;
+ //
+ // btn_document_info
+ //
+ this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+ this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.btn_document_info.Name = "btn_document_info";
+ this.btn_document_info.SubItemsExpandWidth = 14;
+ this.btn_document_info.Text = "文档管理";
+ this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2356,7 +2426,6 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
- this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -3828,75 +3897,6 @@
this.buttonItemPasswordReset.Text = "重置密码";
this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click);
//
- // ribbonPanel4
- //
- this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel4.Controls.Add(this.ribbonBar1);
- this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel4.Name = "ribbonPanel4";
- this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel4.Style.Class = "";
- this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseDown.Class = "";
- this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseOver.Class = "";
- this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel4.TabIndex = 36;
- //
- // ribbonBar1
- //
- this.ribbonBar1.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.BackgroundStyle.Class = "";
- this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.ContainerControlProcessDialogKey = true;
- this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.btn_document_info});
- this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar1.Name = "ribbonBar1";
- this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
- this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar1.TabIndex = 0;
- //
- //
- //
- this.ribbonBar1.TitleStyle.Class = "";
- this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.TitleStyleMouseOver.Class = "";
- this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.TitleVisible = false;
- //
- // btn_document_info
- //
- this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
- this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.btn_document_info.Name = "btn_document_info";
- this.btn_document_info.SubItemsExpandWidth = 14;
- this.btn_document_info.Text = "文档管理";
- this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
- //
// ribbonPanel6
//
this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4475,7 +4475,6 @@
// ribbonTabItem4
//
this.ribbonTabItem4.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem4.Checked = true;
this.ribbonTabItem4.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.HoverImage")));
this.ribbonTabItem4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.Image")));
this.ribbonTabItem4.Name = "ribbonTabItem4";
@@ -4486,6 +4485,7 @@
// 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";
@@ -5480,7 +5480,7 @@
this.dataGridViewX2.ReadOnly = true;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(22171, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(22468, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
this.dataGridViewX3.ReadOnly = true;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(22170, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(22467, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5832,7 +5832,7 @@
this.dataGridViewX8.ReadOnly = true;
this.dataGridViewX8.RowHeadersVisible = false;
this.dataGridViewX8.RowTemplate.Height = 23;
- this.dataGridViewX8.Size = new System.Drawing.Size(23, 92);
+ this.dataGridViewX8.Size = new System.Drawing.Size(6, 92);
this.dataGridViewX8.TabIndex = 11;
//
// dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
this.dataGridViewX9.ReadOnly = true;
this.dataGridViewX9.RowHeadersVisible = false;
this.dataGridViewX9.RowTemplate.Height = 23;
- this.dataGridViewX9.Size = new System.Drawing.Size(22, 127);
+ this.dataGridViewX9.Size = new System.Drawing.Size(5, 127);
this.dataGridViewX9.TabIndex = 5;
this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
//
@@ -6791,9 +6791,9 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
- this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
diff --git a/MainFrm.resx b/MainFrm.resx
index c5f0bc5..b3f6584 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -351,40 +351,6 @@
766, 54
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
- NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
- cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
- p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
- frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
- BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
- Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
- eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
- x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
- mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
- FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
- 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
- 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
- DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
- ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
-
-
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -4039,6 +4005,40 @@
++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
+ NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
+ cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
+ p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
+ frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
+ BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
+ Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
+ eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
+ x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
+ mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
+ FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
+ 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
+ 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
+ DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
+ ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index d5955a6..82bcd70 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 793e476..2538edf 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index dcd25b8..d0659d7 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5945,21 +5945,21 @@
shlayername = frmSh.rukuLayer.Name;
globeControl1.Refresh();
}
- #region wxl 下面unreachable
- if (frmShResult != null && !frmShResult.IsDisposed)
- {
- try
- {
- clearFeatureHighLight();
- ClearRedlineAnalyseResult();
- frmShResult.Close();
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- #endregion wxl
+ //#region wxl 下面unreachable
+ //if (frmShResult != null && !frmShResult.IsDisposed)
+ //{
+ // try
+ // {
+ // clearFeatureHighLight();
+ // ClearRedlineAnalyseResult();
+ // frmShResult.Close();
+ // }
+ // catch (Exception ex)
+ // {
+ // MessageBox.Show(ex.Message);
+ // }
+ //}
+ //#endregion wxl
frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
Utility.m_PipelineLayerNames);
@@ -6145,31 +6145,28 @@
if (e.Button == MouseButtons.Left)
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex > -1)
+ if (hittestinfo.RowIndex < 0) return;
+ string featureName = "";
+ if (dataGridViewX1.Columns.Contains("编号"))
{
- string featureName = "";
- if (dataGridViewX1.Columns.Contains("编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
- }
- else if (dataGridViewX1.Columns.Contains("标识器编号"))
- {
- featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
- }
- featureName = featureName.Trim();
-
- GSOLayer layer = null;
- layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
-
- if (layer == null) return;
-
- GSOFeatures features = layer.GetFeatureByName(featureName, false);
- if (features.Length == 0) return;
- GSOFeature rowFeature = features[0];
-
- ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
-
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["编号"].Value.ToString();
}
+ else if (dataGridViewX1.Columns.Contains("标识器编号"))
+ {
+ featureName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["标识器编号"].Value.ToString();
+ }
+ featureName = featureName.Trim();
+
+ GSOLayer layer = null;
+ layer = globeControl1.Globe.Layers.GetLayerByCaption(dataGridViewX1.Tag.ToString());
+
+ if (layer == null) return;
+
+ GSOFeatures features = layer.GetFeatureByName(featureName, false);
+ if (features.Length == 0) return;
+ GSOFeature rowFeature = features[0];
+
+ ClassSearchAnalysis.AddMakerToLineFeature(globeControl1, rowFeature);
}
}
else
@@ -6190,17 +6187,14 @@
try
{
DataGridView.HitTestInfo hittestinfo = dataGridViewX1.HitTest(e.X, e.Y);
- if (hittestinfo.RowIndex >= 0)
- {
- string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
- string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
- FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
- panelOfTable, dataGridViewX1, layer, hxName);
- frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
- frm.Show(this);
-
- from = frm;
- }
+ if (hittestinfo.RowIndex < 0) return;
+ string layer = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["管线类型"].Value.ToString();
+ string hxName = dataGridViewX1.Rows[hittestinfo.RowIndex].Cells["红线编号"].Value.ToString();
+ FrmAnalysisGuiHuaResult frm = new FrmAnalysisGuiHuaResult(globeControl1, lineStruct, featsList,
+ panelOfTable, dataGridViewX1, layer, hxName);
+ frm.Location = new Point(Width - frm.Width - 10, Height - frm.Height - 20);
+ frm.Show(this);
+ from = frm;
}
catch (Exception ex)
{
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index 2e6d4e4..bf46eb5 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,9 @@
this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+ this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+ this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem();
@@ -421,9 +424,6 @@
this.btn_user_role = new DevComponents.DotNetBar.ButtonItem();
this.btn_password_edit = new DevComponents.DotNetBar.ButtonItem();
this.buttonItemPasswordReset = new DevComponents.DotNetBar.ButtonItem();
- this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
- this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
- this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
@@ -652,9 +652,9 @@
this.contextMenuStrip3.SuspendLayout();
this.contextMenuStripDeleteLayerNode.SuspendLayout();
this.ribbonControl1.SuspendLayout();
+ this.ribbonPanel4.SuspendLayout();
this.ribbonPanel15.SuspendLayout();
this.ribbonPanel2.SuspendLayout();
- this.ribbonPanel4.SuspendLayout();
this.ribbonPanel6.SuspendLayout();
this.ribbonPanel5.SuspendLayout();
this.ribbonPanel12.SuspendLayout();
@@ -2283,8 +2283,8 @@
//
this.ribbonControl1.BackgroundStyle.Class = "";
this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel15);
+ this.ribbonControl1.Controls.Add(this.ribbonPanel4);
this.ribbonControl1.Controls.Add(this.ribbonPanel2);
this.ribbonControl1.Controls.Add(this.ribbonPanel6);
this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2331,6 +2331,76 @@
this.ribbonControl1.Text = "ribbonControl1";
this.ribbonControl1.UseCustomizeDialog = false;
//
+ // ribbonPanel4
+ //
+ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+ this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+ this.ribbonPanel4.Name = "ribbonPanel4";
+ this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+ this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+ //
+ //
+ //
+ this.ribbonPanel4.Style.Class = "";
+ this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseDown.Class = "";
+ this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonPanel4.StyleMouseOver.Class = "";
+ this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonPanel4.TabIndex = 36;
+ this.ribbonPanel4.Visible = false;
+ //
+ // ribbonBar1
+ //
+ this.ribbonBar1.AutoOverflowEnabled = true;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+ this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.BackgroundStyle.Class = "";
+ this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.ContainerControlProcessDialogKey = true;
+ this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+ this.btn_document_info});
+ this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+ this.ribbonBar1.Name = "ribbonBar1";
+ this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+ this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.ribbonBar1.TabIndex = 0;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyle.Class = "";
+ this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ //
+ //
+ //
+ this.ribbonBar1.TitleStyleMouseOver.Class = "";
+ this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+ this.ribbonBar1.TitleVisible = false;
+ //
+ // btn_document_info
+ //
+ this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+ this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+ this.btn_document_info.Name = "btn_document_info";
+ this.btn_document_info.SubItemsExpandWidth = 14;
+ this.btn_document_info.Text = "文档管理";
+ this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+ //
// ribbonPanel15
//
this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2356,7 +2426,6 @@
this.ribbonPanel15.StyleMouseOver.Class = "";
this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
this.ribbonPanel15.TabIndex = 35;
- this.ribbonPanel15.Visible = false;
//
// ribbonBar20
//
@@ -3828,75 +3897,6 @@
this.buttonItemPasswordReset.Text = "重置密码";
this.buttonItemPasswordReset.Click += new System.EventHandler(this.buttonItemPasswordReset_Click);
//
- // ribbonPanel4
- //
- this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonPanel4.Controls.Add(this.ribbonBar1);
- this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
- this.ribbonPanel4.Name = "ribbonPanel4";
- this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
- this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
- //
- //
- //
- this.ribbonPanel4.Style.Class = "";
- this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseDown.Class = "";
- this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonPanel4.StyleMouseOver.Class = "";
- this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonPanel4.TabIndex = 36;
- //
- // ribbonBar1
- //
- this.ribbonBar1.AutoOverflowEnabled = true;
- //
- //
- //
- this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
- this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.BackgroundStyle.Class = "";
- this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.ContainerControlProcessDialogKey = true;
- this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
- this.btn_document_info});
- this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
- this.ribbonBar1.Name = "ribbonBar1";
- this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
- this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.ribbonBar1.TabIndex = 0;
- //
- //
- //
- this.ribbonBar1.TitleStyle.Class = "";
- this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- //
- //
- //
- this.ribbonBar1.TitleStyleMouseOver.Class = "";
- this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
- this.ribbonBar1.TitleVisible = false;
- //
- // btn_document_info
- //
- this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
- this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
- this.btn_document_info.Name = "btn_document_info";
- this.btn_document_info.SubItemsExpandWidth = 14;
- this.btn_document_info.Text = "文档管理";
- this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
- //
// ribbonPanel6
//
this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4475,7 +4475,6 @@
// ribbonTabItem4
//
this.ribbonTabItem4.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
- this.ribbonTabItem4.Checked = true;
this.ribbonTabItem4.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.HoverImage")));
this.ribbonTabItem4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem4.Image")));
this.ribbonTabItem4.Name = "ribbonTabItem4";
@@ -4486,6 +4485,7 @@
// 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";
@@ -5480,7 +5480,7 @@
this.dataGridViewX2.ReadOnly = true;
this.dataGridViewX2.RowHeadersVisible = false;
this.dataGridViewX2.RowTemplate.Height = 23;
- this.dataGridViewX2.Size = new System.Drawing.Size(22171, 92);
+ this.dataGridViewX2.Size = new System.Drawing.Size(22468, 92);
this.dataGridViewX2.TabIndex = 11;
//
// dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
this.dataGridViewX3.ReadOnly = true;
this.dataGridViewX3.RowHeadersVisible = false;
this.dataGridViewX3.RowTemplate.Height = 23;
- this.dataGridViewX3.Size = new System.Drawing.Size(22170, 127);
+ this.dataGridViewX3.Size = new System.Drawing.Size(22467, 127);
this.dataGridViewX3.TabIndex = 5;
this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
//
@@ -5832,7 +5832,7 @@
this.dataGridViewX8.ReadOnly = true;
this.dataGridViewX8.RowHeadersVisible = false;
this.dataGridViewX8.RowTemplate.Height = 23;
- this.dataGridViewX8.Size = new System.Drawing.Size(23, 92);
+ this.dataGridViewX8.Size = new System.Drawing.Size(6, 92);
this.dataGridViewX8.TabIndex = 11;
//
// dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
this.dataGridViewX9.ReadOnly = true;
this.dataGridViewX9.RowHeadersVisible = false;
this.dataGridViewX9.RowTemplate.Height = 23;
- this.dataGridViewX9.Size = new System.Drawing.Size(22, 127);
+ this.dataGridViewX9.Size = new System.Drawing.Size(5, 127);
this.dataGridViewX9.TabIndex = 5;
this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
//
@@ -6791,9 +6791,9 @@
this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
this.ribbonControl1.ResumeLayout(false);
this.ribbonControl1.PerformLayout();
+ this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel15.ResumeLayout(false);
this.ribbonPanel2.ResumeLayout(false);
- this.ribbonPanel4.ResumeLayout(false);
this.ribbonPanel6.ResumeLayout(false);
this.ribbonPanel5.ResumeLayout(false);
this.ribbonPanel12.ResumeLayout(false);
diff --git a/MainFrm.resx b/MainFrm.resx
index c5f0bc5..b3f6584 100644
--- a/MainFrm.resx
+++ b/MainFrm.resx
@@ -351,40 +351,6 @@
766, 54
-
-
- iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
- LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
- Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
- cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
- RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
- cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
- bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
- ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
- TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
- MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
- Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
- OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
- NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
- NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
- eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
- cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
- p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
- frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
- BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
- Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
- eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
- x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
- mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
- FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
- 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
- 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
- DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
- ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
-
-
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -4039,6 +4005,40 @@
++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl
+ LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi
+ Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv
+ cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE
+ RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8
+ cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv
+ bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw
+ ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w
+ TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC
+ MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw
+ Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N
+ OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE
+ NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC
+ NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/
+ eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo
+ cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1
+ p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D
+ frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua
+ BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO
+ Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O
+ eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e
+ x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa
+ mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM
+ FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF
+ 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH
+ 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn
+ DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH
+ ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII=
+
+
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index d5955a6..82bcd70 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb
index 2773591..509a524 100644
--- a/bin/x86/Debug/Cyberpipe.pdb
+++ b/bin/x86/Debug/Cyberpipe.pdb
Binary files differ