sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4876 from nyalldawson/upstream_ftw

Browse Source 
Upstream some sourcepole fork commits
This commit is contained in:
Nyall Dawson 2017-07-18 11:02:52 +10:00 committed by GitHub
commit d70f53c405
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/main.cpp
View File

@ -1034,7 +1034,7 @@ int main( int argc, char *argv[] )
}
else
{
qWarning( "loading of qgis translation failed [%s]", QStringLiteral( "%1/qgis_%2" ).arg( i18nPath, myTranslationCode ).toLocal8Bit().constData() );
QgsDebugMsg( QStringLiteral( "loading of qgis translation failed %1/qgis_%2" ).arg( i18nPath, myTranslationCode ) );
}
/* Translation file for Qt.
@ -1048,7 +1048,7 @@ int main( int argc, char *argv[] )
}
else
{
qWarning( "loading of qt translation failed [%s]", QStringLiteral( "%1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ).toLocal8Bit().constData() );
QgsDebugMsg( QStringLiteral( "loading of qt translation failed %1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ) );
}
}

6
src/gui/qgsmapcanvas.cpp
View File

@ -133,6 +133,10 @@ QgsMapCanvas::QgsMapCanvas( QWidget *parent )
mResizeTimer->setSingleShot( true );
connect( mResizeTimer, &QTimer::timeout, this, &QgsMapCanvas::refresh );
mRefreshTimer = new QTimer( this );
mRefreshTimer->setSingleShot( true );
connect( mRefreshTimer, &QTimer::timeout, this, &QgsMapCanvas::refreshMap );
// create map canvas item which will show the map
mMap = new QgsMapCanvasMap( this );
@ -493,7 +497,7 @@ void QgsMapCanvas::refresh()
QgsDebugMsg( "CANVAS refresh scheduling" );
// schedule a refresh
QTimer::singleShot( 1, this, SLOT( refreshMap() ) );
mRefreshTimer->start( 1 );
} // refresh
void QgsMapCanvas::refreshMap()

1
src/gui/qgsmapcanvas.h
View File

@ -814,6 +814,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
QgsMapRendererCache *mCache = nullptr;
QTimer *mResizeTimer = nullptr;
QTimer *mRefreshTimer = nullptr;
QgsPreviewEffect *mPreviewEffect = nullptr;