Merge pull request #1972 from naihil/rubberband-visibility-fix

Sandro Santilli · Sandro Santilli · commit 892f142e28bb · 2015-04-07T10:47:29.000+02:00
Don`t change current visibility flag of rubberband on updates
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -182,6 +182,7 @@ void QgsRubberBand::addPoint( const QgsPoint & p, bool doUpdate /* = true */, in
 
   if ( doUpdate )
   {
+    setVisible( true );
     updateRect();
     update();
   }
@@ -418,6 +419,7 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
       return;
   }
 
+  setVisible( true );
   updateRect();
   update();
 }
@@ -567,7 +569,6 @@ void QgsRubberBand::updateRect()
   QgsRectangle rect( topLeft.x(), topLeft.y(), topLeft.x() + r.width()*res, topLeft.y() - r.height()*res );
 
   setRect( rect );
-  setVisible( true );
 }
 
 void QgsRubberBand::updatePosition( )
diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
@@ -46,6 +46,7 @@ class TestQgsRubberband : public QObject
 
     void testAddSingleMultiGeometries(); //test for #7728
     void testBoundingRect(); //test for #12392
+    void testVisibility(); //test for 12486
 
   private:
     QgsMapCanvas* mCanvas;
@@ -153,6 +154,46 @@ void TestQgsRubberband::testBoundingRect()
 
 }
 
+void TestQgsRubberband::testVisibility()
+{
+  mRubberband = new QgsRubberBand( mCanvas, mPolygonLayer->geometryType() );
+
+  // Visibility is set to false by default
+  QCOMPARE( mRubberband->isVisible(), false );
+
+  // Check visibility after setting to empty geometry
+  QSharedPointer<QgsGeometry> emptyGeom( new QgsGeometry );
+  mRubberband->setToGeometry( emptyGeom.data(), mPolygonLayer );
+  QCOMPARE( mRubberband->isVisible(), false );
+
+  // Check that visibility changes
+  mRubberband->setVisible( true );
+  mRubberband->setToGeometry( emptyGeom.data(), mPolygonLayer );
+  QCOMPARE( mRubberband->isVisible(), false );
+
+  // Check visibility after setting to valid geometry
+  QSharedPointer<QgsGeometry> geom( QgsGeometry::fromWkt(
+      "POLYGON((10 10,10 30,30 30,30 10,10 10))"
+  ) );
+  mRubberband->setToGeometry( geom.data(), mPolygonLayer );
+  QCOMPARE( mRubberband->isVisible(), true );
+
+  // Add point without update
+  mRubberband->reset( true );
+  mRubberband->addPoint( QgsPoint( 10, 10 ), false );
+  QCOMPARE( mRubberband->isVisible(), false );
+
+  // Add point with update
+  mRubberband->addPoint( QgsPoint( 20, 20 ), true );
+  QCOMPARE( mRubberband->isVisible(), true );
+
+  // Check visibility after zoom (should not be changed)
+  mRubberband->setVisible( false );
+  mCanvas->zoomIn();
+  QCOMPARE( mRubberband->isVisible(), false );
+  
+}
+
 
 QTEST_MAIN( TestQgsRubberband )
 #include "testqgsrubberband.moc"

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ void QgsRubberBand::addPoint( const QgsPoint & p, bool doUpdate /* = true */, in`
`182`	`182`
`183`	`183`	`if ( doUpdate )`
`184`	`184`	`{`
	`185`	`+ setVisible( true );`
`185`	`186`	`updateRect();`
`186`	`187`	`update();`
`187`	`188`	`}`
`@@ -418,6 +419,7 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )`
`418`	`419`	`return;`
`419`	`420`	`}`
`420`	`421`
	`422`	`+ setVisible( true );`
`421`	`423`	`updateRect();`
`422`	`424`	`update();`
`423`	`425`	`}`
`@@ -567,7 +569,6 @@ void QgsRubberBand::updateRect()`
`567`	`569`	`QgsRectangle rect( topLeft.x(), topLeft.y(), topLeft.x() + r.width()res, topLeft.y() - r.height()res );`
`568`	`570`
`569`	`571`	`setRect( rect );`
`570`		`- setVisible( true );`
`571`	`572`	`}`
`572`	`573`
`573`	`574`	`void QgsRubberBand::updatePosition( )`