sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15016 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2011-01-11 14:52:17 +00:00
parent 5aed037fdc
commit 2065e89bdd
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/qgscomposerscalebar.sip
View File

@ -58,8 +58,11 @@ class QgsComposerScaleBar: QgsComposerItem
double segmentMillimeters() const; double segmentMillimeters() const;
/**Apply default settings (scale bar 1/5 of map item width)*/ /**Apply default settings*/
void applyDefaultSettings(); 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 /**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'*/ @param styleName (untranslated) style name. Possibilities are: 'Single Box', 'Double Box', 'Line Ticks Middle', 'Line Ticks Down', 'Line Ticks Up', 'Numeric'*/

4
src/core/composer/qgscomposerscalebar.cpp
View File

@ -31,6 +31,7 @@
QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ), mSegmentMillimeters( 0.0 ) QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ), mSegmentMillimeters( 0.0 )
{ {
applyDefaultSettings(); applyDefaultSettings();
applyDefaultSize();
} }
QgsComposerScaleBar::~QgsComposerScaleBar() QgsComposerScaleBar::~QgsComposerScaleBar()
@ -130,7 +131,10 @@ void QgsComposerScaleBar::applyDefaultSettings()
mLabelBarSpace = 3.0; mLabelBarSpace = 3.0;
mBoxContentSpace = 1.0; mBoxContentSpace = 1.0;
}
void QgsComposerScaleBar::applyDefaultSize()
{
if ( mComposerMap ) if ( mComposerMap )
{ {
//calculate mNumUnitsPerSegment //calculate mNumUnitsPerSegment

5
src/core/composer/qgscomposerscalebar.h
View File

@ -81,8 +81,11 @@ class CORE_EXPORT QgsComposerScaleBar: public QgsComposerItem
double segmentMillimeters() const {return mSegmentMillimeters;} double segmentMillimeters() const {return mSegmentMillimeters;}
/**Apply default settings (scale bar 1/5 of map item width)*/ /**Apply default settings*/
void applyDefaultSettings(); 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 /**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'*/ @param styleName (untranslated) style name. Possibilities are: 'Single Box', 'Double Box', 'Line Ticks Middle', 'Line Ticks Down', 'Line Ticks Up', 'Numeric'*/

2
src/gui/qgscomposerview.cpp
View File

@ -550,7 +550,7 @@ void QgsComposerView::addComposerScaleBar( QgsComposerScaleBar* scaleBar )
{ {
scaleBar->setComposerMap( mapItemList.at( 0 ) ); 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 ); scene()->addItem( scaleBar );
emit composerScaleBarAdded( scaleBar ); emit composerScaleBarAdded( scaleBar );
scene()->clearSelection(); scene()->clearSelection();