Only enable reset track button when a track exists

nyalldawson · nyalldawson · commit 7ea1224539bc · 2022-11-07T18:24:52.000+10:00
diff --git a/src/app/gps/qgsappgpsdigitizing.cpp b/src/app/gps/qgsappgpsdigitizing.cpp
@@ -93,8 +93,9 @@ void QgsAppGpsDigitizing::addVertex()
   // we store the capture list in wgs84 and then transform to layer crs when
   // calling close feature
   const QgsPoint pointWgs84 = QgsPoint( mLastGpsPositionWgs84.x(), mLastGpsPositionWgs84.y(), mLastElevation );
-  mCaptureListWgs84.push_back( pointWgs84 );
 
+  const bool trackWasEmpty = mCaptureListWgs84.empty();
+  mCaptureListWgs84.push_back( pointWgs84 );
 
   // we store the rubber band points in map canvas CRS so transform to map crs
   // potential problem with transform errors and wrong coordinates if map CRS is changed after points are stored - SLM
@@ -118,14 +119,22 @@ void QgsAppGpsDigitizing::addVertex()
   }
 
   mRubberBand->addPoint( mapPoint );
+
+  if ( trackWasEmpty )
+    emit trackIsEmptyChanged( false );
 }
 
 void QgsAppGpsDigitizing::resetFeature()
 {
   mBlockGpsStateChanged++;
   createRubberBand(); //deletes existing rubberband
+
+  const bool trackWasEmpty = mCaptureListWgs84.isEmpty();
   mCaptureListWgs84.clear();
   mBlockGpsStateChanged--;
+
+  if ( !trackWasEmpty )
+    emit trackIsEmptyChanged( true );
 }
 
 void QgsAppGpsDigitizing::addFeature()
@@ -282,6 +291,7 @@ void QgsAppGpsDigitizing::addFeature()
 
       f.setGeometry( g );
       QgsFeatureAction action( tr( "Feature added" ), f, vlayer, QUuid(), -1, this );
+
       if ( action.addFeature( attrMap ) )
       {
         if ( QgsProject::instance()->gpsSettings()->automaticallyCommitFeatures() )
@@ -304,6 +314,10 @@ void QgsAppGpsDigitizing::addFeature()
       } // action.addFeature()
 
       mBlockGpsStateChanged--;
+
+      if ( mCaptureListWgs84.empty() )
+        emit trackIsEmptyChanged( true );
+
       break;
     }
 
diff --git a/src/app/gps/qgsappgpsdigitizing.h b/src/app/gps/qgsappgpsdigitizing.h
@@ -62,6 +62,11 @@ class APP_EXPORT QgsAppGpsDigitizing: public QObject
 
   signals:
 
+    /**
+     * Emitted whenever the current track changes from being empty to non-empty or vice versa.
+     */
+    void trackIsEmptyChanged( bool isEmpty );
+
     void timeStampDestinationChanged( const QString &fieldName );
 
   private slots:
diff --git a/src/app/gps/qgsgpstoolbar.cpp b/src/app/gps/qgsgpstoolbar.cpp
@@ -121,6 +121,7 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
   mRecenterAction->setEnabled( false );
   mAddFeatureAction->setEnabled( false );
   mAddTrackVertexAction->setEnabled( false );
+  mResetFeatureAction->setEnabled( false );
   connect( mConnection, &QgsAppGpsConnection::statusChanged, this, [ = ]( Qgis::GpsConnectionStatus status )
   {
     switch ( status )
@@ -170,6 +171,11 @@ void QgsGpsToolBar::setAddVertexButtonEnabled( bool enabled )
   mAddTrackVertexAction->setEnabled( mEnableAddVertexButton && mConnection->isConnected() );
 }
 
+void QgsGpsToolBar::setResetTrackButtonEnabled( bool enabled )
+{
+  mResetFeatureAction->setEnabled( enabled );
+}
+
 void QgsGpsToolBar::updateLocationLabel( const QgsPoint &point )
 {
   if ( point.isEmpty() )
diff --git a/src/app/gps/qgsgpstoolbar.h b/src/app/gps/qgsgpstoolbar.h
@@ -45,6 +45,7 @@ class QgsGpsToolBar : public QToolBar
   public slots:
 
     void setAddVertexButtonEnabled( bool enabled );
+    void setResetTrackButtonEnabled( bool enabled );
 
   private slots:
 
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1420,6 +1420,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers
   connect( mGpsSettingsMenu, &QgsAppGpsSettingsMenu::nmeaLogFileChanged, mGpsDigitizing, &QgsAppGpsDigitizing::setNmeaLogFile );
   connect( mGpsSettingsMenu, &QgsAppGpsSettingsMenu::timeStampDestinationChanged, mGpsDigitizing, &QgsAppGpsDigitizing::setTimeStampDestination );
   connect( mGpsDigitizing, &QgsAppGpsDigitizing::timeStampDestinationChanged, mGpsSettingsMenu, &QgsAppGpsSettingsMenu::setCurrentTimeStampField );
+  connect( mGpsDigitizing, &QgsAppGpsDigitizing::trackIsEmptyChanged, mGpsToolBar, [ = ]( bool isEmpty ) { mGpsToolBar->setResetTrackButtonEnabled( !isEmpty ); } );
 
   mpGpsWidget = new QgsGpsInformationWidget( mGpsConnection, mMapCanvas );
   QgsPanelWidgetStack *gpsStack = new QgsPanelWidgetStack();

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection connection, QgsMapCanvas can`
`121`	`121`	`mRecenterAction->setEnabled( false );`
`122`	`122`	`mAddFeatureAction->setEnabled( false );`
`123`	`123`	`mAddTrackVertexAction->setEnabled( false );`
	`124`	`+ mResetFeatureAction->setEnabled( false );`
`124`	`125`	`connect( mConnection, &QgsAppGpsConnection::statusChanged, this, [ = ]( Qgis::GpsConnectionStatus status )`
`125`	`126`	`{`
`126`	`127`	`switch ( status )`
`@@ -170,6 +171,11 @@ void QgsGpsToolBar::setAddVertexButtonEnabled( bool enabled )`
`170`	`171`	`mAddTrackVertexAction->setEnabled( mEnableAddVertexButton && mConnection->isConnected() );`
`171`	`172`	`}`
`172`	`173`
	`174`	`+void QgsGpsToolBar::setResetTrackButtonEnabled( bool enabled )`
	`175`	`+{`
	`176`	`+ mResetFeatureAction->setEnabled( enabled );`
	`177`	`+}`
	`178`	`+`
`173`	`179`	`void QgsGpsToolBar::updateLocationLabel( const QgsPoint &point )`
`174`	`180`	`{`
`175`	`181`	`if ( point.isEmpty() )`