do not populate items in rowCount(), use canFetchMore() and fetchMore() instead

etiennesky · etiennesky · commit 3c07dd02e1fa · 2012-11-03T19:19:15.000-02:00
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -399,3 +399,19 @@ QgsDataItem *QgsBrowserModel::dataItem( const QModelIndex &idx ) const
   Q_ASSERT( !v || d );
   return d;
 }
+
+bool QgsBrowserModel::canFetchMore( const QModelIndex & parent ) const
+{
+  QgsDataItem* item = dataItem( parent );
+  // if ( item )
+  //   QgsDebugMsg( QString( "path = %1 canFetchMore = %2" ).arg( item->path() ).arg( item && ! item->isPopulated() ) );
+  return ( item && ! item->isPopulated() );
+}
+
+void QgsBrowserModel::fetchMore( const QModelIndex & parent )
+{
+  QgsDataItem* item = dataItem( parent );
+  if ( item )
+    item->populate();
+  QgsDebugMsg( "path = " + item->path() );
+}
diff --git a/src/core/qgsbrowsermodel.h b/src/core/qgsbrowsermodel.h
@@ -89,7 +89,11 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
 
     void connectItem( QgsDataItem *item );
 
+    bool canFetchMore( const QModelIndex & parent ) const;
+    void fetchMore( const QModelIndex & parent );
+
   public slots:
+
     void beginInsertItems( QgsDataItem *parent, int first, int last );
     void endInsertItems();
     void beginRemoveItems( QgsDataItem *parent, int first, int last );
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -203,8 +203,8 @@ void QgsDataItem::populate()
 
 int QgsDataItem::rowCount()
 {
-  if ( !mPopulated )
-    populate();
+  // if ( !mPopulated )
+  //   populate();
   return mChildren.size();
 }
 bool QgsDataItem::hasChildren()
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -67,6 +67,7 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     // Populate children using children vector created by createChildren()
     virtual void populate();
+    bool isPopulated() { return mPopulated; }
 
     // Insert new child using alphabetical order based on mName, emits necessary signal to model before and after, sets parent and connects signals
     // refresh - refresh populated item, emit signals to model

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ void QgsDataItem::populate()`
`203`	`203`
`204`	`204`	`int QgsDataItem::rowCount()`
`205`	`205`	`{`
`206`		`- if ( !mPopulated )`
`207`		`- populate();`
	`206`	`+ // if ( !mPopulated )`
	`207`	`+ // populate();`
`208`	`208`	`return mChildren.size();`
`209`	`209`	`}`
`210`	`210`	`bool QgsDataItem::hasChildren()`