@@ -4437,10 +4437,11 @@ void QgisApp::addAfsLayer()
4437
4437
connect ( afss, SIGNAL ( addLayer ( QString, QString ) ),
4438
4438
this , SLOT ( addAfsLayer ( QString, QString ) ) );
4439
4439
4440
- bool bkRenderFlag = mapCanvas ()->renderFlag ();
4441
- mapCanvas ()->setRenderFlag ( false );
4440
+ bool wasFrozen = mapCanvas ()->isFrozen ();
4441
+ mapCanvas ()->freeze ( true );
4442
4442
afss->exec ();
4443
- mapCanvas ()->setRenderFlag ( bkRenderFlag );
4443
+ if ( !wasFrozen )
4444
+ mapCanvas ()->freeze ( false );
4444
4445
delete afss;
4445
4446
}
4446
4447
@@ -4470,10 +4471,11 @@ void QgisApp::addAmsLayer()
4470
4471
connect ( amss, SIGNAL ( addLayer ( QString, QString ) ),
4471
4472
this , SLOT ( addAmsLayer ( QString, QString ) ) );
4472
4473
4473
- bool bkRenderFlag = mapCanvas ()->renderFlag ();
4474
- mapCanvas ()->setRenderFlag ( false );
4474
+ bool wasFrozen = mapCanvas ()->isFrozen ();
4475
+ mapCanvas ()->freeze ( true );
4475
4476
amss->exec ();
4476
- mapCanvas ()->setRenderFlag ( bkRenderFlag );
4477
+ if ( !wasFrozen )
4478
+ mapCanvas ()->freeze ( false );
4477
4479
delete amss;
4478
4480
}
4479
4481
@@ -5627,13 +5629,12 @@ void QgisApp::toggleFullScreen()
5627
5629
// showMaxmized() is a work-around. Turn off rendering for this as it
5628
5630
// would otherwise cause two re-renders of the map, which can take a
5629
5631
// long time.
5630
- bool renderFlag = mapCanvas ()->renderFlag ();
5631
- if ( renderFlag )
5632
- mapCanvas ()->setRenderFlag ( false );
5632
+ bool wasFrozen = mapCanvas ()->isFrozen ();
5633
+ mapCanvas ()->freeze ();
5633
5634
showNormal ();
5634
5635
showMaximized ();
5635
- if ( renderFlag )
5636
- mapCanvas ()->setRenderFlag ( true );
5636
+ if ( !wasFrozen )
5637
+ mapCanvas ()->freeze ( false );
5637
5638
mPrevScreenModeMaximized = false ;
5638
5639
}
5639
5640
else
@@ -7393,9 +7394,8 @@ void QgisApp::selectByRadius()
7393
7394
void QgisApp::deselectAll ()
7394
7395
{
7395
7396
// Turn off rendering to improve speed.
7396
- bool renderFlagState = mMapCanvas ->renderFlag ();
7397
- if ( renderFlagState )
7398
- mMapCanvas ->setRenderFlag ( false );
7397
+ bool wasFrozen = mMapCanvas ->isFrozen ();
7398
+ mMapCanvas ->freeze ();
7399
7399
7400
7400
QMap<QString, QgsMapLayer*> layers = QgsProject::instance ()->mapLayers ();
7401
7401
for ( QMap<QString, QgsMapLayer*>::iterator it = layers.begin (); it != layers.end (); ++it )
@@ -7408,8 +7408,8 @@ void QgisApp::deselectAll()
7408
7408
}
7409
7409
7410
7410
// Turn on rendering (if it was on previously)
7411
- if ( renderFlagState )
7412
- mMapCanvas ->setRenderFlag ( true );
7411
+ if ( !wasFrozen )
7412
+ mMapCanvas ->freeze ( false );
7413
7413
}
7414
7414
7415
7415
void QgisApp::invertSelection ()
@@ -7426,15 +7426,14 @@ void QgisApp::invertSelection()
7426
7426
}
7427
7427
7428
7428
// Turn off rendering to improve speed.
7429
- bool renderFlagState = mMapCanvas ->renderFlag ();
7430
- if ( renderFlagState )
7431
- mMapCanvas ->setRenderFlag ( false );
7429
+ bool wasFrozen = mMapCanvas ->isFrozen ();
7430
+ mMapCanvas ->freeze ();
7432
7431
7433
7432
vlayer->invertSelection ();
7434
7433
7435
7434
// Turn on rendering (if it was on previously)
7436
- if ( renderFlagState )
7437
- mMapCanvas ->setRenderFlag ( true );
7435
+ if ( !wasFrozen )
7436
+ mMapCanvas ->freeze ( false );
7438
7437
}
7439
7438
7440
7439
void QgisApp::selectAll ()
@@ -7451,15 +7450,14 @@ void QgisApp::selectAll()
7451
7450
}
7452
7451
7453
7452
// Turn off rendering to improve speed.
7454
- bool renderFlagState = mMapCanvas ->renderFlag ();
7455
- if ( renderFlagState )
7456
- mMapCanvas ->setRenderFlag ( false );
7453
+ bool wasFrozen = mMapCanvas ->isFrozen ();
7454
+ mMapCanvas ->freeze ();
7457
7455
7458
7456
vlayer->selectAll ();
7459
7457
7460
7458
// Turn on rendering (if it was on previously)
7461
- if ( renderFlagState )
7462
- mMapCanvas ->setRenderFlag ( true );
7459
+ if ( !wasFrozen )
7460
+ mMapCanvas ->freeze ( false );
7463
7461
}
7464
7462
7465
7463
void QgisApp::selectByExpression ()
0 commit comments