Don't allow null entry to be merged

qgis · Jan 8, 2019 · 0259548 · 0259548
1 parent 7b245d1
commit 0259548
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -1155,12 +1155,27 @@ void QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend()
 
 void QgsCategorizedSymbolRendererWidget::mergeClicked()
 {
-  QList<int> categoryIndexes = selectedCategories();
+  const QgsCategoryList &categories = mRenderer->categories();
+
+  QList<int> selectedCategoryIndexes = selectedCategories();
+  QList< int > categoryIndexes;
+
+  // filter out "" entry
+  for ( int i : selectedCategoryIndexes )
+  {
+    QVariant v = categories.at( i ).value();
+
+    if ( !v.isValid() || v == "" )
+    {
+      continue;
+    }
+
+    categoryIndexes.append( i );
+  }
+
   if ( categoryIndexes.count() < 2 )
     return;
 
-  const QgsCategoryList &categories = mRenderer->categories();
-
   QStringList labels;
   QVariantList values;
   values.reserve( categoryIndexes.count() );

diff --git a/tests/src/gui/testqgscategorizedrendererwidget.cpp b/tests/src/gui/testqgscategorizedrendererwidget.cpp
@@ -196,6 +196,8 @@ void TestQgsCategorizedRendererWidget::merge()
   // merging categories which are already lists
   widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 0, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
   widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 1, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
+  //"" entry should be ignored
+  widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 2, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
   widget->mergeClicked();
 
   QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 2 );