diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 9fb7248..2c67d44 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 9fb7248..2c67d44 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 5822ae8..e269862 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2506,7 +2506,7 @@ if ((pipelineType == "给水") || (pipelineType == "天然气") || (pipelineType == "燃气")) { GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, "阀门"); - list.Add(fs); + if (fs != null) list.Add(fs); } } } @@ -2523,7 +2523,7 @@ for (int i = 0; i < m_PipelineLayerNames.Count; i++) { GSOFeatures fs = Intersects_Pipeline(polygon, m_PipelineLayerNames[i]); - list1.Add(fs); + if(fs!=null) list1.Add(fs); } FrmAllPipelineStatis frm1 = new FrmAllPipelineStatis(0, pipeLineDis, list1, dataGridViewX1, toolStripNumbers, toolStripFeatureLength, globeControl1, panelOfTable); @@ -2547,7 +2547,7 @@ f.HighLight = true; } } - list2.Add(fs); + if(fs!=null) list2.Add(fs); } } @@ -2578,7 +2578,7 @@ if ((accname.IndexOf("井") > 0) || (accname.IndexOf("孔") > 0) || (accname.IndexOf("篦") > 0)) { GSOFeatures fs = Intersect_PointLayerByType(polygon, pipelineType, dataset.Tables[0].Rows[j][0].ToString()); - listWell.Add(fs); + if (fs != null) listWell.Add(fs); } } } @@ -2650,7 +2650,7 @@ List listBSQ = new List(); GSOFeatures bsqFeatures = PolygonIntersectAnalysis(e.Polygon, "标识器"); - listBSQ.Add(bsqFeatures); + if(bsqFeatures != null) listBSQ.Add(bsqFeatures); FrmBSQDuoBianXingStatis bsqFrm = new FrmBSQDuoBianXingStatis(workWellLen, globeControl1, listBSQ); bsqFrm.Show(this); @@ -2666,7 +2666,7 @@ List listBSQ1 = new List(); GSOFeatures bsqFeatures1 = PolygonIntersectAnalysis(e.Polygon, "标识器"); - listBSQ1.Add(bsqFeatures1); + if(bsqFeatures1 != null) listBSQ1.Add(bsqFeatures1); FrmBSQDuoBianXingStreet frm2 = new FrmBSQDuoBianXingStreet(globeControl1, bsqFeatures1); frm2.Show(this);