Skip to content
Permalink
Browse files

backport PR 8987: allow drop 2dm files from system browser, allow non…

…-ascii filenames for mesh
  • Loading branch information
PeterPetrik committed Jan 30, 2019
1 parent 5f38b34 commit 95e45a3648162e2e3b1cafa3b821ab4758b70346
Showing with 8 additions and 1 deletion.
  1. +6 −0 src/app/qgisapp.cpp
  2. +1 −1 src/providers/mdal/qgsmdalprovider.cpp
  3. +1 −0 tests/src/providers/CMakeLists.txt
@@ -6329,6 +6329,12 @@ bool QgisApp::openLayer( const QString &fileName, bool allowInteractive )

CPLPopErrorHandler();

// Try to load as mesh layer after raster & vector
if ( !ok )
{
ok = addMeshLayer( fileName, fileInfo.completeBaseName(), "mdal" );
}

if ( !ok )
{
// we have no idea what this file is...
@@ -50,7 +50,7 @@ QgsCoordinateReferenceSystem QgsMdalProvider::crs() const
QgsMdalProvider::QgsMdalProvider( const QString &uri, const ProviderOptions &options )
: QgsMeshDataProvider( uri, options )
{
QByteArray curi = uri.toAscii();
QByteArray curi = uri.toUtf8();
mMeshH = MDAL_LoadMesh( curi.constData() );
if ( mMeshH )
{
@@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/symbology

0 comments on commit 95e45a3

Please sign in to comment.
You can’t perform that action at this time.