Skip to content

Commit

Permalink
browser restore state fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Dec 15, 2014
1 parent ac10e69 commit f79dbcd
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 42 deletions.
7 changes: 5 additions & 2 deletions src/app/qgsbrowserdockwidget.cpp
View file
Expand Up @@ -296,7 +296,7 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
mModel = new QgsBrowserModel( mBrowserView );

connect( QgisApp::instance(), SIGNAL( newProject() ), mModel, SLOT( updateProjectHome() ) );
connect( mModel, SIGNAL( fetchFinished( const QModelIndex & ) ), SLOT( fetchFinished( const QModelIndex & ) ) );
connect( mModel, SIGNAL( stateChanged( const QModelIndex &, QgsDataItem::State ) ), SLOT( stateChanged( const QModelIndex &, QgsDataItem::State ) ) );

mProxyModel = new QgsBrowserTreeFilterProxyModel( this );
mProxyModel->setBrowserModel( mModel );
Expand Down Expand Up @@ -744,12 +744,15 @@ void QgsBrowserDockWidget::restoreState()
}
}

void QgsBrowserDockWidget::fetchFinished( const QModelIndex & index )
void QgsBrowserDockWidget::stateChanged( const QModelIndex & index, QgsDataItem::State oldState )
{
QgsDataItem *item = mModel->dataItem( index );
if ( !item )
return;

if ( oldState != QgsDataItem::Populating || item->state() != QgsDataItem::Populated )
return;

QgsDebugMsg( "path = " + item->path() );

QSettings settings;
Expand Down
4 changes: 3 additions & 1 deletion src/app/qgsbrowserdockwidget.h
View file
Expand Up @@ -18,6 +18,8 @@
#include <QDockWidget>
#include <ui_qgsbrowserdockwidgetbase.h>

#include "qgsdataitem.h"

class QgsBrowserModel;
class QModelIndex;
class QgsBrowserTreeView;
Expand Down Expand Up @@ -54,7 +56,7 @@ class APP_EXPORT QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrows
void showProperties();
void toggleFastScan();

void fetchFinished( const QModelIndex & index );
void stateChanged( const QModelIndex & index, QgsDataItem::State oldState );

protected:
void refreshModel( const QModelIndex& index );
Expand Down
17 changes: 15 additions & 2 deletions src/core/qgsbrowsermodel.cpp
View file
Expand Up @@ -392,14 +392,25 @@ void QgsBrowserModel::endRemoveItems()
QgsDebugMsgLevel( "Entered", 3 );
endRemoveRows();
}
void QgsBrowserModel::dataItemChanged( QgsDataItem * item )
void QgsBrowserModel::itemDataChanged( QgsDataItem * item )
{
QgsDebugMsgLevel( "Entered", 3 );
QModelIndex idx = findItem( item );
if ( !idx.isValid() )
return;
emit dataChanged( idx, idx );
}
void QgsBrowserModel::itemStateChanged( QgsDataItem * item, QgsDataItem::State oldState )
{
QgsDebugMsg( "Entered" );
if ( !item )
return;
QModelIndex idx = findItem( item );
if ( !idx.isValid() )
return;
QgsDebugMsg( QString( "item %1 state changed %2 -> %3" ).arg( item->path() ).arg( oldState ).arg( item->state() ) );
emit stateChanged( idx, oldState );
}
void QgsBrowserModel::connectItem( QgsDataItem* item )
{
connect( item, SIGNAL( beginInsertItems( QgsDataItem*, int, int ) ),
Expand All @@ -411,7 +422,9 @@ void QgsBrowserModel::connectItem( QgsDataItem* item )
connect( item, SIGNAL( endRemoveItems() ),
this, SLOT( endRemoveItems() ) );
connect( item, SIGNAL( dataChanged( QgsDataItem* ) ),
this, SLOT( dataItemChanged( QgsDataItem* ) ) );
this, SLOT( itemDataChanged( QgsDataItem* ) ) );
connect( item, SIGNAL( stateChanged( QgsDataItem*, QgsDataItem::State ) ),
this, SLOT( itemStateChanged( QgsDataItem*, QgsDataItem::State ) ) );
}

QStringList QgsBrowserModel::mimeTypes() const
Expand Down
5 changes: 3 additions & 2 deletions src/core/qgsbrowsermodel.h
View file
Expand Up @@ -116,7 +116,7 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel

signals:
/** Emitted when item children fetch was finished */
void fetchFinished( const QModelIndex & index );
void stateChanged( const QModelIndex & index, QgsDataItem::State oldState );

public slots:
// Reload the whole model
Expand All @@ -125,7 +125,8 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
void endInsertItems();
void beginRemoveItems( QgsDataItem *parent, int first, int last );
void endRemoveItems();
void dataItemChanged( QgsDataItem * item );
void itemDataChanged( QgsDataItem * item );
void itemStateChanged( QgsDataItem * item, QgsDataItem::State oldState );

void addFavouriteDirectory( QString favDir );
void removeFavourite( const QModelIndex &index );
Expand Down
79 changes: 49 additions & 30 deletions src/core/qgsdataitem.cpp
View file
Expand Up @@ -151,9 +151,9 @@ const QIcon &QgsZipItem::iconZip()

QMap<QString, QIcon> QgsDataItem::mIconMap = QMap<QString, QIcon>();

int QgsDataItem::mLoadingCount = 0;
QMovie * QgsDataItem::mLoadingMovie = 0;
QIcon QgsDataItem::mLoadingIcon = QIcon();
int QgsDataItem::mPopulatingCount = 0;
QMovie * QgsDataItem::mPopulatingMovie = 0;
QIcon QgsDataItem::mPopulatingIcon = QIcon();

QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path )
// Do not pass parent to QObject, Qt would delete this when parent is deleted
Expand All @@ -177,7 +177,7 @@ QgsDataItem::~QgsDataItem()
QIcon QgsDataItem::icon()
{
if ( state() == Populating )
return mLoadingIcon;
return mPopulatingIcon;

if ( !mIcon.isNull() )
return mIcon;
Expand Down Expand Up @@ -215,6 +215,14 @@ void QgsDataItem::emitDataChanged()
emit dataChanged( this );
}

void QgsDataItem::emitStateChanged( QgsDataItem* item, QgsDataItem::State oldState )
{
if ( !item )
return;
QgsDebugMsg( QString( "item %1 state changed %2 -> %3" ).arg( item->path() ).arg( oldState ).arg( item->state() ) );
emit stateChanged( item, oldState );
}

QVector<QgsDataItem*> QgsDataItem::createChildren()
{
return QVector<QgsDataItem*>();
Expand Down Expand Up @@ -248,10 +256,10 @@ void QgsDataItem::populate()
QVector<QgsDataItem*> QgsDataItem::runCreateChildren( QgsDataItem* item )
{
QgsDebugMsg( "path = " + item->path() );
//QTime time;
//time.start();
QTime time;
time.start();
QVector <QgsDataItem*> children = item->createChildren();
//QgsDebugMsg( QString( "%1 children created in %2 ms" ).arg( children.size() ).arg( time.elapsed() ) );
QgsDebugMsg( QString( "%1 children created in %2 ms" ).arg( children.size() ).arg( time.elapsed() ) );
// Children objects must be pushed to main thread.
foreach ( QgsDataItem* child, children )
{
Expand Down Expand Up @@ -425,6 +433,8 @@ void QgsDataItem::addChildItem( QgsDataItem * child, bool refresh )
this, SLOT( emitEndRemoveItems() ) );
connect( child, SIGNAL( dataChanged( QgsDataItem* ) ),
this, SLOT( emitDataChanged( QgsDataItem* ) ) );
connect( child, SIGNAL( stateChanged( QgsDataItem*, QgsDataItem::State ) ),
this, SLOT( emitStateChanged( QgsDataItem*, QgsDataItem::State ) ) );

if ( refresh )
emit endInsertItems();
Expand Down Expand Up @@ -458,6 +468,8 @@ QgsDataItem * QgsDataItem::removeChildItem( QgsDataItem * child )
this, SLOT( emitEndRemoveItems() ) );
disconnect( child, SIGNAL( dataChanged( QgsDataItem* ) ),
this, SLOT( emitDataChanged( QgsDataItem* ) ) );
disconnect( child, SIGNAL( stateChanged( QgsDataItem*, QgsDataItem::State ) ),
this, SLOT( emitStateChanged( QgsDataItem*, QgsDataItem::State ) ) );
child->setParent( 0 );
return child;
}
Expand All @@ -483,9 +495,9 @@ bool QgsDataItem::equal( const QgsDataItem *other )
return false;
}

void QgsDataItem::setLoadingIcon()
void QgsDataItem::setPopulatingIcon()
{
mLoadingIcon = QIcon( mLoadingMovie->currentPixmap() );
mPopulatingIcon = QIcon( mPopulatingMovie->currentPixmap() );
}

QgsDataItem::State QgsDataItem::state() const
Expand All @@ -499,37 +511,42 @@ QgsDataItem::State QgsDataItem::state() const

void QgsDataItem::setState( State state )
{
QgsDebugMsg( QString( "item %1 set state %2 -> %3" ).arg( path() ).arg( this->state() ).arg( state ) );
if ( state == mState )
return;

State oldState = mState;

if ( state == Populating ) // start loading
{
if ( !mLoadingMovie )
if ( !mPopulatingMovie )
{
// QApplication as parent to ensure that it is deleted before QApplication
mLoadingMovie = new QMovie( QApplication::instance() );
mLoadingMovie->setFileName( QgsApplication::iconPath( "/mIconLoading.gif" ) );
mLoadingMovie->setCacheMode( QMovie::CacheAll );
connect( mLoadingMovie, SIGNAL( frameChanged( int ) ), SLOT( setLoadingIcon() ) );
mPopulatingMovie = new QMovie( QApplication::instance() );
mPopulatingMovie->setFileName( QgsApplication::iconPath( "/mIconLoading.gif" ) );
mPopulatingMovie->setCacheMode( QMovie::CacheAll );
connect( mPopulatingMovie, SIGNAL( frameChanged( int ) ), SLOT( setPopulatingIcon() ) );
}
connect( mLoadingMovie, SIGNAL( frameChanged( int ) ), SLOT( emitDataChanged() ) );
mLoadingCount++;
mLoadingMovie->setPaused( false );
connect( mPopulatingMovie, SIGNAL( frameChanged( int ) ), SLOT( emitDataChanged() ) );
mPopulatingCount++;
mPopulatingMovie->setPaused( false );
}
else if ( mState == Populating && mLoadingMovie ) // stop loading
else if ( mState == Populating && mPopulatingMovie ) // stop loading
{
disconnect( mLoadingMovie, SIGNAL( frameChanged( int ) ), this, SLOT( emitDataChanged() ) );
mLoadingCount--;
if ( mLoadingCount == 0 )
disconnect( mPopulatingMovie, SIGNAL( frameChanged( int ) ), this, SLOT( emitDataChanged() ) );
mPopulatingCount--;
if ( mPopulatingCount == 0 )
{
mLoadingMovie->setPaused( true );
mPopulatingMovie->setPaused( true );
}
}

mState = state;
// for backward compatibility (if subclass access mPopulated directly)
// TODO: remove in 3.0
mPopulated = state == Populated;

emit stateChanged( this, oldState );
}

// ---------------------------------------------------------------------
Expand Down Expand Up @@ -657,6 +674,8 @@ QgsDirectoryItem::~QgsDirectoryItem()

QIcon QgsDirectoryItem::icon()
{
if ( state() == Populating )
return populatingIcon();
return iconDir();
}

Expand Down Expand Up @@ -969,13 +988,13 @@ QVector<dataItem_t *> QgsZipItem::mDataItemPtr = QVector<dataItem_t*>();
QgsZipItem::QgsZipItem( QgsDataItem* parent, QString name, QString path )
: QgsDataCollectionItem( parent, name, path )
{
mDirPath = path;
mFilePath = path;
init();
}

QgsZipItem::QgsZipItem( QgsDataItem* parent, QString name, QString dirPath, QString path )
QgsZipItem::QgsZipItem( QgsDataItem* parent, QString name, QString filePath, QString path )
: QgsDataCollectionItem( parent, name, path )
, mDirPath( dirPath )
, mFilePath( filePath )
{
init();
}
Expand All @@ -984,7 +1003,7 @@ void QgsZipItem::init()
{
mType = Collection; //Zip??
mIconName = "/mIconZip.png";
mVsiPrefix = vsiPrefix( mDirPath );
mVsiPrefix = vsiPrefix( mFilePath );

if ( mProviderNames.size() == 0 )
{
Expand Down Expand Up @@ -1137,7 +1156,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren()
foreach ( QString fileName, mZipFileList )
{
QFileInfo info( fileName );
tmpPath = mVsiPrefix + path() + "/" + fileName;
tmpPath = mVsiPrefix + mFilePath + "/" + fileName;
QgsDebugMsgLevel( "tmpPath = " + tmpPath, 3 );

// foreach( dataItem_t *dataItem, mDataItemPtr )
Expand Down Expand Up @@ -1295,7 +1314,7 @@ const QStringList & QgsZipItem::getZipFileList()
QSettings settings;
QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();

QgsDebugMsgLevel( QString( "mDirPath = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( mDirPath ).arg( name() ).arg( scanZipSetting ).arg( mVsiPrefix ), 3 );
QgsDebugMsgLevel( QString( "mFIlePath = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( mFilePath ).arg( name() ).arg( scanZipSetting ).arg( mVsiPrefix ), 3 );

// if scanZipBrowser == no: skip to the next file
if ( scanZipSetting == "no" )
Expand All @@ -1305,7 +1324,7 @@ const QStringList & QgsZipItem::getZipFileList()

// get list of files inside zip file
QgsDebugMsgLevel( QString( "Open file %1 with gdal vsi" ).arg( mVsiPrefix + path() ), 3 );
char **papszSiblingFiles = VSIReadDirRecursive1( QString( mVsiPrefix + mDirPath ).toLocal8Bit().constData() );
char **papszSiblingFiles = VSIReadDirRecursive1( QString( mVsiPrefix + mFilePath ).toLocal8Bit().constData() );
if ( papszSiblingFiles )
{
for ( int i = 0; i < CSLCount( papszSiblingFiles ); i++ )
Expand All @@ -1320,7 +1339,7 @@ const QStringList & QgsZipItem::getZipFileList()
}
else
{
QgsDebugMsg( QString( "Error reading %1" ).arg( mDirPath ) );
QgsDebugMsg( QString( "Error reading %1" ).arg( mFilePath ) );
}

return mZipFileList;
Expand Down
15 changes: 10 additions & 5 deletions src/core/qgsdataitem.h
View file
Expand Up @@ -41,6 +41,8 @@ typedef QgsDataItem * dataItem_t( QString, QgsDataItem* );
class CORE_EXPORT QgsDataItem : public QObject
{
Q_OBJECT
Q_ENUMS( Type )
Q_ENUMS( State )
public:
enum Type
{
Expand Down Expand Up @@ -157,6 +159,7 @@ class CORE_EXPORT QgsDataItem : public QObject
protected:
virtual void populate( QVector<QgsDataItem*> children );
virtual void refresh( QVector<QgsDataItem*> children );
QIcon populatingIcon() { return mPopulatingIcon; }

Type mType;
Capabilities mCapabilities;
Expand All @@ -183,24 +186,26 @@ class CORE_EXPORT QgsDataItem : public QObject
void emitEndRemoveItems();
void emitDataChanged( QgsDataItem* item );
void emitDataChanged( );
void emitStateChanged( QgsDataItem* item, QgsDataItem::State oldState );
void childrenCreated();
void setLoadingIcon();
void setPopulatingIcon();

signals:
void beginInsertItems( QgsDataItem* parent, int first, int last );
void endInsertItems();
void beginRemoveItems( QgsDataItem* parent, int first, int last );
void endRemoveItems();
void dataChanged( QgsDataItem * item );
void stateChanged( QgsDataItem * item, QgsDataItem::State oldState );

private:
static QVector<QgsDataItem*> runCreateChildren( QgsDataItem* item );

QFutureWatcher< QVector <QgsDataItem*> > *mWatcher;
// number of items currently in loading (populating) state
static int mLoadingCount;
static QMovie * mLoadingMovie;
static QIcon mLoadingIcon;
static int mPopulatingCount;
static QMovie * mPopulatingMovie;
static QIcon mPopulatingIcon;
};

Q_DECLARE_OPERATORS_FOR_FLAGS( QgsDataItem::Capabilities )
Expand Down Expand Up @@ -366,7 +371,7 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem
Q_OBJECT

protected:
QString mDirPath;
QString mFilePath;
QString mVsiPrefix;
QStringList mZipFileList;

Expand Down

0 comments on commit f79dbcd

Please sign in to comment.