add ramp count to selection info label

etiennesky · etiennesky · commit 43c2805ecf74 · 2013-04-25T16:34:49.000-03:00
diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -555,6 +555,22 @@ int QgsCptCityDataItem::rowCount()
   //   populate();
   return mChildren.size();
 }
+
+int QgsCptCityDataItem::leafCount() const
+{
+  if ( !mPopulated )
+    return 0;
+
+  int count = 0;
+  foreach ( QgsCptCityDataItem *child, mChildren )
+  {
+    if ( child )
+      count += child->leafCount();
+  }
+  return count;
+}
+
+
 bool QgsCptCityDataItem::hasChildren()
 {
   return ( mPopulated ? mChildren.count() > 0 : true );
@@ -833,6 +849,7 @@ QgsCptCityCollectionItem::~QgsCptCityCollectionItem()
 QVector< QgsCptCityDataItem* > QgsCptCityCollectionItem::childrenRamps( bool recursive )
 {
   QVector< QgsCptCityDataItem* > rampItems;
+  QVector< QgsCptCityDataItem* > deleteItems;
 
   populate();
 
@@ -853,13 +870,24 @@ QVector< QgsCptCityDataItem* > QgsCptCityCollectionItem::childrenRamps( bool rec
       rampItem->init();
       if ( rampItem->isValid() )
         rampItems << rampItem;
-      // should also delete item from parent, but we are in a loop now
+      else
+        deleteItems << rampItem;
     }
     else
     {
       QgsDebugMsg( "invalid item " + childItem->path() );
     }
   }
+  
+  // delete items - this is not efficient, but only happens once
+  foreach ( QgsCptCityDataItem* deleteItem, deleteItems )
+  {
+    int i = mChildren.indexOf( deleteItem );
+    if ( i != -1 )
+      mChildren.remove( i );
+    delete deleteItem;
+  }
+
   return rampItems;
 }
 
@@ -1178,7 +1206,12 @@ QVector<QgsCptCityDataItem*> QgsCptCitySelectionItem::createChildren()
       QgsCptCityDataItem* childItem =
         QgsCptCityDirectoryItem::dataItem( this, childPath, childPath );
       if ( childItem )
-        children << childItem;
+      {
+        if ( childItem->isValid() )
+          children << childItem;
+        else
+          delete childItem;
+      }
     }
     else
     {
diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h
@@ -101,6 +101,8 @@ class CORE_EXPORT QgsCptCityDataItem : public QObject
     bool hasChildren();
 
     int rowCount();
+    // retrieve total count of "leaf" items (all children which are end nodes)
+    virtual int leafCount() const;
 
     //
 
@@ -205,6 +207,7 @@ class CORE_EXPORT QgsCptCityColorRampItem : public QgsCptCityDataItem
     // --- reimplemented from QgsCptCityDataItem ---
 
     virtual bool equal( const QgsCptCityDataItem *other );
+    virtual int leafCount() const { return 1; }
 
     // --- New virtual methods for layer item derived classes ---
     const QgsCptCityColorRampV2& ramp() const { return mRamp; }
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
@@ -29,6 +29,11 @@
 
 /////////
 
+// TODO
+// - remove dialog or add help as help button
+// - fix Diverging children when first show Selections
+// - fix crash on Diverging?
+
 class TreeFilterProxyModel : public QSortFilterProxyModel
 {
     //  Q_OBJECT
@@ -285,26 +290,24 @@ void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool
       lblSchemeName->setText( "" );
       populateVariants();
     }
+    updateListWidget( item );
     lblSchemePath->setText( item->path() );
-    lblCollectionInfo->setText( item->info() );
+    lblCollectionInfo->setText( QString( "%1 (%2)" ).arg( item->info() ).arg( item->leafCount() ) );
     updateCopyingInfo( mArchive->copyingInfo( mArchive->copyingFileName( item->path() ) ) );
-    updateListWidget( item );
   }
   else if ( item->type() == QgsCptCityDataItem::Selection )
   {
     lblSchemePath->setText( "" );
-    // lblCollectionName->setText( item->path() );
-    lblCollectionInfo->setText( item->info() );
     clearCopyingInfo( );
     updateListWidget( item );
+    lblCollectionInfo->setText( QString( "%1 (%2)" ).arg( item->info() ).arg( item->leafCount() ) );
   }
   else if ( item->type() == QgsCptCityDataItem::AllRamps )
   {
     lblSchemePath->setText( "" );
-    // lblCollectionName->setText( item->path() );
     clearCopyingInfo( );
     updateListWidget( item );
-    lblCollectionInfo->setText( tr( "All Ramps (%1)" ).arg( item->rowCount() ) );
+    lblCollectionInfo->setText( tr( "All Ramps (%1)" ).arg( item->leafCount() ) );
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@`
`29`	`29`
`30`	`30`	`/////////`
`31`	`31`
	`32`	`+// TODO`
	`33`	`+// - remove dialog or add help as help button`
	`34`	`+// - fix Diverging children when first show Selections`
	`35`	`+// - fix crash on Diverging?`
	`36`	`+`
`32`	`37`	`class TreeFilterProxyModel : public QSortFilterProxyModel`
`33`	`38`	`{`
`34`	`39`	`// Q_OBJECT`
`@@ -285,26 +290,24 @@ void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool`
`285`	`290`	`lblSchemeName->setText( "" );`
`286`	`291`	`populateVariants();`
`287`	`292`	`}`
	`293`	`+ updateListWidget( item );`
`288`	`294`	`lblSchemePath->setText( item->path() );`
`289`		`- lblCollectionInfo->setText( item->info() );`
	`295`	`+ lblCollectionInfo->setText( QString( "%1 (%2)" ).arg( item->info() ).arg( item->leafCount() ) );`
`290`	`296`	`updateCopyingInfo( mArchive->copyingInfo( mArchive->copyingFileName( item->path() ) ) );`
`291`		`- updateListWidget( item );`
`292`	`297`	`}`
`293`	`298`	`else if ( item->type() == QgsCptCityDataItem::Selection )`
`294`	`299`	`{`
`295`	`300`	`lblSchemePath->setText( "" );`
`296`		`- // lblCollectionName->setText( item->path() );`
`297`		`- lblCollectionInfo->setText( item->info() );`
`298`	`301`	`clearCopyingInfo( );`
`299`	`302`	`updateListWidget( item );`
	`303`	`+ lblCollectionInfo->setText( QString( "%1 (%2)" ).arg( item->info() ).arg( item->leafCount() ) );`
`300`	`304`	`}`
`301`	`305`	`else if ( item->type() == QgsCptCityDataItem::AllRamps )`
`302`	`306`	`{`
`303`	`307`	`lblSchemePath->setText( "" );`
`304`		`- // lblCollectionName->setText( item->path() );`
`305`	`308`	`clearCopyingInfo( );`
`306`	`309`	`updateListWidget( item );`
`307`		`- lblCollectionInfo->setText( tr( "All Ramps (%1)" ).arg( item->rowCount() ) );`
	`310`	`+ lblCollectionInfo->setText( tr( "All Ramps (%1)" ).arg( item->leafCount() ) );`
`308`	`311`	`}`
`309`	`312`	`else`
`310`	`313`	`{`