Simplify tool: allow simplification of multiple features at once

One just needs to drag a rectangle instead of just clicking
qgis · Jan 22, 2015 · 4322de9 · 4322de9
1 parent 8770c9b
commit 4322de9
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 40 deletions.
diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -48,7 +48,9 @@ QgsSimplifyDialog::QgsSimplifyDialog( QgsMapToolSimplify* tool, QWidget* parent
 
 
 QgsMapToolSimplify::QgsMapToolSimplify( QgsMapCanvas* canvas )
-    : QgsMapToolEdit( canvas ), mRubberBand( 0 )
+    : QgsMapToolEdit( canvas )
+    , mSelectionRubberBand( 0 )
+    , mDragging( false )
 {
   QSettings settings;
   mTolerance = settings.value( "/digitizing/simplify_tolerance", 1 ).toDouble();
@@ -59,7 +61,7 @@ QgsMapToolSimplify::QgsMapToolSimplify( QgsMapCanvas* canvas )
 
 QgsMapToolSimplify::~QgsMapToolSimplify()
 {
-  removeRubberBand();
+  clearSelection();
   delete mSimplifyDialog;
 }
 
@@ -71,7 +73,7 @@ void QgsMapToolSimplify::setTolerance( double tolerance )
   QSettings settings;
   settings.setValue( "/digitizing/simplify_tolerance", tolerance );
 
-  if ( mSelectedFeature.isValid() )
+  if ( !mSelectedFeatures.isEmpty() )
     updateSimplificationPreview();
 }
 
@@ -82,29 +84,41 @@ void QgsMapToolSimplify::setToleranceUnits( int units )
   QSettings settings;
   settings.setValue( "/digitizing/simplify_tolerance_units", units );
 
-  if ( mSelectedFeature.isValid() )
+  if ( !mSelectedFeatures.isEmpty() )
     updateSimplificationPreview();
 }
 
 void QgsMapToolSimplify::updateSimplificationPreview()
 {
   QgsVectorLayer* vl = currentVectorLayer();
-  // create a copy of selected feature and do the simplification
-  QgsFeature f = mSelectedFeature;
-  QgsSimplifyFeature::simplify( f, mTolerance, mToleranceUnits, mCanvas->mapSettings().layerTransform( vl ) );
-  mRubberBand->setToGeometry( f.geometry(), vl );
+
+  int i = 0;
+  foreach ( const QgsFeature& fSel, mSelectedFeatures )
+  {
+    // create a copy of selected feature and do the simplification
+    QgsFeature f = fSel;
+    QgsSimplifyFeature::simplify( f, mTolerance, mToleranceUnits, mCanvas->mapSettings().layerTransform( vl ) );
+    mRubberBands[i]->setToGeometry( f.geometry(), vl );
+    ++i;
+  }
 }
 
 
 void QgsMapToolSimplify::storeSimplified()
 {
   QgsVectorLayer * vlayer = currentVectorLayer();
-  QgsSimplifyFeature::simplify( mSelectedFeature, mTolerance, mToleranceUnits, mCanvas->mapSettings().layerTransform( vlayer ) );
 
   vlayer->beginEditCommand( tr( "Geometry simplified" ) );
-  vlayer->changeGeometry( mSelectedFeature.id(), mSelectedFeature.geometry() );
+  foreach ( const QgsFeature& feat, mSelectedFeatures )
+  {
+    QgsFeature f = feat;
+    QgsSimplifyFeature::simplify( f, mTolerance, mToleranceUnits, mCanvas->mapSettings().layerTransform( vlayer ) );
+    vlayer->changeGeometry( f.id(), f.geometry() );
+  }
   vlayer->endEditCommand();
 
+  clearSelection();
+
   mCanvas->refresh();
 }
 
@@ -213,16 +227,92 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()
 
 void QgsMapToolSimplify::canvasPressEvent( QMouseEvent * e )
 {
-  QgsVectorLayer * vlayer = currentVectorLayer();
+  if ( e->button() != Qt::LeftButton )
+    return;
 
-  if ( !vlayer )
+  if ( !currentVectorLayer() )
   {
     notifyNotVectorLayer();
     return;
   }
 
-  QgsPoint layerCoords = toLayerCoordinates( vlayer, e->pos() );
+  // delete previous rubberband (if any)
+  clearSelection();
+
+  mSelectionRect.setRect( 0, 0, 0, 0 );
+}
+
+
+void QgsMapToolSimplify::canvasMoveEvent( QMouseEvent * e )
+{
+  if ( !( e->buttons() & Qt::LeftButton ) )
+    return;
+
+  if ( !mDragging )
+  {
+    mDragging = true;
+    delete mSelectionRubberBand;
+    mSelectionRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
+    QColor color( Qt::blue );
+    color.setAlpha( 63 );
+    mSelectionRubberBand->setColor( color );
+    mSelectionRect.setTopLeft( e->pos() );
+  }
+  mSelectionRect.setBottomRight( e->pos() );
+  if ( mSelectionRubberBand )
+  {
+    mSelectionRubberBand->setToCanvasRectangle( mSelectionRect );
+    mSelectionRubberBand->show();
+  }
+}
+
+
+void QgsMapToolSimplify::canvasReleaseEvent( QMouseEvent * e )
+{
+  if ( e->button() != Qt::LeftButton )
+    return;
+
+  delete mSelectionRubberBand;
+  mSelectionRubberBand = 0;
+
+  if ( mDragging && ( mSelectionRect.topLeft() != mSelectionRect.bottomRight() ) )
+  {
+    mDragging = false;
+
+    // store the rectangle
+    mSelectionRect.setRight( e->pos().x() );
+    mSelectionRect.setBottom( e->pos().y() );
+
+    selectFeaturesInRect();
+  }
+  else
+  {
+    selectOneFeature( e->pos() );
+  }
+
+  mDragging = false;
+
+  // prepare rubber bands
+  foreach ( const QgsFeature& f, mSelectedFeatures )
+  {
+    Q_UNUSED( f );
+    QgsRubberBand* rb = new QgsRubberBand( mCanvas );
+    rb->setColor( QColor( 255, 0, 0, 65 ) );
+    rb->setWidth( 2 );
+    rb->show();
+    mRubberBands << rb;
+  }
+  updateSimplificationPreview();
 
+  // show dialog as a non-modal window
+  mSimplifyDialog->show();
+}
+
+
+void QgsMapToolSimplify::selectOneFeature( const QPoint& canvasPoint )
+{
+  QgsVectorLayer * vlayer = currentVectorLayer();
+  QgsPoint layerCoords = toLayerCoordinates( vlayer, canvasPoint );
   double r = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapSettings() );
   QgsRectangle selectRect = QgsRectangle( layerCoords.x() - r, layerCoords.y() - r,
                                           layerCoords.x() + r, layerCoords.y() + r );
@@ -231,53 +321,66 @@ void QgsMapToolSimplify::canvasPressEvent( QMouseEvent * e )
   QgsGeometry* geometry = QgsGeometry::fromPoint( layerCoords );
   double minDistance = DBL_MAX;
   double currentDistance;
-
-  mSelectedFeature.setValid( false );
-
+  QgsFeature minDistanceFeature;
   QgsFeature f;
   while ( fit.nextFeature( f ) )
   {
     currentDistance = geometry->distance( *( f.geometry() ) );
     if ( currentDistance < minDistance )
     {
       minDistance = currentDistance;
-      mSelectedFeature = f;
+      minDistanceFeature = f;
     }
   }
+  delete geometry;
 
-  // delete previous rubberband (if any)
-  removeRubberBand();
-
-  if ( mSelectedFeature.isValid() )
+  if ( minDistanceFeature.isValid() )
   {
-    if ( mSelectedFeature.geometry()->isMultipart() )
+    mSelectedFeatures << minDistanceFeature;
+
+    if ( minDistanceFeature.geometry()->isMultipart() )
     {
       emit messageEmitted( tr( "Multipart features are not supported for simplification." ), QgsMessageBar::CRITICAL );
       return;
     }
+  }
+}
 
-    mRubberBand = new QgsRubberBand( mCanvas );
-    mRubberBand->setColor( QColor( 255, 0, 0, 65 ) );
-    mRubberBand->setWidth( 2 );
-    mRubberBand->show();
-    updateSimplificationPreview();
 
-    // show dialog as a non-modal window
-    mSimplifyDialog->show();
-  }
+void QgsMapToolSimplify::selectFeaturesInRect()
+{
+  QgsVectorLayer * vlayer = currentVectorLayer();
+  QgsPoint pt1 = toMapCoordinates( mSelectionRect.topLeft() );
+  QgsPoint pt2 = toMapCoordinates( mSelectionRect.bottomRight() );
+  QgsRectangle rect = toLayerCoordinates( vlayer, QgsRectangle( pt1, pt2 ) );
+
+  QgsFeature f;
+  QgsFeatureRequest request;
+  request.setFilterRect( rect );
+  request.setFlags( QgsFeatureRequest::ExactIntersect );
+  request.setSubsetOfAttributes( QgsAttributeList() );
+  QgsFeatureIterator fit = vlayer->getFeatures( request );
+  while ( fit.nextFeature( f ) )
+    mSelectedFeatures << f;
 }
 
-void QgsMapToolSimplify::removeRubberBand()
+
+void QgsMapToolSimplify::clearSelection()
 {
-  delete mRubberBand;
-  mRubberBand = 0;
+  mSelectedFeatures.clear();
+
+  qDeleteAll( mRubberBands );
+  mRubberBands.clear();
 }
 
 void QgsMapToolSimplify::deactivate()
 {
+  delete mSelectionRubberBand;
+  mSelectionRubberBand = 0;
+
   if ( mSimplifyDialog->isVisible() )
     mSimplifyDialog->close();
-  removeRubberBand();
+  clearSelection();
   QgsMapTool::deactivate();
 }
 

diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h
@@ -51,6 +51,8 @@ class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit
     virtual ~QgsMapToolSimplify();
 
     void canvasPressEvent( QMouseEvent * e ) override;
+    void canvasMoveEvent( QMouseEvent * e ) override;
+    void canvasReleaseEvent( QMouseEvent * e ) override;
 
     //! called when map tool is being deactivated
     void deactivate() override;
@@ -70,10 +72,13 @@ class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit
     /** slot to store feture after simplification */
     void storeSimplified();
 
-    void removeRubberBand();
+    void clearSelection();
 
   private:
 
+    void selectOneFeature( const QPoint& canvasPoint );
+    void selectFeaturesInRect();
+
     void updateSimplificationPreview();
 
     /** Function to calculate tolerance boudaries for simplifying */
@@ -86,17 +91,22 @@ class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit
     /** Dialog with slider to set correct tolerance value */
     QgsSimplifyDialog* mSimplifyDialog;
 
-    /** Rubber band to draw current state of simplification */
-    QgsRubberBand* mRubberBand;
-
-    /** Feature with which we are working */
-    QgsFeature mSelectedFeature;
+    /** Rubber bands to draw current state of simplification */
+    QList<QgsRubberBand*> mRubberBands;
+    /** Features with which we are working */
+    QList<QgsFeature> mSelectedFeatures;
 
     /** real value of tolerance */
     double mTolerance;
 
     ToleranceUnits mToleranceUnits;
 
+    //! stores actual selection rect
+    QRect mSelectionRect;
+    //! shows actual selection rect
+    QgsRubberBand* mSelectionRubberBand;
+    //! Flag to indicate a map canvas drag operation is taking place
+    bool mDragging;
 };
 
 /**