[QGIS Commit] r15016 - in trunk/qgis: python/core src/core/composer src/gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-01-11 06:52:17 -0800 (Tue, 11 Jan 2011)
New Revision: 15016

Modified:
   trunk/qgis/python/core/qgscomposerscalebar.sip
   trunk/qgis/src/core/composer/qgscomposerscalebar.cpp
   trunk/qgis/src/core/composer/qgscomposerscalebar.h
   trunk/qgis/src/gui/qgscomposerview.cpp
Log:
Apply only default size (not all other default settings) when adding scalebar to composer view

Modified: trunk/qgis/python/core/qgscomposerscalebar.sip
===================================================================
--- trunk/qgis/python/core/qgscomposerscalebar.sip	2011-01-10 21:34:39 UTC (rev 15015)
+++ trunk/qgis/python/core/qgscomposerscalebar.sip	2011-01-11 14:52:17 UTC (rev 15016)
@@ -58,8 +58,11 @@
 
     double segmentMillimeters() const;
 
-    /**Apply default settings (scale bar 1/5 of map item width)*/
+    /**Apply default settings*/
     void applyDefaultSettings();
+    /**Apply default size (scale bar 1/5 of map item width)
+      @note this method was added in version 1.7*/
+    void applyDefaultSize();
 
     /**Sets style by name
      @param styleName (untranslated) style name. Possibilities are: 'Single Box', 'Double Box', 'Line Ticks Middle', 'Line Ticks Down', 'Line Ticks Up', 'Numeric'*/

Modified: trunk/qgis/src/core/composer/qgscomposerscalebar.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerscalebar.cpp	2011-01-10 21:34:39 UTC (rev 15015)
+++ trunk/qgis/src/core/composer/qgscomposerscalebar.cpp	2011-01-11 14:52:17 UTC (rev 15016)
@@ -31,6 +31,7 @@
 QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ), mSegmentMillimeters( 0.0 )
 {
   applyDefaultSettings();
+  applyDefaultSize();
 }
 
 QgsComposerScaleBar::~QgsComposerScaleBar()
@@ -130,7 +131,10 @@
 
   mLabelBarSpace = 3.0;
   mBoxContentSpace = 1.0;
+}
 
+void QgsComposerScaleBar::applyDefaultSize()
+{
   if ( mComposerMap )
   {
     //calculate mNumUnitsPerSegment

Modified: trunk/qgis/src/core/composer/qgscomposerscalebar.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerscalebar.h	2011-01-10 21:34:39 UTC (rev 15015)
+++ trunk/qgis/src/core/composer/qgscomposerscalebar.h	2011-01-11 14:52:17 UTC (rev 15016)
@@ -81,8 +81,11 @@
 
     double segmentMillimeters() const {return mSegmentMillimeters;}
 
-    /**Apply default settings (scale bar 1/5 of map item width)*/
+    /**Apply default settings*/
     void applyDefaultSettings();
+    /**Apply default size (scale bar 1/5 of map item width)
+      @note this method was added in version 1.7*/
+    void applyDefaultSize();
 
     /**Sets style by name
      @param styleName (untranslated) style name. Possibilities are: 'Single Box', 'Double Box', 'Line Ticks Middle', 'Line Ticks Down', 'Line Ticks Up', 'Numeric'*/

Modified: trunk/qgis/src/gui/qgscomposerview.cpp
===================================================================
--- trunk/qgis/src/gui/qgscomposerview.cpp	2011-01-10 21:34:39 UTC (rev 15015)
+++ trunk/qgis/src/gui/qgscomposerview.cpp	2011-01-11 14:52:17 UTC (rev 15016)
@@ -550,7 +550,7 @@
   {
     scaleBar->setComposerMap( mapItemList.at( 0 ) );
   }
-  scaleBar->applyDefaultSettings(); //4 segments, 1/5 of composer map width
+  scaleBar->applyDefaultSize(); //4 segments, 1/5 of composer map width
   scene()->addItem( scaleBar );
   emit composerScaleBarAdded( scaleBar );
   scene()->clearSelection();