Limit scale bar with

timlinux · timlinux · commit 5f1c0cba8a33 · 2008-01-17T11:01:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@7992 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsquickprint.cpp b/src/gui/qgsquickprint.cpp
@@ -615,7 +615,7 @@ void QgsQuickPrint::printMap()
   //
   // Draw the scale bar
   //
-  renderPrintScaleBar(&myPrintPainter, mpMapCanvas);
+  renderPrintScaleBar(&myPrintPainter, mpMapCanvas, myLogoXDim);
 
   //
   // Finish up
@@ -743,7 +743,9 @@ void QgsQuickPrint::scalePointSymbols( int theScaleFactor, SymbolScalingType the
 
 
 
-void QgsQuickPrint::renderPrintScaleBar(QPainter * thepPainter, QgsMapCanvas * thepMapCanvas)
+void QgsQuickPrint::renderPrintScaleBar(QPainter * thepPainter, 
+    QgsMapCanvas * thepMapCanvas,
+    int theMaximumWidth)
 {
   //hard coding some options for now
   int myStyleIndex = 1; //tick up
@@ -757,7 +759,7 @@ void QgsQuickPrint::renderPrintScaleBar(QPainter * thepPainter, QgsMapCanvas * t
   int myXMargin=260;
   int myYMargin=180;
   int myCanvasWidth = thepMapCanvas->width();
-  int myPreferredSize = myCanvasWidth;
+  int myPreferredSize = theMaximumWidth;
   double myActualSize=myPreferredSize;
   int myBufferSize=1; //softcode this later
   QColor myBackColor = Qt::white; //used for text
diff --git a/src/gui/qgsquickprint.h b/src/gui/qgsquickprint.h
@@ -53,7 +53,9 @@ public slots:
   void setOutputPdf(QString theFileName);
   void setMapCanvas(QgsMapCanvas * thepMapCanvas);
 private:
-  void renderPrintScaleBar(QPainter * thepPainter, QgsMapCanvas * thepMapCanvas);
+  void renderPrintScaleBar(QPainter * thepPainter, 
+      QgsMapCanvas * thepMapCanvas, 
+      int theMaximumWidth);
   /**
    * Scale symbols in all layers by the specified amount.
    * Typically used for printing. Each symbol in 
