[QGIS Commit] r8785 - branches/advanced_printing_branch/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-07-15 09:37:37 -0400 (Tue, 15 Jul 2008)
New Revision: 8785

Modified:
   branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.cpp
   branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.h
   branches/advanced_printing_branch/src/app/composer/qgslegendmodel.cpp
Log:
Possibility to remove legend entries

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.cpp	2008-07-15 13:20:48 UTC (rev 8784)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.cpp	2008-07-15 13:37:37 UTC (rev 8785)
@@ -288,3 +288,30 @@
       mLegend->update();
     }
 }
+
+void QgsComposerLegendWidget::on_mRemovePushButton_clicked()
+{
+  QStandardItemModel* itemModel = dynamic_cast<QStandardItemModel*>(mItemTreeView->model());
+  if(!itemModel)
+    {
+      return;
+    }
+
+  QModelIndex currentIndex = mItemTreeView->currentIndex();
+  if(!currentIndex.isValid())
+    {
+      return;
+    }
+
+  QModelIndex parentIndex = currentIndex.parent();
+  if(!parentIndex.isValid())
+    {
+      return;
+    }
+  
+  itemModel->removeRow(currentIndex.row(), parentIndex);
+  if(mLegend)
+    {
+      mLegend->update();
+    }
+}

Modified: branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.h
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.h	2008-07-15 13:20:48 UTC (rev 8784)
+++ branches/advanced_printing_branch/src/app/composer/qgscomposerlegendwidget.h	2008-07-15 13:37:37 UTC (rev 8785)
@@ -48,6 +48,7 @@
   //item manipulation
   void on_mMoveDownPushButton_clicked();
   void on_mMoveUpPushButton_clicked();
+  void on_mRemovePushButton_clicked();
 
  private:
   QgsComposerLegendWidget();

Modified: branches/advanced_printing_branch/src/app/composer/qgslegendmodel.cpp
===================================================================
--- branches/advanced_printing_branch/src/app/composer/qgslegendmodel.cpp	2008-07-15 13:20:48 UTC (rev 8784)
+++ branches/advanced_printing_branch/src/app/composer/qgslegendmodel.cpp	2008-07-15 13:37:37 UTC (rev 8785)
@@ -109,7 +109,7 @@
       QString lowerValue = (*symbolIt)->lowerValue();
       QString upperValue = (*symbolIt)->upperValue();
 
-      if(lowerValue == upperValue)
+      if(lowerValue == upperValue || upperValue.isEmpty())
 	{
 	  label = lowerValue;
 	}