always use double for dpi

qgis · May 28, 2016 · c3e7a56 · c3e7a56
1 parent cf99817
commit c3e7a56
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/python/core/qgsmaprenderer.sip b/python/core/qgsmaprenderer.sip
@@ -184,7 +184,7 @@ class QgsMapRenderer : QObject
     //! sets whether map image will be for overview
     void enableOverviewMode( bool isOverview = true );
 
-    void setOutputSize( QSize size, int dpi );
+    void setOutputSize( QSize size, double dpi );
     void setOutputSize( QSizeF size, double dpi );
 
     //!accessor for output dpi

diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
@@ -35,9 +35,9 @@ class QgsMapSettings
 
     //! Return DPI used for conversion between real world units (e.g. mm) and pixels
     //! Default value is 96
-    int outputDpi() const;
+    double outputDpi() const;
     //! Set DPI used for conversion between real world units (e.g. mm) and pixels
-    void setOutputDpi( int dpi );
+    void setOutputDpi( double dpi );
 
 
     /**

diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp
@@ -138,7 +138,7 @@ double QgsMapRenderer::rotation() const
 }
 
 
-void QgsMapRenderer::setOutputSize( QSize size, int dpi )
+void QgsMapRenderer::setOutputSize( QSize size, double dpi )
 {
   mSize = QSizeF( size.width(), size.height() );
   mScaleCalculator->setDpi( dpi );

diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -247,7 +247,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     //! sets whether map image will be for overview
     void enableOverviewMode( bool isOverview = true ) { mOverview = isOverview; }
 
-    void setOutputSize( QSize size, int dpi );
+    void setOutputSize( QSize size, double dpi );
     void setOutputSize( QSizeF size, double dpi );
 
     //!accessor for output dpi

diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -241,12 +241,12 @@ void QgsMapSettings::setOutputSize( QSize size )
   updateDerived();
 }
 
-int QgsMapSettings::outputDpi() const
+double QgsMapSettings::outputDpi() const
 {
-  return ( int )mDpi;
+  return mDpi;
 }
 
-void QgsMapSettings::setOutputDpi( int dpi )
+void QgsMapSettings::setOutputDpi( double dpi )
 {
   mDpi = dpi;
 

diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
@@ -83,10 +83,9 @@ class CORE_EXPORT QgsMapSettings
 
     //! Return DPI used for conversion between real world units (e.g. mm) and pixels
     //! Default value is 96
-    //! TODO QGIS 3 return double ?
-    int outputDpi() const;
+    double outputDpi() const;
     //! Set DPI used for conversion between real world units (e.g. mm) and pixels
-    void setOutputDpi( int dpi );
+    void setOutputDpi( double dpi );
 
     /**
      * @brief setMagnificationFactor set the magnification factor