[composer] Fix annotation settings only being applied to first grid in list, not selected grid (fix #10880)

nyalldawson · nyalldawson · commit ae84a0740399 · 2014-07-13T10:10:49.000+10:00
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -912,23 +912,24 @@ void QgsComposerMapWidget::insertAnnotationDirectionEntries( QComboBox* c )
 
 void QgsComposerMapWidget::handleChangedAnnotationPosition( QgsComposerMap::Border border, const QString& text )
 {
-  if ( !mComposerMap )
+  QgsComposerMapGrid* grid = currentGrid();
+  if ( !grid )
   {
     return;
   }
 
   mComposerMap->beginCommand( tr( "Annotation position changed" ) );
   if ( text == tr( "Inside frame" ) )
   {
-    mComposerMap->setGridAnnotationPosition( QgsComposerMap::InsideMapFrame, border );
+    grid->setGridAnnotationPosition( QgsComposerMap::InsideMapFrame, border );
   }
   else if ( text == tr( "Disabled" ) )
   {
-    mComposerMap->setGridAnnotationPosition( QgsComposerMap::Disabled, border );
+    grid->setGridAnnotationPosition( QgsComposerMap::Disabled, border );
   }
   else //Outside frame
   {
-    mComposerMap->setGridAnnotationPosition( QgsComposerMap::OutsideMapFrame, border );
+    grid->setGridAnnotationPosition( QgsComposerMap::OutsideMapFrame, border );
   }
 
   mComposerMap->updateBoundingRect();
@@ -938,19 +939,20 @@ void QgsComposerMapWidget::handleChangedAnnotationPosition( QgsComposerMap::Bord
 
 void QgsComposerMapWidget::handleChangedAnnotationDirection( QgsComposerMap::Border border, const QString& text )
 {
-  if ( !mComposerMap )
+  QgsComposerMapGrid* grid = currentGrid();
+  if ( !grid )
   {
     return;
   }
 
   mComposerMap->beginCommand( tr( "Changed annotation direction" ) );
   if ( text == tr( "Horizontal" ) )
   {
-    mComposerMap->setGridAnnotationDirection( QgsComposerMap::Horizontal, border );
+    grid->setGridAnnotationDirection( QgsComposerMap::Horizontal, border );
   }
   else //Vertical
   {
-    mComposerMap->setGridAnnotationDirection( QgsComposerMap::Vertical, border );
+    grid->setGridAnnotationDirection( QgsComposerMap::Vertical, border );
   }
   mComposerMap->updateBoundingRect();
   mComposerMap->update();

Original file line number	Diff line number	Diff line change
`@@ -912,23 +912,24 @@ void QgsComposerMapWidget::insertAnnotationDirectionEntries( QComboBox* c )`
`912`	`912`
`913`	`913`	`void QgsComposerMapWidget::handleChangedAnnotationPosition( QgsComposerMap::Border border, const QString& text )`
`914`	`914`	`{`
`915`		`- if ( !mComposerMap )`
	`915`	`+ QgsComposerMapGrid* grid = currentGrid();`
	`916`	`+ if ( !grid )`
`916`	`917`	`{`
`917`	`918`	`return;`
`918`	`919`	`}`
`919`	`920`
`920`	`921`	`mComposerMap->beginCommand( tr( "Annotation position changed" ) );`
`921`	`922`	`if ( text == tr( "Inside frame" ) )`
`922`	`923`	`{`
`923`		`- mComposerMap->setGridAnnotationPosition( QgsComposerMap::InsideMapFrame, border );`
	`924`	`+ grid->setGridAnnotationPosition( QgsComposerMap::InsideMapFrame, border );`
`924`	`925`	`}`
`925`	`926`	`else if ( text == tr( "Disabled" ) )`
`926`	`927`	`{`
`927`		`- mComposerMap->setGridAnnotationPosition( QgsComposerMap::Disabled, border );`
	`928`	`+ grid->setGridAnnotationPosition( QgsComposerMap::Disabled, border );`
`928`	`929`	`}`
`929`	`930`	`else //Outside frame`
`930`	`931`	`{`
`931`		`- mComposerMap->setGridAnnotationPosition( QgsComposerMap::OutsideMapFrame, border );`
	`932`	`+ grid->setGridAnnotationPosition( QgsComposerMap::OutsideMapFrame, border );`
`932`	`933`	`}`
`933`	`934`
`934`	`935`	`mComposerMap->updateBoundingRect();`
`@@ -938,19 +939,20 @@ void QgsComposerMapWidget::handleChangedAnnotationPosition( QgsComposerMap::Bord`
`938`	`939`
`939`	`940`	`void QgsComposerMapWidget::handleChangedAnnotationDirection( QgsComposerMap::Border border, const QString& text )`
`940`	`941`	`{`
`941`		`- if ( !mComposerMap )`
	`942`	`+ QgsComposerMapGrid* grid = currentGrid();`
	`943`	`+ if ( !grid )`
`942`	`944`	`{`
`943`	`945`	`return;`
`944`	`946`	`}`
`945`	`947`
`946`	`948`	`mComposerMap->beginCommand( tr( "Changed annotation direction" ) );`
`947`	`949`	`if ( text == tr( "Horizontal" ) )`
`948`	`950`	`{`
`949`		`- mComposerMap->setGridAnnotationDirection( QgsComposerMap::Horizontal, border );`
	`951`	`+ grid->setGridAnnotationDirection( QgsComposerMap::Horizontal, border );`
`950`	`952`	`}`
`951`	`953`	`else //Vertical`
`952`	`954`	`{`
`953`		`- mComposerMap->setGridAnnotationDirection( QgsComposerMap::Vertical, border );`
	`955`	`+ grid->setGridAnnotationDirection( QgsComposerMap::Vertical, border );`
`954`	`956`	`}`
`955`	`957`	`mComposerMap->updateBoundingRect();`
`956`	`958`	`mComposerMap->update();`