only use one closestSegment method of qgsgeometry

mhugent · mhugent · commit b1957e6f8f3d · 2006-04-24T20:03:06.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5362 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -214,7 +214,7 @@ void QgsGeometry::setGeos(geos::Geometry* geos)
 
 }
 
-QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
+QgsPoint QgsGeometry::closestVertex(const QgsPoint& point, QgsGeometryVertexIndex& atVertex, double& sqrDist) const
 {
   if(mDirtyWkb)
     {
@@ -223,9 +223,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 
     if(mGeometry)
     {
+      int vertexnr;
+      int vertexcounter = 0;
 	int wkbType;
 	double actdist = std::numeric_limits<double>::max();
-
 	double x,y;
 	double *tempx,*tempy;
 	memcpy(&wkbType, (mGeometry+1), sizeof(int));
@@ -234,6 +235,8 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 	    case QGis::WKBPoint:
 		x = *((double *) (mGeometry + 5));
 		y = *((double *) (mGeometry + 5 + sizeof(double)));
+		sqrDist = point.sqrDist(x, y);
+		vertexnr = 0;
 		break;
 
 	    case QGis::WKBLineString:
@@ -251,6 +254,7 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 			x=*tempx;
 			y=*tempy;
 			actdist=point.sqrDist(*tempx,*tempy);
+			vertexnr = index;
 		    }
 		    ptr+=sizeof(double);
 		}
@@ -275,8 +279,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 			    x=*tempx;
 			    y=*tempy;
 			    actdist=point.sqrDist(*tempx,*tempy);
+			    vertexnr = vertexcounter;
 			}
 			ptr+=sizeof(double);
+			++vertexcounter;
 		    }
 		}
 	    }
@@ -296,6 +302,7 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 			    x=*tempx;
 			    y=*tempy;
 			    actdist=point.sqrDist(*tempx,*tempy);
+			    vertexnr = index;
 			}
 		    ptr+=(2*sizeof(double));
 		}
@@ -322,9 +329,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 			    x=*tempx;
 			    y=*tempy;
 			    actdist=point.sqrDist(*tempx,*tempy);
+			    vertexnr = vertexcounter;
 			}
 			ptr+=sizeof(double);
-			
+			++vertexcounter;
 		    }
 		}
 	    }
@@ -355,8 +363,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 			       x=*tempx;
 			       y=*tempy;
 			       actdist=point.sqrDist(*tempx,*tempy);
+			       vertexnr = vertexcounter;
 			   }
 			   ptr+=sizeof(double); 
+			   ++vertexcounter;
 			}
 		    }
 		}
@@ -366,6 +376,9 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const
 	    default:
 		break;
 	}
+	sqrDist = actdist;
+	atVertex.clear();
+	atVertex.push_back(vertexnr);
 	return QgsPoint(x,y);    
     }
     return QgsPoint(0,0);
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
@@ -83,9 +83,9 @@ class QgsGeometry {
     void setGeos(geos::Geometry* geos);
 
     /**
-       Returns the vertex closest to the given point
+       Returns the vertex closest to the given point (and also vertex index and squared distance)
     */
-    QgsPoint closestVertex(const QgsPoint& point) const;
+    QgsPoint closestVertex(const QgsPoint& point, QgsGeometryVertexIndex& atVertex, double& sqrDist) const;
 
     /** Insert a new vertex before the given vertex index,
      *  ring and item (first number is index 0)
diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -2813,7 +2813,8 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)
   double mindisty=point.y();
   QgsFeature* fet;
   QgsPoint vertexFeature;//the closest vertex of a feature
-  double minvertexdist;//the distance between 'point' and 'vertexFeature'
+  QgsGeometryVertexIndex vindex;
+  double minsquaredist;
 
   QgsRect selectrect(point.x()-tolerance,point.y()-tolerance,point.x()+tolerance,point.y()+tolerance);
   selectrect = inverseProjectRect(selectrect);
@@ -2825,18 +2826,17 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)
   {
     if(mChangedGeometries.find(fet->featureId()) != mChangedGeometries.end())//if geometry has been changed, use the new geometry
     {
-      vertexFeature = mChangedGeometries[fet->featureId()].closestVertex(point);
+      vertexFeature = mChangedGeometries[fet->featureId()].closestVertex(point, vindex, minsquaredist);
     }
     else
     {
-      vertexFeature=fet->geometry()->closestVertex(point);
+      vertexFeature=fet->geometry()->closestVertex(point, vindex, minsquaredist);
     }
-    minvertexdist=vertexFeature.sqrDist(point.x(),point.y());
-    if(minvertexdist<mindist)
+    if(minsquaredist<mindist)
     {
       mindistx=vertexFeature.x();
       mindisty=vertexFeature.y();
-      mindist=minvertexdist;
+      mindist=minsquaredist;
     }
   }
 
@@ -2845,31 +2845,29 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)
   {
     if(mChangedGeometries.find((*iter)->featureId()) != mChangedGeometries.end())//use the changed geometry
     {
-      vertexFeature = mChangedGeometries[(*iter)->featureId()].closestVertex(point);
+      vertexFeature = mChangedGeometries[(*iter)->featureId()].closestVertex(point, vindex, minsquaredist);
     }
     else
     {
-      vertexFeature=(*iter)->geometry()->closestVertex(point);
+      vertexFeature=(*iter)->geometry()->closestVertex(point, vindex, minsquaredist);
     }
-    minvertexdist=vertexFeature.sqrDist(point.x(),point.y());
-    if(minvertexdist<mindist)
+    if(minsquaredist<mindist)
     {
       mindistx=vertexFeature.x();
       mindisty=vertexFeature.y();
-      mindist=minvertexdist;
+      mindist=minsquaredist;
     }
   }
 
   //and also go through the changed geometries, because the spatial filter of the provider did not consider feature changes
   for(std::map<int, QgsGeometry>::const_iterator iter = mChangedGeometries.begin(); iter != mChangedGeometries.end(); ++iter)
   {
-    vertexFeature = iter->second.closestVertex(point);
-    minvertexdist=vertexFeature.sqrDist(point.x(),point.y());
-    if(minvertexdist<mindist)
+    vertexFeature = iter->second.closestVertex(point, vindex, minsquaredist);
+    if(minsquaredist<mindist)
     {
       mindistx=vertexFeature.x();
       mindisty=vertexFeature.y();
-      mindist=minvertexdist;
+      mindist=minsquaredist;
     }
   }
 
@@ -2891,16 +2889,6 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,
 
   QgsPoint origPoint = point;
 
-#ifdef QGISDEBUG
-  std::cout << "QgsVectorLayer::snapVertexWithContext: Entering."
-    << "." << std::endl;
-#endif
-
-#ifdef QGISDEBUG
-  std::cout << "QgsVectorLayer::snapVertexWithContext: Tolerance: " << tolerance << ", dataProvider = '" << dataProvider
-    << "'." << std::endl;
-#endif
-
   // Sanity checking
   if ( tolerance<=0 ||
       !dataProvider)
@@ -2938,10 +2926,7 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,
       feature->setGeometry( mChangedGeometries[ feature->featureId() ] );
     }
 
-    minDistSegPoint = feature->geometry()->closestVertexWithContext(origPoint,
-        atVertexTemp,
-        testSqrDist);
-
+    minDistSegPoint = feature->geometry()->closestVertex(origPoint, atVertexTemp, testSqrDist);
     if (testSqrDist < minSqrDist)
     {
       point = minDistSegPoint;
@@ -2951,13 +2936,6 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,
       snappedFeatureId  = feature->featureId();
       snappedGeometry   = *(feature->geometry());
       vertexFound = true;
-
-#ifdef QGISDEBUG
-      std::cout << "QgsVectorLayer::snapVertexWithContext: minSqrDist reduced to: " << minSqrDist
-        //                << " and beforeVertex " << beforeVertex
-        << "." << std::endl;
-#endif
-
     }
   }
 
@@ -2972,10 +2950,7 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,
       iter != mAddedFeatures.end();
       ++iter)
   {
-    minDistSegPoint = (*iter)->geometry()->closestVertexWithContext(origPoint,
-        atVertexTemp,
-        testSqrDist);
-
+    minDistSegPoint = (*iter)->geometry()->closestVertex(origPoint, atVertexTemp, testSqrDist);
     if (testSqrDist < minSqrDist)
     {
       point = minDistSegPoint;

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ void QgsGeometry::setGeos(geos::Geometry* geos)`
`214`	`214`
`215`	`215`	`}`
`216`	`216`
`217`		`-QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
	`217`	`+QgsPoint QgsGeometry::closestVertex(const QgsPoint& point, QgsGeometryVertexIndex& atVertex, double& sqrDist) const`
`218`	`218`	`{`
`219`	`219`	`if(mDirtyWkb)`
`220`	`220`	`{`
`@@ -223,9 +223,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`223`	`223`
`224`	`224`	`if(mGeometry)`
`225`	`225`	`{`
	`226`	`+ int vertexnr;`
	`227`	`+ int vertexcounter = 0;`
`226`	`228`	`int wkbType;`
`227`	`229`	`double actdist = std::numeric_limits<double>::max();`
`228`		`-`
`229`	`230`	`double x,y;`
`230`	`231`	`double tempx,tempy;`
`231`	`232`	`memcpy(&wkbType, (mGeometry+1), sizeof(int));`
`@@ -234,6 +235,8 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`234`	`235`	`case QGis::WKBPoint:`
`235`	`236`	`x = ((double ) (mGeometry + 5));`
`236`	`237`	`y = ((double ) (mGeometry + 5 + sizeof(double)));`
	`238`	`+ sqrDist = point.sqrDist(x, y);`
	`239`	`+ vertexnr = 0;`
`237`	`240`	`break;`
`238`	`241`
`239`	`242`	`case QGis::WKBLineString:`
`@@ -251,6 +254,7 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`251`	`254`	`x=*tempx;`
`252`	`255`	`y=*tempy;`
`253`	`256`	`actdist=point.sqrDist(tempx,tempy);`
	`257`	`+ vertexnr = index;`
`254`	`258`	`}`
`255`	`259`	`ptr+=sizeof(double);`
`256`	`260`	`}`
`@@ -275,8 +279,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`275`	`279`	`x=*tempx;`
`276`	`280`	`y=*tempy;`
`277`	`281`	`actdist=point.sqrDist(tempx,tempy);`
	`282`	`+ vertexnr = vertexcounter;`
`278`	`283`	`}`
`279`	`284`	`ptr+=sizeof(double);`
	`285`	`+ ++vertexcounter;`
`280`	`286`	`}`
`281`	`287`	`}`
`282`	`288`	`}`
`@@ -296,6 +302,7 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`296`	`302`	`x=*tempx;`
`297`	`303`	`y=*tempy;`
`298`	`304`	`actdist=point.sqrDist(tempx,tempy);`
	`305`	`+ vertexnr = index;`
`299`	`306`	`}`
`300`	`307`	`ptr+=(2*sizeof(double));`
`301`	`308`	`}`
`@@ -322,9 +329,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`322`	`329`	`x=*tempx;`
`323`	`330`	`y=*tempy;`
`324`	`331`	`actdist=point.sqrDist(tempx,tempy);`
	`332`	`+ vertexnr = vertexcounter;`
`325`	`333`	`}`
`326`	`334`	`ptr+=sizeof(double);`
`327`		`-`
	`335`	`+ ++vertexcounter;`
`328`	`336`	`}`
`329`	`337`	`}`
`330`	`338`	`}`
`@@ -355,8 +363,10 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`355`	`363`	`x=*tempx;`
`356`	`364`	`y=*tempy;`
`357`	`365`	`actdist=point.sqrDist(tempx,tempy);`
	`366`	`+ vertexnr = vertexcounter;`
`358`	`367`	`}`
`359`	`368`	`ptr+=sizeof(double);`
	`369`	`+ ++vertexcounter;`
`360`	`370`	`}`
`361`	`371`	`}`
`362`	`372`	`}`
`@@ -366,6 +376,9 @@ QgsPoint QgsGeometry::closestVertex(const QgsPoint& point) const`
`366`	`376`	`default:`
`367`	`377`	`break;`
`368`	`378`	`}`
	`379`	`+ sqrDist = actdist;`
	`380`	`+ atVertex.clear();`
	`381`	`+ atVertex.push_back(vertexnr);`
`369`	`382`	`return QgsPoint(x,y);`
`370`	`383`	`}`
`371`	`384`	`return QgsPoint(0,0);`
Original file line number	Diff line number	Diff line change
`@@ -2813,7 +2813,8 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)`
`2813`	`2813`	`double mindisty=point.y();`
`2814`	`2814`	`QgsFeature* fet;`
`2815`	`2815`	`QgsPoint vertexFeature;//the closest vertex of a feature`
`2816`		`- double minvertexdist;//the distance between 'point' and 'vertexFeature'`
	`2816`	`+ QgsGeometryVertexIndex vindex;`
	`2817`	`+ double minsquaredist;`
`2817`	`2818`
`2818`	`2819`	`QgsRect selectrect(point.x()-tolerance,point.y()-tolerance,point.x()+tolerance,point.y()+tolerance);`
`2819`	`2820`	`selectrect = inverseProjectRect(selectrect);`
`@@ -2825,18 +2826,17 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)`
`2825`	`2826`	`{`
`2826`	`2827`	`if(mChangedGeometries.find(fet->featureId()) != mChangedGeometries.end())//if geometry has been changed, use the new geometry`
`2827`	`2828`	`{`
`2828`		`- vertexFeature = mChangedGeometries[fet->featureId()].closestVertex(point);`
	`2829`	`+ vertexFeature = mChangedGeometries[fet->featureId()].closestVertex(point, vindex, minsquaredist);`
`2829`	`2830`	`}`
`2830`	`2831`	`else`
`2831`	`2832`	`{`
`2832`		`- vertexFeature=fet->geometry()->closestVertex(point);`
	`2833`	`+ vertexFeature=fet->geometry()->closestVertex(point, vindex, minsquaredist);`
`2833`	`2834`	`}`
`2834`		`- minvertexdist=vertexFeature.sqrDist(point.x(),point.y());`
`2835`		`- if(minvertexdist<mindist)`
	`2835`	`+ if(minsquaredist<mindist)`
`2836`	`2836`	`{`
`2837`	`2837`	`mindistx=vertexFeature.x();`
`2838`	`2838`	`mindisty=vertexFeature.y();`
`2839`		`- mindist=minvertexdist;`
	`2839`	`+ mindist=minsquaredist;`
`2840`	`2840`	`}`
`2841`	`2841`	`}`
`2842`	`2842`
`@@ -2845,31 +2845,29 @@ bool QgsVectorLayer::snapPoint(QgsPoint& point, double tolerance)`
`2845`	`2845`	`{`
`2846`	`2846`	`if(mChangedGeometries.find((*iter)->featureId()) != mChangedGeometries.end())//use the changed geometry`
`2847`	`2847`	`{`
`2848`		`- vertexFeature = mChangedGeometries[(*iter)->featureId()].closestVertex(point);`
	`2848`	`+ vertexFeature = mChangedGeometries[(*iter)->featureId()].closestVertex(point, vindex, minsquaredist);`
`2849`	`2849`	`}`
`2850`	`2850`	`else`
`2851`	`2851`	`{`
`2852`		`- vertexFeature=(*iter)->geometry()->closestVertex(point);`
	`2852`	`+ vertexFeature=(*iter)->geometry()->closestVertex(point, vindex, minsquaredist);`
`2853`	`2853`	`}`
`2854`		`- minvertexdist=vertexFeature.sqrDist(point.x(),point.y());`
`2855`		`- if(minvertexdist<mindist)`
	`2854`	`+ if(minsquaredist<mindist)`
`2856`	`2855`	`{`
`2857`	`2856`	`mindistx=vertexFeature.x();`
`2858`	`2857`	`mindisty=vertexFeature.y();`
`2859`		`- mindist=minvertexdist;`
	`2858`	`+ mindist=minsquaredist;`
`2860`	`2859`	`}`
`2861`	`2860`	`}`
`2862`	`2861`
`2863`	`2862`	`//and also go through the changed geometries, because the spatial filter of the provider did not consider feature changes`
`2864`	`2863`	`for(std::map<int, QgsGeometry>::const_iterator iter = mChangedGeometries.begin(); iter != mChangedGeometries.end(); ++iter)`
`2865`	`2864`	`{`
`2866`		`- vertexFeature = iter->second.closestVertex(point);`
`2867`		`- minvertexdist=vertexFeature.sqrDist(point.x(),point.y());`
`2868`		`- if(minvertexdist<mindist)`
	`2865`	`+ vertexFeature = iter->second.closestVertex(point, vindex, minsquaredist);`
	`2866`	`+ if(minsquaredist<mindist)`
`2869`	`2867`	`{`
`2870`	`2868`	`mindistx=vertexFeature.x();`
`2871`	`2869`	`mindisty=vertexFeature.y();`
`2872`		`- mindist=minvertexdist;`
	`2870`	`+ mindist=minsquaredist;`
`2873`	`2871`	`}`
`2874`	`2872`	`}`
`2875`	`2873`
`@@ -2891,16 +2889,6 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,`
`2891`	`2889`
`2892`	`2890`	`QgsPoint origPoint = point;`
`2893`	`2891`
`2894`		`-#ifdef QGISDEBUG`
`2895`		`- std::cout << "QgsVectorLayer::snapVertexWithContext: Entering."`
`2896`		`- << "." << std::endl;`
`2897`		`-#endif`
`2898`		`-`
`2899`		`-#ifdef QGISDEBUG`
`2900`		`- std::cout << "QgsVectorLayer::snapVertexWithContext: Tolerance: " << tolerance << ", dataProvider = '" << dataProvider`
`2901`		`- << "'." << std::endl;`
`2902`		`-#endif`
`2903`		`-`
`2904`	`2892`	`// Sanity checking`
`2905`	`2893`	`if ( tolerance<=0 \|\|`
`2906`	`2894`	`!dataProvider)`
`@@ -2938,10 +2926,7 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,`
`2938`	`2926`	`feature->setGeometry( mChangedGeometries[ feature->featureId() ] );`
`2939`	`2927`	`}`
`2940`	`2928`
`2941`		`- minDistSegPoint = feature->geometry()->closestVertexWithContext(origPoint,`
`2942`		`- atVertexTemp,`
`2943`		`- testSqrDist);`
`2944`		`-`
	`2929`	`+ minDistSegPoint = feature->geometry()->closestVertex(origPoint, atVertexTemp, testSqrDist);`
`2945`	`2930`	`if (testSqrDist < minSqrDist)`
`2946`	`2931`	`{`
`2947`	`2932`	`point = minDistSegPoint;`
`@@ -2951,13 +2936,6 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,`
`2951`	`2936`	`snappedFeatureId = feature->featureId();`
`2952`	`2937`	`snappedGeometry = *(feature->geometry());`
`2953`	`2938`	`vertexFound = true;`
`2954`		`-`
`2955`		`-#ifdef QGISDEBUG`
`2956`		`- std::cout << "QgsVectorLayer::snapVertexWithContext: minSqrDist reduced to: " << minSqrDist`
`2957`		`- // << " and beforeVertex " << beforeVertex`
`2958`		`- << "." << std::endl;`
`2959`		`-#endif`
`2960`		`-`
`2961`	`2939`	`}`
`2962`	`2940`	`}`
`2963`	`2941`
`@@ -2972,10 +2950,7 @@ bool QgsVectorLayer::snapVertexWithContext(QgsPoint& point,`
`2972`	`2950`	`iter != mAddedFeatures.end();`
`2973`	`2951`	`++iter)`
`2974`	`2952`	`{`
`2975`		`- minDistSegPoint = (*iter)->geometry()->closestVertexWithContext(origPoint,`
`2976`		`- atVertexTemp,`
`2977`		`- testSqrDist);`
`2978`		`-`
	`2953`	`+ minDistSegPoint = (*iter)->geometry()->closestVertex(origPoint, atVertexTemp, testSqrDist);`
`2979`	`2954`	`if (testSqrDist < minSqrDist)`
`2980`	`2955`	`{`
`2981`	`2956`	`point = minDistSegPoint;`