Skip to content

Commit 61c48be

Browse files
committed
Deprecated several map canvas signals related to rendering
1 parent 106b2cc commit 61c48be

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

src/gui/qgsmapcanvas.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,6 @@ void QgsMapCanvas::refresh()
433433
// Tell the user we're going to be a while
434434
QApplication::setOverrideCursor( Qt::WaitCursor );
435435
436-
emit renderStarting();
437-
438436
mMap->render();
439437
440438
mDirty = false;
@@ -445,19 +443,12 @@ void QgsMapCanvas::refresh()
445443
emit renderComplete( &p );
446444
p.end();
447445
448-
// notifies current map tool
449-
if ( mMapTool )
450-
mMapTool->renderComplete();
451-
452446
// Tell the user we've finished going to be a while
453447
QApplication::restoreOverrideCursor();
454448
}
455449
456450
mDrawing = false;
457451
458-
// Done refreshing
459-
emit mapCanvasRefreshed();
460-
461452
if ( logRefresh )
462453
{
463454
QString logMsg = tr( "Canvas refresh: %1 ms" ).arg( t.elapsed() );

src/gui/qgsmapcanvas.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
333333

334334
signals:
335335
/** Let the owner know how far we are with render operations */
336-
void setProgress( int, int );
336+
//! @deprecated since 2.1 - already unused in 2.0 anyway
337+
Q_DECL_DEPRECATED void setProgress( int, int );
337338

338339
/** emits current mouse position
339340
\note changed in 1.3 */
@@ -353,15 +354,19 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
353354
being rendered onto a pixmap other than the mapCanvas own pixmap member.
354355
355356
*/
356-
void renderComplete( QPainter * );
357+
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
358+
//! - additional drawing shall be done directly within the renderer job or independently as a map canvas item
359+
Q_DECL_DEPRECATED void renderComplete( QPainter * );
357360

358361
/** Emitted when canvas finished a refresh request.
359362
\note Added in 2.0 */
360-
void mapCanvasRefreshed();
363+
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
364+
Q_DECL_DEPRECATED void mapCanvasRefreshed();
361365

362366
/** Emitted when the canvas is about to be rendered.
363367
\note Added in 1.5 */
364-
void renderStarting();
368+
//! @deprecated since 2.1 - anything related to rendering progress is not visible outside of map canvas
369+
Q_DECL_DEPRECATED void renderStarting();
365370

366371
//! Emitted when a new set of layers has been received
367372
void layersChanged();

src/plugins/grass/qgsgrassregion.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ QgsGrassRegion::QgsGrassRegion( QgsGrassPlugin *plugin, QgisInterface *iface,
258258

259259
refreshGui();
260260

261-
connect( mCanvas, SIGNAL( renderComplete( QPainter * ) ), this, SLOT( postRender( QPainter * ) ) );
262-
263261
// Connect entries
264262
connect( mNorth, SIGNAL( editingFinished() ), this, SLOT( northChanged() ) );
265263
connect( mSouth, SIGNAL( editingFinished() ), this, SLOT( southChanged() ) );

0 commit comments

Comments
 (0)