[composer] Only update map rotation when editing finishes

nyalldawson · nyalldawson · commit 49e1ae40af2e · 2017-04-12T15:15:17.000+10:00
Avoids multiple map updates when entering values like "90".
Previously the map would be updated at every keystroke,
so  "9" and "90" degree rotations.
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -119,6 +119,8 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap *composerMap )
   loadGridEntries();
   loadOverviewEntries();
 
+  connect( mMapRotationSpinBox, &QgsDoubleSpinBox::editingFinished, this, &QgsComposerMapWidget::rotationChanged );
+
   blockAllSignals( false );
 }
 
@@ -491,15 +493,15 @@ void QgsComposerMapWidget::on_mScaleLineEdit_editingFinished()
   mComposerMap->endCommand();
 }
 
-void QgsComposerMapWidget::on_mMapRotationSpinBox_valueChanged( double value )
+void QgsComposerMapWidget::rotationChanged()
 {
   if ( !mComposerMap )
   {
     return;
   }
 
   mComposerMap->beginCommand( tr( "Map rotation changed" ), QgsComposerMergeCommand::ComposerMapRotation );
-  mComposerMap->setMapRotation( value );
+  mComposerMap->setMapRotation( mMapRotationSpinBox->value() );
   mComposerMap->endCommand();
   mComposerMap->cache();
   mComposerMap->update();
diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -39,7 +39,6 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
   public slots:
     void on_mPreviewModeComboBox_activated( int i );
     void on_mScaleLineEdit_editingFinished();
-    void on_mMapRotationSpinBox_valueChanged( double value );
     void on_mSetToMapCanvasExtentButton_clicked();
     void on_mViewExtentInCanvasButton_clicked();
     void on_mUpdatePreviewButton_clicked();
@@ -132,6 +131,8 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     //! Blocks / unblocks the signals of all GUI elements
     void blockAllSignals( bool b );
 
+    void rotationChanged();
+
     void handleChangedFrameDisplay( QgsComposerMapGrid::BorderSide border, const QgsComposerMapGrid::DisplayMode mode );
     void handleChangedAnnotationDisplay( QgsComposerMapGrid::BorderSide border, const QString &text );
     void handleChangedAnnotationPosition( QgsComposerMapGrid::BorderSide border, const QString &text );

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,8 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap *composerMap )`
`119`	`119`	`loadGridEntries();`
`120`	`120`	`loadOverviewEntries();`
`121`	`121`
	`122`	`+ connect( mMapRotationSpinBox, &QgsDoubleSpinBox::editingFinished, this, &QgsComposerMapWidget::rotationChanged );`
	`123`	`+`
`122`	`124`	`blockAllSignals( false );`
`123`	`125`	`}`
`124`	`126`
`@@ -491,15 +493,15 @@ void QgsComposerMapWidget::on_mScaleLineEdit_editingFinished()`
`491`	`493`	`mComposerMap->endCommand();`
`492`	`494`	`}`
`493`	`495`
`494`		`-void QgsComposerMapWidget::on_mMapRotationSpinBox_valueChanged( double value )`
	`496`	`+void QgsComposerMapWidget::rotationChanged()`
`495`	`497`	`{`
`496`	`498`	`if ( !mComposerMap )`
`497`	`499`	`{`
`498`	`500`	`return;`
`499`	`501`	`}`
`500`	`502`
`501`	`503`	`mComposerMap->beginCommand( tr( "Map rotation changed" ), QgsComposerMergeCommand::ComposerMapRotation );`
`502`		`- mComposerMap->setMapRotation( value );`
	`504`	`+ mComposerMap->setMapRotation( mMapRotationSpinBox->value() );`
`503`	`505`	`mComposerMap->endCommand();`
`504`	`506`	`mComposerMap->cache();`
`505`	`507`	`mComposerMap->update();`