Take the changed geometry for rubberbanding instead of the original one

git-svn-id: http://svn.osgeo.org/qgis/trunk@5103 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 27, 2006 · 14f574a · 14f574a
1 parent 62766b3
commit 14f574a
Showing 1 changed file with 64 additions and 53 deletions.
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -771,106 +771,117 @@ bool QgsGeometry::vertexAt(double &x, double &y,
                 << "." << std::endl;
 #endif
 
-    if(mGeometry)
+      if(mGeos)//try to find the vertex from the Geos geometry (it present)
-    {
+	{
-        int wkbType;
+	  geos::CoordinateSequence* cs = mGeos->getCoordinates();
+	  if(cs)
+	    {
+	      const geos::Coordinate& coord = cs->getAt(atVertex.back());
+	      x = coord.x;
+	      y = coord.y;
+	      delete cs;
+	      return true;
+	    }
+	}
 
-        memcpy(&wkbType, (mGeometry+1), sizeof(int));
+      else if(mGeometry)
-        switch (wkbType)
+	{
-        {
+	  int wkbType;
+
+	  memcpy(&wkbType, (mGeometry+1), sizeof(int));
+	  switch (wkbType)
+	    {
             case QGis::WKBPoint:
-            {
+	      {
                 // TODO
                 return FALSE;
                 break;
-            }
+	      }
             case QGis::WKBLineString:
-            {
+	      {
                 unsigned char *ptr;
                 int *nPoints;
-
+		
                 // get number of points in the line
                 ptr = mGeometry + 5;     // now at mGeometry.numPoints
                 nPoints = (int *) ptr;
-
+		
 #ifdef QGISDEBUG
-      std::cout << "QgsGeometry::vertexAt: Number of points in WKBLineString is " << *nPoints
+		std::cout << "QgsGeometry::vertexAt: Number of points in WKBLineString is " << *nPoints
-                << "." << std::endl;
+			  << "." << std::endl;
 #endif
                 // return error if underflow
                 if (0 > atVertex.back())
-                {
+		  {
-                  return FALSE;
+		    return FALSE;
-                }
+		  }
                 // return error if overflow
                 if (*nPoints <= atVertex.back())
-                {
+		  {
-                  return FALSE;
+		    return FALSE;
-                }
+		  }
-
+		
                 // copy the vertex coordinates                      
                 ptr = mGeometry + 9 + (atVertex.back() * 16);
                 memcpy(&x, ptr, 8);
                 ptr += 8;
                 memcpy(&y, ptr, 8);
-
+		
 #ifdef QGISDEBUG
-      std::cout << "QgsGeometry::vertexAt: Point is (" << x << ", " << y << ")"
+		std::cout << "QgsGeometry::vertexAt: Point is (" << x << ", " << y << ")"
-                << "." << std::endl;
+			  << "." << std::endl;
 #endif
-                      
+		
                 break;
-            }
+	      }
             case QGis::WKBPolygon:
-            {
+	      {
                 // TODO
                 return false;
                 break;
-            }
+	      }
             case QGis::WKBMultiPoint:
-            {
+	      {
                 // TODO
                 return false;
                 break;
-            }
+	      }
-
+	      
             case QGis::WKBMultiLineString:
-            {
+	      {
                 // TODO
                 return false;
                 break;
-            }
+	      }
-
+	      
             case QGis::WKBMultiPolygon:
-            {
+	      {
-                 // TODO
+		// TODO
                 return false;
                 break;
-             }
+	      }
             default:
 #ifdef QGISDEBUG
-                qWarning("error: mGeometry type not recognized in QgsGeometry::vertexAt");
+	      qWarning("error: mGeometry type not recognized in QgsGeometry::vertexAt");
 #endif
-                return false;
+	      return false;
-                break;
+	      break;
-        }
+	    }
-        
+	  
 #ifdef QGISDEBUG
-      std::cout << "QgsGeometry::vertexAt: Exiting TRUE." << std::endl;
+	  std::cout << "QgsGeometry::vertexAt: Exiting TRUE." << std::endl;
 #endif
-        
+	  
-        return true;
+	  return true;
-        
+	  
-    }
+	}
-    else
+      else
-    {
+	{
 #ifdef QGISDEBUG
-        qWarning("error: no mGeometry pointer in QgsGeometry::vertexAt");
+	  qWarning("error: no mGeometry pointer in QgsGeometry::vertexAt");
 #endif
-        return false;
+	  return false;
-    }
+	}     
-
-
 }