[QGIS Commit] r8127 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-02-09 09:25:37 -0500 (Sat, 09 Feb 2008)
New Revision: 8127

Modified:
   trunk/qgis/src/gui/qgsquickprint.cpp
   trunk/qgis/src/gui/qgsquickprint.h
Log:
Dont make page size methods slots
Fix alignment issue with scale bar unit


Modified: trunk/qgis/src/gui/qgsquickprint.cpp
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.cpp	2008-02-08 23:30:33 UTC (rev 8126)
+++ trunk/qgis/src/gui/qgsquickprint.cpp	2008-02-09 14:25:37 UTC (rev 8127)
@@ -972,7 +972,7 @@
     for (int j = 0-myBufferSize; j <= myBufferSize; j++)
     {
       thepPainter->drawText( i + (myOriginX+myScaleBarWidthInt+myTextOffsetX),
-          j + myOriginY + myMajorTickSize + myFontHeight + myTextOffsetY,
+          j + myOriginY + myMajorTickSize + (myFontHeight*2.5) + myTextOffsetY,
           myScaleBarUnitLabel);
     }
   }
@@ -980,7 +980,7 @@
   thepPainter->setPen( myForeColor );
   thepPainter->drawText(
       myOriginX + myScaleBarWidthInt + myTextOffsetX,
-      myOriginY + myMajorTickSize + myFontHeight +  myTextOffsetY,
+      myOriginY + myMajorTickSize + (myFontHeight*2.5) +  myTextOffsetY,
       myScaleBarUnitLabel
       );
 }

Modified: trunk/qgis/src/gui/qgsquickprint.h
===================================================================
--- trunk/qgis/src/gui/qgsquickprint.h	2008-02-08 23:30:33 UTC (rev 8126)
+++ trunk/qgis/src/gui/qgsquickprint.h	2008-02-09 14:25:37 UTC (rev 8127)
@@ -43,6 +43,8 @@
   //! Destructor
   virtual ~QgsQuickPrint();
   enum SymbolScalingType {ScaleUp, ScaleDown};
+  static QString pageSizeToString(QPrinter::PageSize theSize);
+  static QPrinter::PageSize stringToPageSize(QString theSize);
 
 public slots:
   void printMap(); 
@@ -54,8 +56,6 @@
   void setLogo2(QString theFileName);
   void setOutputPdf(QString theFileName);
   void setPageSize(QPrinter::PageSize theSize);
-  static QString pageSizeToString(QPrinter::PageSize theSize);
-  static QPrinter::PageSize stringToPageSize(QString theSize);
   //! This is just a convenience function to get the
   //map render from the mapcanvas
   void setMapCanvas(QgsMapCanvas * thepMapCanvas);