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

received all PR suggestions

Browse Source
This commit is contained in:
Matteo Nastasi 2019-03-11 09:59:25 +01:00
parent 245e5bafe6
commit ae0e12b1b9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/layout/qgslayoutaligner.cpp
View File

@ -14,8 +14,6 @@
* *
***************************************************************************/
#include <cmath>
#include "qgslayoutaligner.h"
#include "qgslayoutitem.h"
#include "qgslayout.h"
@ -126,13 +124,16 @@ void QgsLayoutAligner::distributeItems( QgsLayout *layout, const QList<QgsLayout
case DistributeHSpace:
case DistributeVSpace:
// not reachable branch, just to avoid compilation warning
return nan( "" );
return std::numeric_limits<double>::quiet_NaN();
}
// no warnings
return itemBBox.left();
};
double minCoord = std::numeric_limits<double>::max();
double maxCoord = std::numeric_limits<double>::lowest();
QMap< double, QgsLayoutItem * > itemCoords;
for ( QgsLayoutItem *item : items )
{
double refCoord = collectReferenceCoord( item );
@ -141,7 +142,7 @@ void QgsLayoutAligner::distributeItems( QgsLayout *layout, const QList<QgsLayout
itemCoords.insert( refCoord, item );
}
step = ( maxCoord - minCoord ) / ( items.size() - 1 );
const double step = ( maxCoord - minCoord ) / ( items.size() - 1 );
auto distributeItemToCoord = [layout, distribution]( QgsLayoutItem * item, double refCoord )
{