Code factorization

qgis · Mar 16, 2023 · bc4339f · bc4339f
1 parent 2ab74cb
commit bc4339f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 46 deletions.
diff --git a/src/app/maptools/qgsmaptoolsdigitizingtechniquemanager.cpp b/src/app/maptools/qgsmaptoolsdigitizingtechniquemanager.cpp
@@ -93,22 +93,7 @@ void QgsMapToolsDigitizingTechniqueManager::setupToolBars()
 
   mDigitizeModeToolButton->setMenu( digitizeMenu );
 
-  const Qgis::CaptureTechnique technique = settingsDigitizingTechnique->value();
-  switch ( technique )
-  {
-    case Qgis::CaptureTechnique::StraightSegments:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithSegment );
-      break;
-    case Qgis::CaptureTechnique::CircularString:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithCurve );
-      break;
-    case Qgis::CaptureTechnique::Streaming:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionStreamDigitize );
-      break;
-    case Qgis::CaptureTechnique::Shape:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeShape );
-      break;
-  }
+  updateDigitizeModeButton( settingsDigitizingTechnique->value() );
 
   QgisApp::instance()->mDigitizeToolBar->insertWidget( QgisApp::instance()->mDigitizeToolBar->actions().at( 3 ), mDigitizeModeToolButton );
 
@@ -163,21 +148,7 @@ void QgsMapToolsDigitizingTechniqueManager::setCaptureTechnique( Qgis::CaptureTe
 
   mTechniqueActions.value( technique )->setChecked( true );
 
-  switch ( technique )
-  {
-    case Qgis::CaptureTechnique::StraightSegments:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithSegment );
-      break;
-    case Qgis::CaptureTechnique::CircularString:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithCurve );
-      break;
-    case Qgis::CaptureTechnique::Streaming:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionStreamDigitize );
-      break;
-    case Qgis::CaptureTechnique::Shape:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeShape );
-      break;
-  }
+  updateDigitizeModeButton( technique );
 
   // QgisApp::captureTools returns all registered capture tools + the eventual current capture tool
   const QList< QgsMapToolCapture * > tools = QgisApp::instance()->captureTools();
@@ -263,6 +234,25 @@ void QgsMapToolsDigitizingTechniqueManager::setupTool( QgsMapToolCapture *tool )
   } );
 }
 
+void QgsMapToolsDigitizingTechniqueManager::updateDigitizeModeButton( const Qgis::CaptureTechnique technique )
+{
+  switch ( technique )
+  {
+    case Qgis::CaptureTechnique::StraightSegments:
+      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithSegment );
+      break;
+    case Qgis::CaptureTechnique::CircularString:
+      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithCurve );
+      break;
+    case Qgis::CaptureTechnique::Streaming:
+      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionStreamDigitize );
+      break;
+    case Qgis::CaptureTechnique::Shape:
+      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeShape );
+      break;
+  }
+}
+
 void QgsMapToolsDigitizingTechniqueManager::enableDigitizingTechniqueActions( bool enabled, QAction *triggeredFromToolAction )
 {
   QgsSettings settings;
@@ -303,21 +293,7 @@ void QgsMapToolsDigitizingTechniqueManager::enableDigitizingTechniqueActions( bo
   }
 
   // Ensure the digitizing mode tool button is set to the correct action
-  switch ( actualCurrentTechnique )
-  {
-    case Qgis::CaptureTechnique::StraightSegments:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithSegment );
-      break;
-    case Qgis::CaptureTechnique::CircularString:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeWithCurve );
-      break;
-    case Qgis::CaptureTechnique::Streaming:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionStreamDigitize );
-      break;
-    case Qgis::CaptureTechnique::Shape:
-      mDigitizeModeToolButton->setDefaultAction( QgisApp::instance()->mActionDigitizeShape );
-      break;
-  }
+  updateDigitizeModeButton( actualCurrentTechnique );
 
   QMap<Qgis::CaptureTechnique, QAction *>::const_iterator cit = mTechniqueActions.constBegin();
   for ( ; cit != mTechniqueActions.constEnd(); ++ cit )

diff --git a/src/app/maptools/qgsmaptoolsdigitizingtechniquemanager.h b/src/app/maptools/qgsmaptoolsdigitizingtechniquemanager.h
@@ -74,6 +74,8 @@ class APP_EXPORT QgsMapToolsDigitizingTechniqueManager : public QObject
   private:
     void setupTool( QgsMapToolCapture *tool );
 
+    void updateDigitizeModeButton( const Qgis::CaptureTechnique technique );
+
     QMap<Qgis::CaptureTechnique, QAction *> mTechniqueActions;
     QHash<QString, QAction *> mShapeActions;
     QMap<QgsMapToolShapeAbstract::ShapeCategory, QToolButton *> mShapeCategoryButtons;