Skip to content

Commit

Permalink
Make bad layers handler dialog more generic so that it can handle oth…
Browse files Browse the repository at this point in the history 
…er layer types
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 10, 2021
1 parent c0269b8 commit b03508f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 68 deletions.
107 changes: 41 additions & 66 deletions src/app/qgshandlebadlayers.cpp
View file
Expand Up @@ -82,9 +82,6 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &layers )
{
setupUi( this );

mVectorFileFilter = QgsProviderRegistry::instance()->fileVectorFilters();
mRasterFileFilter = QgsProviderRegistry::instance()->fileRasterFilters();

mBrowseButton = new QPushButton( tr( "Browse" ) );
buttonBox->addButton( mBrowseButton, QDialogButtonBox::ActionRole );
mBrowseButton->setDisabled( true );
Expand Down Expand Up @@ -201,7 +198,7 @@ QString QgsHandleBadLayers::filename( int row )
if ( !providerFileBased )
return QString();

const QString provider = mLayerList->item( row, 2 )->text();
const QString provider = mLayerList->item( row, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();
const QString datasource = mLayerList->item( row, 4 )->text();

const QVariantMap parts = QgsProviderRegistry::instance()->decodeUri( provider, datasource );
Expand All @@ -213,40 +210,15 @@ void QgsHandleBadLayers::setFilename( int row, const QString &filename )
if ( !QFileInfo::exists( filename ) )
return;

QString type = mLayerList->item( row, 1 )->text();
QString provider = mLayerList->item( row, 2 )->text();
const QString provider = mLayerList->item( row, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();
QTableWidgetItem *item = mLayerList->item( row, 4 );

QString datasource = item->text();
const QString datasource = item->text();

if ( type == QLatin1String( "vector" ) )
{
if ( provider == QLatin1String( "spatialite" ) )
{
QgsDataSourceUri uri( datasource );
uri.setDatabase( filename );
datasource = uri.uri();
}
else if ( provider == QLatin1String( "ogr" ) )
{
QStringList theURIParts = datasource.split( '|' );
theURIParts[0] = filename;
datasource = theURIParts.join( QLatin1Char( '|' ) );
}
else if ( provider == QLatin1String( "delimitedtext" ) )
{
QUrl uriSource = QUrl::fromEncoded( datasource.toLatin1() );
QUrl uriDest = QUrl::fromLocalFile( filename );
uriDest.setQuery( QUrlQuery( uriSource ) );
datasource = QString::fromLatin1( uriDest.toEncoded() );
}
}
else
{
datasource = filename;
}
QVariantMap parts = QgsProviderRegistry::instance()->decodeUri( provider, datasource );
parts.insert( QStringLiteral( "path" ), filename );

item->setText( datasource );
item->setText( QgsProviderRegistry::instance()->encodeUri( provider, parts ) );
}

QList< int > QgsHandleBadLayers::fileBasedRows( bool selectedOnly )
Expand Down Expand Up @@ -293,18 +265,40 @@ void QgsHandleBadLayers::browseClicked()
if ( selectedRows.size() == 1 )
{
int row = selectedRows.at( 0 );
QString type = mLayerList->item( row, 1 )->text();

QString memoryQualifier, fileFilter;
if ( type == QLatin1String( "vector" ) )
{
memoryQualifier = QStringLiteral( "lastVectorFileFilter" );
fileFilter = mVectorFileFilter;
}
else
QString memoryQualifier;

const QgsMapLayerType layerType = static_cast< QgsMapLayerType >( mLayerList->item( row, 0 )->data( static_cast< int >( CustomRoles::LayerType ) ).toInt() );
const QString provider = mLayerList->item( row, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();

QString fileFilter;
switch ( layerType )
{
memoryQualifier = QStringLiteral( "lastRasterFileFilter" );
fileFilter = mRasterFileFilter;
case QgsMapLayerType::VectorLayer:
memoryQualifier = QStringLiteral( "lastVectorFileFilter" );
fileFilter = QgsProviderRegistry::instance()->providerMetadata( provider )->filters( QgsProviderMetadata::FilterType::FilterVector );
break;
case QgsMapLayerType::RasterLayer:
memoryQualifier = QStringLiteral( "lastRasterFileFilter" );
fileFilter = QgsProviderRegistry::instance()->providerMetadata( provider )->filters( QgsProviderMetadata::FilterType::FilterRaster );
break;
case QgsMapLayerType::MeshLayer:
memoryQualifier = QStringLiteral( "lastMeshFileFilter" );
fileFilter = QgsProviderRegistry::instance()->fileMeshFilters();
break;
case QgsMapLayerType::VectorTileLayer:
memoryQualifier = QStringLiteral( "lastVectorTileFileFilter" );
// not quite right -- but currently there's no generic method to get vector tile filters...
fileFilter = QgsProviderRegistry::instance()->fileVectorFilters();
break;
case QgsMapLayerType::PointCloudLayer:
memoryQualifier = QStringLiteral( "lastPointCloudFileFilter" );
fileFilter = QgsProviderRegistry::instance()->providerMetadata( provider )->filters( QgsProviderMetadata::FilterType::FilterPointCloud );
break;

case QgsMapLayerType::AnnotationLayer:
case QgsMapLayerType::PluginLayer:
break;
}

QString fn = filename( row );
Expand Down Expand Up @@ -413,17 +407,8 @@ void QgsHandleBadLayers::apply()
const QFileInfo dataInfo = QFileInfo( datasource );
const QString basepath = dataInfo.absoluteDir().path();
const QString longName = dataInfo.fileName();
QString provider = mLayerList->item( i, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();
const QString provider = mLayerList->item( i, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();
const QString fileType = mLayerList->item( i, 2 )->text();
if ( provider.toLower().toStdString() == "none" )
{
if ( fileType.toStdString() == "raster" )
provider = QStringLiteral( "gdal" );
else if ( fileType.toStdString() == "vector" )
provider = QStringLiteral( "ogr" );
else if ( fileType.contains( "mesh", Qt::CaseInsensitive ) )
provider = QStringLiteral( "mdal" );
}

QVariantMap providerMap = QgsProviderRegistry::instance()->decodeUri( provider, dataInfo.absoluteFilePath() );
if ( providerMap.contains( QStringLiteral( "path" ) ) )
Expand Down Expand Up @@ -571,7 +556,7 @@ void QgsHandleBadLayers::autoFind()

const QList<int> layersToFind = fileBasedRows( !mLayerList->selectedItems().isEmpty() );

QProgressDialog progressDialog( QObject::tr( "Searching files" ), 0, 1, layersToFind.size(), this, Qt::Dialog );
QProgressDialog progressDialog( QObject::tr( "Searching files" ), QObject::tr( "Cancel" ), 1, layersToFind.size(), this, Qt::Dialog );

for ( int i : qgis::as_const( layersToFind ) )
{
Expand All @@ -586,24 +571,14 @@ void QgsHandleBadLayers::autoFind()
const QFileInfo dataInfo = QFileInfo( datasource );
const QString basepath = dataInfo.absoluteDir().path();
const QString longName = dataInfo.fileName();
QString provider = mLayerList->item( i, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();
const QString fileType = mLayerList->item( i, 2 )->text();
const QString provider = mLayerList->item( i, 0 )->data( static_cast< int >( CustomRoles::Provider ) ).toString();

progressDialog.setValue( i );
QChar sentenceEnd = ( name.length() > 15 ) ? QChar( 0x2026 ) : '.';
progressDialog.setLabelText( QObject::tr( "Searching for file: %1 \n [ %2 of %3 ] " ).arg( name.left( 15 ) + sentenceEnd,
QString::number( i + 1 ), QString::number( layersToFind.size() ) ) );
progressDialog.open();

if ( provider.toLower() == QLatin1String( "none" ) )
{
if ( fileType == QLatin1String( "raster" ) )
provider = QStringLiteral( "gdal" );
else if ( fileType == QLatin1String( "vector" ) )
provider = QStringLiteral( "ogr" );
else if ( fileType.contains( "mesh", Qt::CaseInsensitive ) )
provider = QStringLiteral( "mdal" );
}
QVariantMap providerMap = QgsProviderRegistry::instance()->decodeUri( provider, dataInfo.absoluteFilePath() );
if ( providerMap.contains( QStringLiteral( "path" ) ) )
fileName = QFileInfo( providerMap[ QStringLiteral( "path" ) ].toString() ).fileName();
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgshandlebadlayers.h
View file
Expand Up @@ -86,8 +86,6 @@ class APP_EXPORT QgsHandleBadLayers
QPushButton *mApplyButton = nullptr;
QPushButton *mAutoFindButton = nullptr;
const QList<QDomNode> &mLayers;
QString mVectorFileFilter;
QString mRasterFileFilter;
// Registry of the original paths associated with a file as a backup
QHash <QString, QString > mOriginalFileBase;
// Keeps a registry of valid alternatives for a basepath
Expand Down

0 comments on commit b03508f

Please sign in to comment.