From 2258e24f8c703ee2a46b73c87be1721da2d8789c Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 18 May 2020 09:46:59 +1000 Subject: [PATCH] Fix dox test --- .../auto_generated/qgstemporalutils.sip.in | 18 ++++------ src/core/qgstemporalutils.h | 33 +++++++++---------- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/python/core/auto_generated/qgstemporalutils.sip.in b/python/core/auto_generated/qgstemporalutils.sip.in index 454a3ca570a..f772ee9610e 100644 --- a/python/core/auto_generated/qgstemporalutils.sip.in +++ b/python/core/auto_generated/qgstemporalutils.sip.in @@ -31,21 +31,15 @@ This method considers the temporal range available from layers contained within returns the maximal combined temporal extent of these layers. %End - class AnimationExportSettings -{ + struct AnimationExportSettings + { + QgsDateTimeRange animationRange; -%TypeHeaderCode -#include "qgstemporalutils.h" -%End - public: + QgsInterval frameDuration; - QgsDateTimeRange animationRange; + QString outputDirectory; - QgsInterval frameDuration; - - QString outputDirectory; - - QString fileNameTemplate; + QString fileNameTemplate; }; diff --git a/src/core/qgstemporalutils.h b/src/core/qgstemporalutils.h index 2c73a9b2a06..9997c53b5c8 100644 --- a/src/core/qgstemporalutils.h +++ b/src/core/qgstemporalutils.h @@ -44,27 +44,26 @@ class CORE_EXPORT QgsTemporalUtils */ static QgsDateTimeRange calculateTemporalRangeForProject( QgsProject *project ); - class AnimationExportSettings + //! Contains settings relating to exporting animations + struct AnimationExportSettings { - public: + //! Dictates the overall temporal range of the animation. + QgsDateTimeRange animationRange; - //! Dictates the overall temporal range of the animation. - QgsDateTimeRange animationRange; + //! Duration of individual export frames + QgsInterval frameDuration; - //! Duration of individual export frames - QgsInterval frameDuration; + //! Destination directory for created image files. + QString outputDirectory; - //! Destination directory for created image files. - QString outputDirectory; - - /** - * The filename template for exporting the frames. - * - * This must be in format prefix####.format, where number of - * \a # characters represents how many 0's should be left-padded to the frame number - * e.g. my###.jpg will create frames my001.jpg, my002.jpg, etc - */ - QString fileNameTemplate; + /** + * The filename template for exporting the frames. + * + * This must be in format prefix####.format, where number of + * \a # characters represents how many 0's should be left-padded to the frame number + * e.g. my###.jpg will create frames my001.jpg, my002.jpg, etc + */ + QString fileNameTemplate; };