Dont make page size methods slots

Fix alignment issue with scale bar unit git-svn-id: http://svn.osgeo.org/qgis/trunk@8127 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 9, 2008 · b6d2253 · b6d2253
1 parent 61906aa
commit b6d2253
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
@@ -972,15 +972,15 @@ void QgsQuickPrint::renderPrintScaleBar(QPainter * thepPainter,
     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);
     }
   }
   //then the text itself
   thepPainter->setPen( myForeColor );
   thepPainter->drawText(
       myOriginX + myScaleBarWidthInt + myTextOffsetX,
-      myOriginY + myMajorTickSize + myFontHeight +  myTextOffsetY,
+      myOriginY + myMajorTickSize + (myFontHeight*2.5) +  myTextOffsetY,
       myScaleBarUnitLabel
       );
 }

diff --git a/src/gui/qgsquickprint.h b/src/gui/qgsquickprint.h
@@ -43,6 +43,8 @@ class GUI_EXPORT QgsQuickPrint:public QObject
   //! 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 @@ public slots:
   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);