sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

use directory path and not item path (fixes #11871)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-01-16 21:25:50 +01:00
parent d11cc82b3f
commit ba4948e441
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsbrowsermodel.cpp
View File

@ -29,7 +29,7 @@
#include <QSettings>
QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem * item )
QgsBrowserWatcher::QgsBrowserWatcher( QgsDataItem *item )
: mItem( item )
{
}

8
src/core/qgsdataitem.cpp
View File

@ -768,7 +768,7 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren()
QString subdirPath = dir.absoluteFilePath( subdir );
QgsDebugMsgLevel( QString( "creating subdir: %1" ).arg( subdirPath ), 2 );
QString path = mPath + "/" + subdir; // may differ from subdirPath
QString path = mDirPath + "/" + subdir; // may differ from subdirPath
QgsDirectoryItem *item = new QgsDirectoryItem( this, subdir, subdirPath, path );
// propagate signals up to top
@ -1443,7 +1443,7 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString dirPath, QSt
return 0;
}
const QStringList & QgsZipItem::getZipFileList()
const QStringList &QgsZipItem::getZipFileList()
{
if ( ! mZipFileList.isEmpty() )
return mZipFileList;
@ -1452,7 +1452,7 @@ const QStringList & QgsZipItem::getZipFileList()
QSettings settings;
QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
QgsDebugMsgLevel( QString( "mFIlePath = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( mFilePath ).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" )
@ -1461,7 +1461,7 @@ const QStringList & QgsZipItem::getZipFileList()
}
// get list of files inside zip file
QgsDebugMsgLevel( QString( "Open file %1 with gdal vsi" ).arg( mVsiPrefix + path() ), 3 );
QgsDebugMsgLevel( QString( "Open file %1 with gdal vsi" ).arg( mVsiPrefix + mFilePath ), 3 );
char **papszSiblingFiles = VSIReadDirRecursive1( QString( mVsiPrefix + mFilePath ).toLocal8Bit().constData() );
if ( papszSiblingFiles )
{

2
src/core/qgsdataitem.h
View File

@ -431,7 +431,7 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem
public:
QgsZipItem( QgsDataItem* parent, QString name, QString path );
QgsZipItem( QgsDataItem* parent, QString name, QString dirPath, QString path );
QgsZipItem( QgsDataItem* parent, QString name, QString filePath, QString path );
~QgsZipItem();
QVector<QgsDataItem*> createChildren() override;