Cleanup GPS fix status handling, remove duplicate code

qgis · Nov 4, 2022 · 06ef6e1 · 06ef6e1
1 parent a9a57a6
commit 06ef6e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/app/gps/qgsappgpsconnection.h b/src/app/gps/qgsappgpsconnection.h
@@ -136,11 +136,14 @@ class APP_EXPORT QgsAppGpsConnection : public QObject
 
     void onConnected( QgsGpsConnection *conn );
 
+    void onDeviceStateChanged( const QgsGpsInformation &info );
+
   private:
 
     void showStatusBarMessage( const QString &msg );
 
     QgsGpsConnection *mConnection = nullptr;
+    Qgis::GpsFixStatus mLastFixStatus = Qgis::GpsFixStatus::NoData;
 };
 
 

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -358,6 +358,7 @@ QgsGpsInformationWidget::QgsGpsInformationWidget( QgsAppGpsConnection *connectio
   connect( mConnection, &QgsAppGpsConnection::connected, this, &QgsGpsInformationWidget::gpsConnected );
   connect( mConnection, &QgsAppGpsConnection::disconnected, this, &QgsGpsInformationWidget::gpsDisconnected );
   connect( mConnection, &QgsAppGpsConnection::stateChanged, this, &QgsGpsInformationWidget::displayGPSInformation );
+  connect( mConnection, &QgsAppGpsConnection::fixStatusChanged, this, &QgsGpsInformationWidget::setStatusIndicator );
 
   connect( mConnection, &QgsAppGpsConnection::statusChanged, this, [ = ]( Qgis::GpsConnectionStatus status )
   {
@@ -664,8 +665,6 @@ void QgsGpsInformationWidget::gpsDisconnected()
     mMapBearingItem = nullptr;
   }
   mGPSPlainTextEdit->appendPlainText( tr( "Disconnected…" ) );
-
-  setStatusIndicator( Qgis::GpsFixStatus::NoData );
 }
 
 void QgsGpsInformationWidget::displayGPSInformation( const QgsGpsInformation &info )
@@ -675,14 +674,6 @@ void QgsGpsInformationWidget::displayGPSInformation( const QgsGpsInformation &in
 
   QVector<QPointF> data;
 
-  // set visual status indicator -- do only on change of state
-  Qgis::GnssConstellation constellation = Qgis::GnssConstellation::Unknown;
-  const Qgis::GpsFixStatus fixStatus = info.bestFixStatus( constellation );
-  if ( fixStatus != mLastFixStatus )
-  {
-    setStatusIndicator( fixStatus );
-  }
-
   if ( mStackedWidget->currentIndex() == 1 && info.satInfoComplete ) //signal
   {
     mPlot->setAxisScale( QwtPlot::xBottom, 0, info.satellitesInView.size() );
@@ -1369,7 +1360,6 @@ void QgsGpsInformationWidget::layerEditStateChanged()
 
 void QgsGpsInformationWidget::setStatusIndicator( Qgis::GpsFixStatus statusValue )
 {
-  mLastFixStatus = statusValue;
   // the pixmap will be expanded to the size of the label
   QPixmap status( 4, 4 );
   switch ( statusValue )

diff --git a/src/app/gps/qgsgpsinformationwidget.h b/src/app/gps/qgsgpsinformationwidget.h
@@ -142,7 +142,6 @@ class APP_EXPORT QgsGpsInformationWidget: public QgsPanelWidget, public QgsMapCa
     QgsPointXY mSecondLastGpsPosition;
     QVector<QgsPoint> mCaptureList;
     double mLastElevation = 0.0;
-    Qgis::GpsFixStatus mLastFixStatus = Qgis::GpsFixStatus::NoData;
     QString mDateTimeFormat; // user specified format string in registry (no UI presented)
     QPointer< QgsVectorLayer > mLastLayer;
     QFile *mLogFile = nullptr;