Apply only default size (not all other default settings) when adding scalebar to composer view

mhugent · mhugent · commit dfcc86eabce2 · 2011-01-11T14:52:17.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15016 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgscomposerscalebar.sip b/python/core/qgscomposerscalebar.sip
@@ -58,8 +58,11 @@ class QgsComposerScaleBar: QgsComposerItem
 
     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'*/
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -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 @@ void QgsComposerScaleBar::applyDefaultSettings()
 
   mLabelBarSpace = 3.0;
   mBoxContentSpace = 1.0;
+}
 
+void QgsComposerScaleBar::applyDefaultSize()
+{
   if ( mComposerMap )
   {
     //calculate mNumUnitsPerSegment
diff --git a/src/core/composer/qgscomposerscalebar.h b/src/core/composer/qgscomposerscalebar.h
@@ -81,8 +81,11 @@ class CORE_EXPORT QgsComposerScaleBar: public QgsComposerItem
 
     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'*/
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -550,7 +550,7 @@ void QgsComposerView::addComposerScaleBar( QgsComposerScaleBar* scaleBar )
   {
     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();

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ), mSegmentMillimeters( 0.0 )`
`32`	`32`	`{`
`33`	`33`	`applyDefaultSettings();`
	`34`	`+ applyDefaultSize();`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`QgsComposerScaleBar::~QgsComposerScaleBar()`
`@@ -130,7 +131,10 @@ void QgsComposerScaleBar::applyDefaultSettings()`
`130`	`131`
`131`	`132`	`mLabelBarSpace = 3.0;`
`132`	`133`	`mBoxContentSpace = 1.0;`
	`134`	`+}`
`133`	`135`
	`136`	`+void QgsComposerScaleBar::applyDefaultSize()`
	`137`	`+{`
`134`	`138`	`if ( mComposerMap )`
`135`	`139`	`{`
`136`	`140`	`//calculate mNumUnitsPerSegment`
Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ void QgsComposerView::addComposerScaleBar( QgsComposerScaleBar* scaleBar )`
`550`	`550`	`{`
`551`	`551`	`scaleBar->setComposerMap( mapItemList.at( 0 ) );`
`552`	`552`	`}`
`553`		`- scaleBar->applyDefaultSettings(); //4 segments, 1/5 of composer map width`
	`553`	`+ scaleBar->applyDefaultSize(); //4 segments, 1/5 of composer map width`
`554`	`554`	`scene()->addItem( scaleBar );`
`555`	`555`	`emit composerScaleBarAdded( scaleBar );`
`556`	`556`	`scene()->clearSelection();`