Use project GPS settings destination layer in app gps digitizing classes

qgis · Nov 7, 2022 · c391448 · c391448
1 parent 544641c
commit c391448
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/src/app/gps/qgsappgpsdigitizing.cpp b/src/app/gps/qgsappgpsdigitizing.cpp
@@ -64,10 +64,10 @@ QgsAppGpsDigitizing::QgsAppGpsDigitizing( QgsAppGpsConnection *connection, QgsMa
   connect( mAcquisitionTimer.get(), &QTimer::timeout,
            this, &QgsAppGpsDigitizing::switchAcquisition );
 
-  connect( mCanvas, &QgsMapCanvas::currentLayerChanged,
+  connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::destinationLayerChanged,
            this, &QgsAppGpsDigitizing::updateTimestampDestinationFields );
 
-  updateTimestampDestinationFields( mCanvas->currentLayer() );
+  updateTimestampDestinationFields( QgsProject::instance()->gpsSettings()->destinationLayer() );
 
   connect( mConnection, &QgsAppGpsConnection::stateChanged, this, &QgsAppGpsDigitizing::gpsStateChanged );
   connect( mConnection, &QgsAppGpsConnection::connected, this, &QgsAppGpsDigitizing::gpsConnected );
@@ -130,7 +130,7 @@ void QgsAppGpsDigitizing::resetFeature()
 
 void QgsAppGpsDigitizing::addFeature()
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
+  QgsVectorLayer *vlayer = QgsProject::instance()->gpsSettings()->destinationLayer();
   if ( !vlayer )
     return;
 
@@ -318,7 +318,7 @@ void QgsAppGpsDigitizing::addFeature()
 
 void QgsAppGpsDigitizing::setTimeStampDestination( const QString &fieldName )
 {
-  if ( QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() ) )
+  if ( QgsVectorLayer *vlayer = QgsProject::instance()->gpsSettings()->destinationLayer() )
   {
     mPreferredTimestampFields[ vlayer->id() ] = fieldName;
   }
@@ -506,9 +506,8 @@ void QgsAppGpsDigitizing::gpsStateChanged( const QgsGpsInformation &info )
   }
 }
 
-void QgsAppGpsDigitizing::updateTimestampDestinationFields( QgsMapLayer *mapLayer )
+void QgsAppGpsDigitizing::updateTimestampDestinationFields( QgsVectorLayer *vlayer )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mapLayer );
   if ( vlayer )
   {
     // Restore preferred if stored

diff --git a/src/app/gps/qgsappgpsdigitizing.h b/src/app/gps/qgsappgpsdigitizing.h
@@ -77,7 +77,7 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
     /**
      * Updates compatible fields for timestamp recording
      */
-    void updateTimestampDestinationFields( QgsMapLayer *mapLayer );
+    void updateTimestampDestinationFields( QgsVectorLayer *mapLayer );
     void logNmeaSentence( const QString &nmeaString ); // added to handle 'raw' data
 
     void startLogging();

diff --git a/src/app/gps/qgsappgpssettingsmenu.cpp b/src/app/gps/qgsappgpssettingsmenu.cpp
@@ -299,8 +299,7 @@ void QgsAppGpsSettingsMenu::setCurrentTimeStampField( const QString &fieldName )
 
 void QgsAppGpsSettingsMenu::timeStampMenuAboutToShow()
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
-  mFieldProxyModel->sourceFieldModel()->setLayer( vlayer );
+  mFieldProxyModel->sourceFieldModel()->setLayer( QgsProject::instance()->gpsSettings()->destinationLayer() );
 
   mTimeStampDestinationFieldMenu->clear();
   bool foundPreviousField = false;

diff --git a/src/app/gps/qgsgpstoolbar.cpp b/src/app/gps/qgsgpstoolbar.cpp
@@ -151,13 +151,13 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
         mConnectAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/gpsicons/mIconGpsDisconnect.svg" ) ) );
         mConnectAction->setEnabled( true );
         mRecenterAction->setEnabled( true );
-        mAddFeatureAction->setEnabled( true );
+        mAddFeatureAction->setEnabled( static_cast< bool >( QgsProject::instance()->gpsSettings()->destinationLayer() ) );
         mAddTrackVertexAction->setEnabled( mEnableAddVertexButton );
         break;
     }
   } );
 
-  connect( QgisApp::instance(), &QgisApp::activeLayerChanged,
+  connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::destinationLayerChanged,
            this, &QgsGpsToolBar::updateCloseFeatureButton );
 
   connect( QgsProject::instance()->gpsSettings(), &QgsProjectGpsSettings::automaticallyAddTrackVerticesChanged, this, [ = ]( bool enabled ) { setAddVertexButtonEnabled( !enabled ); } );
@@ -183,12 +183,13 @@ void QgsGpsToolBar::updateLocationLabel( const QgsPoint &point )
   }
 }
 
-void QgsGpsToolBar::updateCloseFeatureButton( QgsMapLayer *lyr )
+void QgsGpsToolBar::updateCloseFeatureButton( QgsVectorLayer *vlayer )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( lyr );
-
   if ( !( vlayer && vlayer->isValid() ) )
+  {
+    mAddFeatureAction->setEnabled( false );
     return;
+  }
 
   // Add feature button tracks edit state of layer
   if ( vlayer != mLastLayer )

diff --git a/src/app/gps/qgsgpstoolbar.h b/src/app/gps/qgsgpstoolbar.h
@@ -49,7 +49,7 @@ class QgsGpsToolBar : public QToolBar
   private slots:
 
     void updateLocationLabel( const QgsPoint &point );
-    void updateCloseFeatureButton( QgsMapLayer *lyr );
+    void updateCloseFeatureButton( QgsVectorLayer *lyr );
     void layerEditStateChanged();
 
   private: