Fix incorrect rows are removed when removing vector tile renderer/lab…

…eling rules
qgis · Sep 14, 2020 · 91598c7 · 91598c7
1 parent d214e63
commit 91598c7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/gui/vectortile/qgsvectortilebasiclabelingwidget.cpp b/src/gui/vectortile/qgsvectortilebasiclabelingwidget.cpp
@@ -459,11 +459,19 @@ void QgsVectorTileBasicLabelingWidget::updateLabelingFromWidget()
 void QgsVectorTileBasicLabelingWidget::removeStyle()
 {
   const QModelIndexList sel = viewStyles->selectionModel()->selectedIndexes();
+
+  QList<int > res;
   for ( const QModelIndex &proxyIndex : sel )
   {
     const QModelIndex sourceIndex = mProxyModel->mapToSource( proxyIndex );
-    if ( sourceIndex.isValid() )
-      mModel->removeRow( sourceIndex.row() );
+    if ( !res.contains( sourceIndex.row() ) )
+      res << sourceIndex.row();
+  }
+  std::sort( res.begin(), res.end() );
+
+  for ( int i = res.size() - 1; i >= 0; --i )
+  {
+    mModel->removeRow( res[ i ] );
   }
   // make sure that the selection is gone
   viewStyles->selectionModel()->clear();

diff --git a/src/gui/vectortile/qgsvectortilebasicrendererwidget.cpp b/src/gui/vectortile/qgsvectortilebasicrendererwidget.cpp
@@ -474,11 +474,19 @@ void QgsVectorTileBasicRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *co
 void QgsVectorTileBasicRendererWidget::removeStyle()
 {
   const QModelIndexList sel = viewStyles->selectionModel()->selectedIndexes();
+
+  QList<int > res;
   for ( const QModelIndex &proxyIndex : sel )
   {
     const QModelIndex sourceIndex = mProxyModel->mapToSource( proxyIndex );
-    if ( sourceIndex.isValid() )
-      mModel->removeRow( sourceIndex.row() );
+    if ( !res.contains( sourceIndex.row() ) )
+      res << sourceIndex.row();
+  }
+  std::sort( res.begin(), res.end() );
+
+  for ( int i = res.size() - 1; i >= 0; --i )
+  {
+    mModel->removeRow( res[ i ] );
   }
   // make sure that the selection is gone
   viewStyles->selectionModel()->clear();