Skip to content

Commit d7bb27d

Browse files
author
mhugent
committed
Fix for first part of bug #2008
git-svn-id: http://svn.osgeo.org/qgis/trunk@11820 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent da30b63 commit d7bb27d

File tree

4 files changed

+190
-191
lines changed

4 files changed

+190
-191
lines changed

src/app/composer/qgscomposermapwidget.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,46 +474,46 @@ void QgsComposerMapWidget::on_mGridCheckBox_stateChanged( int state )
474474
mComposerMap->update();
475475
}
476476

477-
void QgsComposerMapWidget::on_mIntervalXSpinBox_valueChanged( double d )
477+
void QgsComposerMapWidget::on_mIntervalXSpinBox_editingFinished()
478478
{
479479
if ( !mComposerMap )
480480
{
481481
return;
482482
}
483-
mComposerMap->setGridIntervalX( d );
483+
mComposerMap->setGridIntervalX( mIntervalXSpinBox->value() );
484484
mComposerMap->updateBoundingRect();
485485
mComposerMap->update();
486486
}
487487

488-
void QgsComposerMapWidget::on_mIntervalYSpinBox_valueChanged( double d )
488+
void QgsComposerMapWidget::on_mIntervalYSpinBox_editingFinished()
489489
{
490490
if ( !mComposerMap )
491491
{
492492
return;
493493
}
494-
mComposerMap->setGridIntervalY( d );
494+
mComposerMap->setGridIntervalY( mIntervalYSpinBox->value() );
495495
mComposerMap->updateBoundingRect();
496496
mComposerMap->update();
497497
}
498498

499-
void QgsComposerMapWidget::on_mOffsetXSpinBox_valueChanged( double d )
499+
void QgsComposerMapWidget::on_mOffsetXSpinBox_editingFinished()
500500
{
501501
if ( !mComposerMap )
502502
{
503503
return;
504504
}
505-
mComposerMap->setGridOffsetX( d );
505+
mComposerMap->setGridOffsetX( mOffsetXSpinBox->value() );
506506
mComposerMap->updateBoundingRect();
507507
mComposerMap->update();
508508
}
509509

510-
void QgsComposerMapWidget::on_mOffsetYSpinBox_valueChanged( double d )
510+
void QgsComposerMapWidget::on_mOffsetYSpinBox_editingFinished()
511511
{
512512
if ( !mComposerMap )
513513
{
514514
return;
515515
}
516-
mComposerMap->setGridOffsetY( d );
516+
mComposerMap->setGridOffsetY( mOffsetYSpinBox->value() );
517517
mComposerMap->updateBoundingRect();
518518
mComposerMap->update();
519519
}

src/app/composer/qgscomposermapwidget.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
4949
void on_mYMaxLineEdit_editingFinished();
5050

5151
void on_mGridCheckBox_stateChanged( int state );
52-
void on_mIntervalXSpinBox_valueChanged( double d );
53-
void on_mIntervalYSpinBox_valueChanged( double d );
54-
void on_mOffsetXSpinBox_valueChanged( double d );
55-
void on_mOffsetYSpinBox_valueChanged( double d );
52+
void on_mIntervalXSpinBox_editingFinished();
53+
void on_mIntervalYSpinBox_editingFinished();
54+
void on_mOffsetXSpinBox_editingFinished();
55+
void on_mOffsetYSpinBox_editingFinished();
5656
void on_mLineWidthSpinBox_valueChanged( double d );
5757
void on_mLineColorButton_clicked();
5858
void on_mGridTypeComboBox_currentIndexChanged( const QString& text );

src/core/composer/qgscomposermap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const
568568
annotationElem.setAttribute( "frameDistance", mAnnotationFrameDistance );
569569
annotationElem.setAttribute( "direction", mGridAnnotationDirection );
570570
annotationElem.setAttribute( "font", mGridAnnotationFont.toString() );
571-
annotationElem.setAttribute( "type", mGridAnnotationType);
571+
annotationElem.setAttribute( "type", mGridAnnotationType );
572572

573573
gridElem.appendChild( annotationElem );
574574
composerMapElem.appendChild( gridElem );
@@ -1051,7 +1051,7 @@ QgsRectangle QgsComposerMap::transformedExtent() const
10511051

10521052
double QgsComposerMap::maxExtensionXDirection() const
10531053
{
1054-
if ( mGridAnnotationPosition != OutsideMapFrame )
1054+
if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
10551055
{
10561056
return 0;
10571057
}
@@ -1090,7 +1090,7 @@ double QgsComposerMap::maxExtensionXDirection() const
10901090

10911091
double QgsComposerMap::maxExtensionYDirection() const
10921092
{
1093-
if ( mGridAnnotationPosition != OutsideMapFrame )
1093+
if ( !mGridEnabled || !mShowGridAnnotation || mGridAnnotationPosition != OutsideMapFrame )
10941094
{
10951095
return 0;
10961096
}

0 commit comments

Comments
 (0)