Skip to content
Permalink
Browse files

Fix tests

  • Loading branch information
nirvn committed May 18, 2020
1 parent f55de3c commit de918fde53dc31e5bb7debcdac1d6727f7c9a716
@@ -41,6 +41,8 @@ returns the maximal combined temporal extent of these layers.

QString fileNameTemplate;

QList<QgsMapDecoration *> decorations;

};

static bool exportAnimation( const QgsMapSettings &mapSettings, const AnimationExportSettings &settings, QString &error /Out/, QgsFeedback *feedback = 0 );
@@ -2121,8 +2121,8 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa
! dependency.layerId.isEmpty() )
{
const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly(
QgsProject::instance(),
QgsVectorLayerRef::MatchType::Name ) };
QgsProject::instance(),
QgsVectorLayerRef::MatchType::Name ) };
if ( ! depVl || ! depVl->isValid() )
{
brokenDependencies.append( dependency );
@@ -2272,8 +2272,8 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S
if ( ! loaded )
{
const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." )
.arg( vl->name() )
.arg( dependency.name ) };
.arg( vl->name() )
.arg( dependency.name ) };
messageBar()->pushWarning( tr( "Missing layer form dependency" ), msg );
}
else
@@ -7535,7 +7535,7 @@ QList< QgsDecorationItem * > QgisApp::activeDecorationItems()
decorations << decoration;
}
}
return decorations;
return decorations;
}
void QgisApp::saveMapAsImage()
{
@@ -44,7 +44,7 @@ class APP_EXPORT QgsAnimationExportDialog: public QDialog, private Ui::QgsAnimat
/**
* Constructor for QgsAnimationExportDialog
*/
QgsAnimationExportDialog( QWidget *parent = nullptr,
QgsAnimationExportDialog( QWidget *parent = nullptr,
QgsMapCanvas *mapCanvas = nullptr,
const QList< QgsDecorationItem * > &decorations = QList< QgsDecorationItem * >() );

@@ -119,7 +119,7 @@ bool QgsTemporalUtils::exportAnimation( const QgsMapSettings &mapSettings, const
QgsMapRendererCustomPainterJob job( ms, &p );
job.start();
job.waitForFinished();

QgsRenderContext context = QgsRenderContext::fromMapSettings( ms );
context.setPainter( &p );

@@ -65,7 +65,7 @@ class CORE_EXPORT QgsTemporalUtils
* e.g. my###.jpg will create frames my001.jpg, my002.jpg, etc
*/
QString fileNameTemplate;

//! List of decorations to draw onto exported frames.
QList<QgsMapDecoration *> decorations;

0 comments on commit de918fd

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