Add options menu and allow setting map view scale

qgis · Mar 13, 2017 · 02a0e53 · 02a0e53
1 parent 9560bba
commit 02a0e53
Show file tree

Hide file tree

Showing 4 changed files with 254 additions and 0 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -557,6 +557,7 @@
         <file>themes/default/processingResult.svg</file>
         <file>themes/default/search.svg</file>
         <file>themes/default/mActionNewMap.svg</file>
+        <file>themes/default/mActionMapSettings.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/mActionMapSettings.svg b/images/themes/default/mActionMapSettings.svg
diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -15,7 +15,11 @@
 #include "qgsmapcanvasdockwidget.h"
 #include "qgsmapcanvas.h"
 #include "qgsprojectionselectiondialog.h"
+#include "qgsscalecombobox.h"
 #include <QMessageBox>
+#include <QMenu>
+#include <QToolBar>
+#include <QToolButton>
 
 QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *parent )
   : QgsDockWidget( parent )
@@ -38,6 +42,36 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
 
   connect( mActionSetCrs, &QAction::triggered, this, &QgsMapCanvasDockWidget::setMapCrs );
   connect( mActionSyncView, &QAction::toggled, this, &QgsMapCanvasDockWidget::syncView );
+
+  QMenu *menu = new QMenu();
+
+  QToolButton *toolButton = new QToolButton();
+  toolButton->setMenu( menu );
+  toolButton->setPopupMode( QToolButton::InstantPopup );
+  toolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionMapSettings.svg" ) ) );
+  mToolbar->addWidget( toolButton );
+
+  QgsScaleComboAction *scaleAction = new QgsScaleComboAction( menu );
+  menu->addAction( scaleAction );
+  mScaleCombo = scaleAction->scaleCombo();
+  connect( mScaleCombo, &QgsScaleComboBox::scaleChanged, this, [ = ]( double scale )
+  {
+    if ( !mBlockScaleUpdate )
+    {
+      mBlockScaleUpdate = true;
+      mMapCanvas->zoomScale( 1.0 / scale );
+      mBlockScaleUpdate = false;
+    }
+  } );
+  connect( mMapCanvas, &QgsMapCanvas::scaleChanged, this, [ = ]( double scale )
+  {
+    if ( !mBlockScaleUpdate )
+    {
+      mBlockScaleUpdate = true;
+      mScaleCombo->setScale( 1.0 / scale );
+      mBlockScaleUpdate = false;
+    }
+  } );
 }
 
 QgsMapCanvas *QgsMapCanvasDockWidget::mapCanvas()
@@ -106,3 +140,18 @@ void QgsMapCanvasDockWidget::mapExtentChanged()
 
   syncView( true );
 }
+
+QgsScaleComboAction::QgsScaleComboAction( QWidget *parent )
+  : QWidgetAction( parent )
+{
+  mScaleCombo = new QgsScaleComboBox();
+
+  QHBoxLayout *hLayout = new QHBoxLayout();
+  hLayout->setContentsMargins( 2, 2, 2, 2 );
+  QLabel *label = new QLabel( tr( "Scale" ) );
+  hLayout->addWidget( label );
+  hLayout->addWidget( mScaleCombo );
+  QWidget *w = new QWidget();
+  w->setLayout( hLayout );
+  setDefaultWidget( w );
+}
diff --git a/src/app/qgsmapcanvasdockwidget.h b/src/app/qgsmapcanvasdockwidget.h
@@ -19,9 +19,16 @@
 
 #include "qgsdockwidget.h"
 #include "qgis_app.h"
+#include <QWidgetAction>
 
 class QgsMapCanvas;
+class QgsScaleComboBox;
 
+/**
+ * \class QgsMapCanvasDockWidget
+ * A dock widget with an embedded map canvas, for additional map views.
+ * \note added in QGIS 3.0
+ */
 class APP_EXPORT QgsMapCanvasDockWidget : public QgsDockWidget, private Ui::QgsMapCanvasDockWidgetBase
 {
     Q_OBJECT
@@ -58,8 +65,28 @@ class APP_EXPORT QgsMapCanvasDockWidget : public QgsDockWidget, private Ui::QgsM
     QgsMapCanvas *mMapCanvas = nullptr;
     QgsMapCanvas *mMainCanvas = nullptr;
     bool mShowCloseWarning = true;
+    QgsScaleComboBox *mScaleCombo = nullptr;
+    bool mBlockScaleUpdate = false;
+};
 
+/**
+ * \class QgsScaleComboAction
+ * Allows embedding a scale combo into a menu.
+ * \note added in QGIS 3.0
+ */
 
+class QgsScaleComboAction: public QWidgetAction
+{
+    Q_OBJECT
+
+  public:
+
+    QgsScaleComboAction( QWidget *parent = nullptr );
+
+    QgsScaleComboBox *scaleCombo() { return mScaleCombo; }
+
+  private:
+    QgsScaleComboBox *mScaleCombo = nullptr;
 };