[QGIS Commit] r9298 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-11 07:46:54 -0400 (Thu, 11 Sep 2008)
New Revision: 9298

Modified:
   trunk/qgis/src/core/qgsscalecalculator.cpp
   trunk/qgis/src/core/qgsscalecalculator.h
Log:
Allow dpi values to be doubles. This fixes unprecise scale bars in composer

Modified: trunk/qgis/src/core/qgsscalecalculator.cpp
===================================================================
--- trunk/qgis/src/core/qgsscalecalculator.cpp	2008-09-11 09:01:06 UTC (rev 9297)
+++ trunk/qgis/src/core/qgsscalecalculator.cpp	2008-09-11 11:46:54 UTC (rev 9298)
@@ -23,18 +23,18 @@
 #include "qgsrect.h"
 #include "qgsscalecalculator.h"
 
-QgsScaleCalculator::QgsScaleCalculator( int dpi, QGis::units mapUnits )
+QgsScaleCalculator::QgsScaleCalculator( double dpi, QGis::units mapUnits )
     : mDpi( dpi ), mMapUnits( mapUnits )
 {}
 
 QgsScaleCalculator::~QgsScaleCalculator()
 {}
 
-void QgsScaleCalculator::setDpi( int dpi )
+void QgsScaleCalculator::setDpi( double dpi )
 {
   mDpi = dpi;
 }
-int QgsScaleCalculator::dpi()
+double QgsScaleCalculator::dpi()
 {
   return mDpi;
 }

Modified: trunk/qgis/src/core/qgsscalecalculator.h
===================================================================
--- trunk/qgis/src/core/qgsscalecalculator.h	2008-09-11 09:01:06 UTC (rev 9297)
+++ trunk/qgis/src/core/qgsscalecalculator.h	2008-09-11 11:46:54 UTC (rev 9298)
@@ -39,7 +39,7 @@
      * @param mapUnits Units of the data on the map. Must match a value from the
      * QGis::units enum (METERS, FEET, DEGREES)
      */
-    QgsScaleCalculator( int dpi = 0,
+    QgsScaleCalculator( double dpi = 0,
                         QGis::units mapUnits = QGis::METERS );
 
     //! Destructor
@@ -49,12 +49,12 @@
      * Set the dpi to be used in scale calculations
      * @param dpi Dots per inch of monitor resolution
      */
-    void setDpi( int dpi );
+    void setDpi( double dpi );
     /**
      * Accessor for dpi used in scale calculations
      * @return int the dpi used for scale calculations.
      */
-    int dpi();
+    double dpi();
 
     /**
      * Set the map units
@@ -84,7 +84,7 @@
   private:
 
     //! dpi member
-    int mDpi;
+    double mDpi;
 
     //! map unit member
     QGis::units mMapUnits;