[QGIS Commit] r9916 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-01-02 14:55:34 -0500 (Fri, 02 Jan 2009)
New Revision: 9916

Modified:
   trunk/qgis/src/gui/qgsrubberband.cpp
Log:
speed up QgsRubberBand::setToGeometry()

Modified: trunk/qgis/src/gui/qgsrubberband.cpp
===================================================================
--- trunk/qgis/src/gui/qgsrubberband.cpp	2009-01-01 21:20:46 UTC (rev 9915)
+++ trunk/qgis/src/gui/qgsrubberband.cpp	2009-01-02 19:55:34 UTC (rev 9916)
@@ -186,10 +186,10 @@
       {
         pt = geom->asPoint();
       }
-      addPoint( QgsPoint( pt.x() - d, pt.y() - d ) );
-      addPoint( QgsPoint( pt.x() + d, pt.y() - d ) );
-      addPoint( QgsPoint( pt.x() + d, pt.y() + d ) );
-      addPoint( QgsPoint( pt.x() - d, pt.y() + d ) );
+      addPoint( QgsPoint( pt.x() - d, pt.y() - d ), false );
+      addPoint( QgsPoint( pt.x() + d, pt.y() - d ), false );
+      addPoint( QgsPoint( pt.x() + d, pt.y() + d ), false );
+      addPoint( QgsPoint( pt.x() - d, pt.y() + d ), false );
     }
     break;
 
@@ -204,17 +204,17 @@
         QgsPoint pt = mpt[i];
         if ( layer )
         {
-          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() - d, pt.y() - d ) ) );
-          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() + d, pt.y() - d ) ) );
-          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() + d, pt.y() + d ) ) );
-          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() - d, pt.y() + d ) ) );
+          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() - d, pt.y() - d ) ), false );
+          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() + d, pt.y() - d ) ), false );
+          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() + d, pt.y() + d ) ), false );
+          addPoint( mr->layerToMapCoordinates( layer, QgsPoint( pt.x() - d, pt.y() + d ) ), false );
         }
         else
         {
-          addPoint( QgsPoint( pt.x() - d, pt.y() - d ) );
-          addPoint( QgsPoint( pt.x() + d, pt.y() - d ) );
-          addPoint( QgsPoint( pt.x() + d, pt.y() + d ) );
-          addPoint( QgsPoint( pt.x() - d, pt.y() + d ) );
+          addPoint( QgsPoint( pt.x() - d, pt.y() - d ), false );
+          addPoint( QgsPoint( pt.x() + d, pt.y() - d ), false );
+          addPoint( QgsPoint( pt.x() + d, pt.y() + d ), false );
+          addPoint( QgsPoint( pt.x() - d, pt.y() + d ), false );
         }
       }
     }
@@ -229,11 +229,11 @@
       {
         if ( layer )
         {
-          addPoint( mr->layerToMapCoordinates( layer, line[i] ) );
+          addPoint( mr->layerToMapCoordinates( layer, line[i] ), false );
         }
         else
         {
-          addPoint( line[i] );
+          addPoint( line[i], false );
         }
       }
     }
@@ -259,7 +259,7 @@
           }
           else
           {
-            addPoint( line[j] );
+            addPoint( line[j], false, i );
           }
         }
       }
@@ -276,11 +276,11 @@
       {
         if ( layer )
         {
-          addPoint( mr->layerToMapCoordinates( layer, line[i] ) );
+          addPoint( mr->layerToMapCoordinates( layer, line[i] ), false );
         }
         else
         {
-          addPoint( line[i] );
+          addPoint( line[i], false );
         }
       }
     }
@@ -307,7 +307,7 @@
           }
           else
           {
-            addPoint( line[j] );
+            addPoint( line[j], false, i );
           }
         }
       }