diff --git a/FormAnalysis/FrmAnalysis.cs b/FormAnalysis/FrmAnalysis.cs
index e01f805..f817f7c 100644
--- a/FormAnalysis/FrmAnalysis.cs
+++ b/FormAnalysis/FrmAnalysis.cs
@@ -57,7 +57,11 @@
MessageBox.Show("请选择要审核的管段!", "提示");
return;
}
-
+ DataTable dt = new DataTable();
+ dt.Columns.Add("审核图层");
+ dt.Columns.Add("审核编号");
+ dt.Columns.Add("问题图层");
+ dt.Columns.Add("问题编号");
for (int i = 0; i < dataGridViewX1.Rows.Count; i++)
{
GSOLayer layer =
@@ -67,9 +71,9 @@
layer.GetFeatureByName(dataGridViewX1.Rows[i].Cells[1].Value.ToString(), true);
GSOFeature selectFeature = features[0];
if (selectFeature == null) continue;
- CollisionAnalysis(selectFeature, Utility.m_PipelineLayerNames);
+ CollisionAnalysis(selectFeature, Utility.m_PipelineLayerNames, dt);
}
-
+ dataGridViewX2.DataSource = dt;
if (dataGridViewX2.Rows.Count == 0)
{
MessageBox.Show("没有发生碰撞的管线!", "提示");
@@ -84,7 +88,7 @@
///
///
///
- private void CollisionAnalysis(GSOFeature selectedFeature, List pipelineLayerNames)
+ private void CollisionAnalysis(GSOFeature selectedFeature, List pipelineLayerNames, DataTable dt)
{
List result = DoublePanelAnalysis.CollisionAnalysis(globeControl1, selectedFeature, pipelineLayerNames);
@@ -94,11 +98,7 @@
}
string caption = selectedFeature.Dataset.Caption;
- DataTable dt = new DataTable();
- dt.Columns.Add("审核图层");
- dt.Columns.Add("审核编号");
- dt.Columns.Add("问题图层");
- dt.Columns.Add("问题编号");
+
foreach (FeatureAnalysisInfo featureAnalysisInfo in result)
{
string feat2Caption = featureAnalysisInfo.feature.Dataset.Caption;
@@ -123,7 +123,7 @@
AnalysisDataInfo.m_FeaturesWithBianhao.Add(selectedFeature.Name + "-" + featureAnalysisInfo.feature.Name, dismarker.Position);//添加飞行位置记录
}
}
- dataGridViewX2.DataSource = dt;
+
}
private void dataGridViewX1_MouseDoubleClick(object sender, MouseEventArgs e)