97 lines
5.0 KiB
Diff
97 lines
5.0 KiB
Diff
diff -rupN qgis-2.4.0/python/core/composer/qgsatlascomposition.sip qgis-2.4.0-new/python/core/composer/qgsatlascomposition.sip
|
|
--- qgis-2.4.0/python/core/composer/qgsatlascomposition.sip 2014-06-27 14:00:08.000000000 +0200
|
|
+++ qgis-2.4.0-new/python/core/composer/qgsatlascomposition.sip 2014-07-27 00:10:44.629582944 +0200
|
|
@@ -155,7 +155,7 @@ public:
|
|
* @see setPredefinedScales
|
|
* @see QgsComposerMap::atlasScalingMode
|
|
*/
|
|
- const QVector<double>& predefinedScales() const;
|
|
+ const QVector<qreal>& predefinedScales() const;
|
|
|
|
/**Sets the list of predefined scales for the atlas. This is used
|
|
* for maps which are set to the predefined atlas scaling mode.
|
|
@@ -163,7 +163,7 @@ public:
|
|
* @see predefinedScales
|
|
* @see QgsComposerMap::atlasScalingMode
|
|
*/
|
|
- void setPredefinedScales( const QVector<double>& scales );
|
|
+ void setPredefinedScales( const QVector<qreal>& scales );
|
|
|
|
/** Begins the rendering. Returns true if successful, false if no matching atlas
|
|
features found.*/
|
|
diff -rupN qgis-2.4.0/src/app/composer/qgscomposer.cpp qgis-2.4.0-new/src/app/composer/qgscomposer.cpp
|
|
--- qgis-2.4.0/src/app/composer/qgscomposer.cpp 2014-06-27 14:00:08.000000000 +0200
|
|
+++ qgis-2.4.0-new/src/app/composer/qgscomposer.cpp 2014-07-27 00:10:29.977583595 +0200
|
|
@@ -3594,7 +3594,7 @@ void QgsComposer::loadAtlasPredefinedSca
|
|
return;
|
|
}
|
|
QgsAtlasComposition& atlasMap = mComposition->atlasComposition();
|
|
- QVector<double> pScales;
|
|
+ QVector<qreal> pScales;
|
|
// first look at project's scales
|
|
QStringList scales( QgsProject::instance()->readListEntry( "Scales", "/ScalesList" ) );
|
|
bool hasProjectScales( QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" ) );
|
|
diff -rupN qgis-2.4.0/src/core/composer/qgsatlascomposition.cpp qgis-2.4.0-new/src/core/composer/qgsatlascomposition.cpp
|
|
--- qgis-2.4.0/src/core/composer/qgsatlascomposition.cpp 2014-06-27 14:00:08.000000000 +0200
|
|
+++ qgis-2.4.0-new/src/core/composer/qgsatlascomposition.cpp 2014-07-27 00:10:32.027583504 +0200
|
|
@@ -491,7 +491,7 @@ void QgsAtlasComposition::prepareMap( Qg
|
|
// choose one of the predefined scales
|
|
double newWidth = mOrigExtent.width();
|
|
double newHeight = mOrigExtent.height();
|
|
- const QVector<double>& scales = mPredefinedScales;
|
|
+ const QVector<qreal>& scales = mPredefinedScales;
|
|
for ( int i = 0; i < scales.size(); i++ )
|
|
{
|
|
double ratio = scales[i] / originalScale;
|
|
@@ -747,7 +747,7 @@ bool QgsAtlasComposition::evalFeatureFil
|
|
return true;
|
|
}
|
|
|
|
-void QgsAtlasComposition::setPredefinedScales( const QVector<double>& scales )
|
|
+void QgsAtlasComposition::setPredefinedScales( const QVector<qreal>& scales )
|
|
{
|
|
mPredefinedScales = scales;
|
|
// make sure the list is sorted
|
|
diff -rupN qgis-2.4.0/src/core/composer/qgsatlascomposition.h qgis-2.4.0-new/src/core/composer/qgsatlascomposition.h
|
|
--- qgis-2.4.0/src/core/composer/qgsatlascomposition.h 2014-06-27 14:00:08.000000000 +0200
|
|
+++ qgis-2.4.0-new/src/core/composer/qgsatlascomposition.h 2014-07-27 00:10:33.057583458 +0200
|
|
@@ -183,7 +183,7 @@ class CORE_EXPORT QgsAtlasComposition :
|
|
* @see setPredefinedScales
|
|
* @see QgsComposerMap::atlasScalingMode
|
|
*/
|
|
- const QVector<double>& predefinedScales() const { return mPredefinedScales; }
|
|
+ const QVector<qreal>& predefinedScales() const { return mPredefinedScales; }
|
|
|
|
/**Sets the list of predefined scales for the atlas. This is used
|
|
* for maps which are set to the predefined atlas scaling mode.
|
|
@@ -191,7 +191,7 @@ class CORE_EXPORT QgsAtlasComposition :
|
|
* @see predefinedScales
|
|
* @see QgsComposerMap::atlasScalingMode
|
|
*/
|
|
- void setPredefinedScales( const QVector<double>& scales );
|
|
+ void setPredefinedScales( const QVector<qreal>& scales );
|
|
|
|
/** Begins the rendering. Returns true if successful, false if no matching atlas
|
|
features found.*/
|
|
@@ -320,7 +320,7 @@ class CORE_EXPORT QgsAtlasComposition :
|
|
void computeExtent( QgsComposerMap *map );
|
|
|
|
//list of predefined scales
|
|
- QVector<double> mPredefinedScales;
|
|
+ QVector<qreal> mPredefinedScales;
|
|
};
|
|
|
|
#endif
|
|
diff -rupN qgis-2.4.0/src/gui/qgscomposerview.cpp qgis-2.4.0-new/src/gui/qgscomposerview.cpp
|
|
--- qgis-2.4.0/src/gui/qgscomposerview.cpp 2014-06-27 14:00:08.000000000 +0200
|
|
+++ qgis-2.4.0-new/src/gui/qgscomposerview.cpp 2014-07-26 21:40:14.809984197 +0200
|
|
@@ -869,7 +869,7 @@ void QgsComposerView::mouseReleaseEvent(
|
|
else
|
|
{
|
|
QgsComposerAttributeTable* newTable = new QgsComposerAttributeTable( composition() );
|
|
- newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), 15.0 ) ) );
|
|
+ newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), qreal(15.0) ) ) );
|
|
QList<const QgsComposerMap*> mapItemList = composition()->composerMapItems();
|
|
if ( mapItemList.size() > 0 )
|
|
{
|