Skip to content

Commit

Permalink
Render WFS layers added when 'Keep dialog open' is enabled (#14935)
Browse files Browse the repository at this point in the history
And remove a few left overs (MapCRS, MapExtent) that were only used
by the provider in QGIS <= 2.14.

It is not completely obvious why the canevas refresh was disabled
before while the dialog is opened. Perhaps a conflict with the
previous Load GML progress dialog that was modal ?
  • Loading branch information
rouault committed Jun 1, 2016
1 parent ba0fdfa commit 47a301c
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4062,11 +4062,6 @@ void QgisApp::addWcsLayer()

void QgisApp::addWfsLayer()
{
if ( !mMapCanvas )
{
return;
}

QgsDebugMsg( "about to addWfsLayer" );

// TODO: QDialog for now, switch to QWidget in future
Expand All @@ -4079,17 +4074,7 @@ void QgisApp::addWfsLayer()
connect( wfss, SIGNAL( addWfsLayer( QString, QString ) ),
this, SLOT( addWfsLayer( QString, QString ) ) );

//re-enable wfs with extent setting: pass canvas info to source select
wfss->setProperty( "MapExtent", mMapCanvas->extent().toString() );
if ( mMapCanvas->mapSettings().hasCrsTransformEnabled() )
{ //if "on the fly" reprojection is active, pass canvas CRS
wfss->setProperty( "MapCRS", mMapCanvas->mapSettings().destinationCrs().authid() );
}

bool bkRenderFlag = mMapCanvas->renderFlag();
mMapCanvas->setRenderFlag( false );
wfss->exec();
mMapCanvas->setRenderFlag( bkRenderFlag );
delete wfss;
}

Expand Down

0 comments on commit 47a301c

Please sign in to comment.