From ffae79b7d075a00d59e6d91664e771e3412ce01d Mon Sep 17 00:00:00 2001 From: Marco Hugentobler Date: Tue, 22 Jan 2019 16:11:04 +0100 Subject: [PATCH] Consider feedback --- .../layout/qgslayoutitemmap.sip.in | 5 +-- src/core/layout/qgslayoutitemmap.h | 4 +-- src/core/qgsmaprendererjob.h | 2 +- src/server/qgsconfigcache.cpp | 4 +-- src/server/qgsstorebadlayerinfo.cpp | 25 ++++++++++----- src/server/qgsstorebadlayerinfo.h | 31 +++++++++++++------ .../services/wms/qgsmaprendererjobproxy.h | 4 +-- src/server/services/wms/qgswmsrenderer.cpp | 8 ++--- src/server/services/wms/qgswmsrenderer.h | 2 +- 9 files changed, 54 insertions(+), 31 deletions(-) diff --git a/python/core/auto_generated/layout/qgslayoutitemmap.sip.in b/python/core/auto_generated/layout/qgslayoutitemmap.sip.in index a76d470921c..2d7bf8238f4 100644 --- a/python/core/auto_generated/layout/qgslayoutitemmap.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemmap.sip.in @@ -571,8 +571,9 @@ in the area of the map item covered by the item. QgsMapRendererJob::Errors renderingErrors() const; %Docstring -renderingErrors -@return list of layer id / error message +Returns map rendering errors + +:return: list of errors %End protected: diff --git a/src/core/layout/qgslayoutitemmap.h b/src/core/layout/qgslayoutitemmap.h index 045d202c253..804cceffcb8 100644 --- a/src/core/layout/qgslayoutitemmap.h +++ b/src/core/layout/qgslayoutitemmap.h @@ -512,8 +512,8 @@ class CORE_EXPORT QgsLayoutItemMap : public QgsLayoutItem bool isLabelBlockingItem( QgsLayoutItem *item ) const; /** - * @brief renderingErrors - * @return list of layer id / error message + * \brief Returns map rendering errors + * \returns list of errors */ QgsMapRendererJob::Errors renderingErrors() const { return mRenderingErrors; } diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h index dab7e73dda1..9f59681b8fa 100644 --- a/src/core/qgsmaprendererjob.h +++ b/src/core/qgsmaprendererjob.h @@ -55,7 +55,7 @@ struct LayerRenderJob bool cached; // if true, img already contains cached image from previous rendering QgsWeakMapLayerPointer layer; int renderingTime; //!< Time it took to render the layer in ms (it is -1 if not rendered or still rendering) - QStringList errors; //! rendering errors + QStringList errors; //!< Rendering errors }; typedef QList LayerRenderJobs; diff --git a/src/server/qgsconfigcache.cpp b/src/server/qgsconfigcache.cpp index afc35c71de8..0f39fd2be1e 100644 --- a/src/server/qgsconfigcache.cpp +++ b/src/server/qgsconfigcache.cpp @@ -46,9 +46,9 @@ const QgsProject *QgsConfigCache::project( const QString &path ) prj->setBadLayerHandler( badLayerHandler ); if ( prj->read( path ) ) { - if ( badLayerHandler->badLayers().size() > 0 ) + if ( !badLayerHandler->badLayers().isEmpty() ) { - QString errorMsg = QString( "Layer(s) %1 not valid" ).arg( badLayerHandler->badLayers().join( ',' ) ); + QString errorMsg = QStringLiteral( "Layer(s) %1 not valid" ).arg( badLayerHandler->badLayers().join( ',' ) ); QgsMessageLog::logMessage( errorMsg, QStringLiteral( "Server" ), Qgis::Critical ); throw QgsServerException( QStringLiteral( "Layer(s) not valid" ) ); } diff --git a/src/server/qgsstorebadlayerinfo.cpp b/src/server/qgsstorebadlayerinfo.cpp index 193c9f24964..567b5dc4236 100644 --- a/src/server/qgsstorebadlayerinfo.cpp +++ b/src/server/qgsstorebadlayerinfo.cpp @@ -1,14 +1,23 @@ +/*************************************************************************** + qgsstorebadlayerinfo.cpp + ------------------------ + begin : Jan 2019 + copyright : (C) 2019 by Marco Hugentobler + email : marco dot hugentobler at sourcepole dot ch + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + #include "qgsstorebadlayerinfo.h" #include -QgsStoreBadLayerInfo::QgsStoreBadLayerInfo(): QgsProjectBadLayerHandler() -{ -} - -QgsStoreBadLayerInfo::~QgsStoreBadLayerInfo() -{ -} - void QgsStoreBadLayerInfo::handleBadLayers( const QList &layers ) { mBadLayerIds.clear(); diff --git a/src/server/qgsstorebadlayerinfo.h b/src/server/qgsstorebadlayerinfo.h index af89dc6d3c7..91407c01d4f 100644 --- a/src/server/qgsstorebadlayerinfo.h +++ b/src/server/qgsstorebadlayerinfo.h @@ -1,3 +1,20 @@ +/*************************************************************************** + qgsstorebadlayerinfo.h + ---------------------- + begin : Jan 2019 + copyright : (C) 2019 by Marco Hugentobler + email : marco dot hugentobler at sourcepole dot ch + ***************************************************************************/ + +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ + #ifndef QGSSTOREBADLAYERINFO_H #define QGSSTOREBADLAYERINFO_H @@ -13,21 +30,17 @@ class QgsStoreBadLayerInfo: public QgsProjectBadLayerHandler public: /*Default constructor */ - QgsStoreBadLayerInfo(); - - /*Destructor - */ - ~QgsStoreBadLayerInfo(); + QgsStoreBadLayerInfo() = default; /** - * @brief handleBadLayers - * @param layers layer nodes + * \brief handleBadLayers + * \param layers layer nodes */ void handleBadLayers( const QList &layers ); /** - * @brief badLayers - * @return ids of bad layers + * \brief badLayers + * \returns ids of bad layers */ QStringList badLayers() const { return mBadLayerIds; } diff --git a/src/server/services/wms/qgsmaprendererjobproxy.h b/src/server/services/wms/qgsmaprendererjobproxy.h index de394d74fb7..318a6e98557 100644 --- a/src/server/services/wms/qgsmaprendererjobproxy.h +++ b/src/server/services/wms/qgsmaprendererjobproxy.h @@ -63,8 +63,8 @@ namespace QgsWms QPainter *takePainter(); /** - * @brief Returns reported errors - * @return error list + * \brief Returns map rendering errors + * \returns error list */ QgsMapRendererJob::Errors errors() const { return mErrors; } diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp index aaabdbe4e73..feb4687f5a4 100644 --- a/src/server/services/wms/qgswmsrenderer.cpp +++ b/src/server/services/wms/qgswmsrenderer.cpp @@ -2938,9 +2938,9 @@ namespace QgsWms } //Log first error - QString errorMsg = QString( "Map rendering error in layer '%1'" ).arg( firstErrorLayerId ); - QgsMessageLog::logMessage( errorMsg, "Server", Qgis::Critical ); - throw QgsServerException( QString( "Map rendering error in layer '%1'" ).arg( layerWMSName ) ); + QString errorMsg = QStringLiteral( "Map rendering error in layer '%1'" ).arg( firstErrorLayerId ); + QgsMessageLog::logMessage( errorMsg, QStringLiteral( "Server" ), Qgis::Critical ); + throw QgsServerException( QStringLiteral( "Map rendering error in layer '%1'" ).arg( layerWMSName ) ); } } @@ -3265,7 +3265,7 @@ namespace QgsWms return tmpImage->dotsPerMeterX() / 1000.0; } - void QgsRenderer::handlePrintErrors( const QgsLayout *layout ) + void QgsRenderer::handlePrintErrors( const QgsLayout *layout ) const { if ( !layout ) { diff --git a/src/server/services/wms/qgswmsrenderer.h b/src/server/services/wms/qgswmsrenderer.h index a7b476661c4..80f5e63e829 100644 --- a/src/server/services/wms/qgswmsrenderer.h +++ b/src/server/services/wms/qgswmsrenderer.h @@ -285,7 +285,7 @@ namespace QgsWms void removeTemporaryLayers(); - void handlePrintErrors( const QgsLayout *layout ); + void handlePrintErrors( const QgsLayout *layout ) const; private: