Added utc date and time to gps information and insert connection into the registry

mhugent · mhugent · commit 0081c37f6143 · 2010-02-03T10:09:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12862 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -18,6 +18,7 @@
 #include "qgsgpsinformationwidget.h"
 #include "qgsvectorlayer.h"
 #include "qgsnmeaconnection.h"
+#include "qgsgpsconnectionregistry.h"
 #include "qgsgpsdetector.h"
 #include "qgscoordinatetransform.h"
 #include <qgspoint.h>
@@ -338,12 +339,14 @@ void QgsGPSInformationWidget::connected( QgsGPSConnection *conn )
                     this, SLOT( displayGPSInformation( const QgsGPSInformation& ) ) );
   mGPSTextEdit->append( tr( "Connected!" ) );
   mConnectButton->setText( tr( "Disconnect" ) );
+  //insert connection into registry such that it can also be used by other dialogs or plugins
+  QgsGPSConnectionRegistry::instance()->registerConnection( mNmea );
 }
 
 void QgsGPSInformationWidget::disconnectGps()
 {
+  QgsGPSConnectionRegistry::instance()->unregisterConnection( mNmea );
   delete mNmea;
-
   mGPSTextEdit->append( tr( "Disconnected..." ) );
   mConnectButton->setChecked( false );
   mConnectButton->setText( tr( "Connect" ) );
diff --git a/src/core/gps/qgsgpsconnection.cpp b/src/core/gps/qgsgpsconnection.cpp
@@ -94,4 +94,6 @@ void QgsGPSConnection::clearLastGPSInformation()
   mLastGPSInformation.satellitesInView.clear();
   mLastGPSInformation.speed = 0;
   mLastGPSInformation.vdop = 0;
+  mLastGPSInformation.utcDateTime.setDate( QDate() );
+  mLastGPSInformation.utcDateTime.setTime( QTime() );
 }
diff --git a/src/core/gps/qgsgpsconnection.h b/src/core/gps/qgsgpsconnection.h
@@ -18,6 +18,7 @@
 #ifndef QGSGPSCONNECTION_H
 #define QGSGPSCONNECTION_H
 
+#include <QDateTime>
 #include <QObject>
 
 class QIODevice;
@@ -42,6 +43,7 @@ struct CORE_EXPORT QgsGPSInformation
   double pdop;
   double hdop;
   double vdop;
+  QDateTime utcDateTime;
 };
 
 /**Abstract base class for connection to a GPS device*/
diff --git a/src/core/gps/qgsnmeaconnection.cpp b/src/core/gps/qgsnmeaconnection.cpp
@@ -178,6 +178,13 @@ void QgsNMEAConnection::processRMCSentence( const char* data, int len )
     mLastGPSInformation.latitude = nmea_ndeg2degree( latitude );
     mLastGPSInformation.speed = KNOTS_TO_KMH * result.speed;
     mLastGPSInformation.direction = result.direction;
+
+    //date and time
+    QDate date( result.utc.year, result.utc.day, result.utc.sec );
+    QTime time( result.utc.hour, result.utc.min, result.utc.sec );
+    mLastGPSInformation.utcDateTime.setTimeSpec( Qt::UTC );
+    mLastGPSInformation.utcDateTime.setDate( date );
+    mLastGPSInformation.utcDateTime.setTime( time );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,6 @@ void QgsGPSConnection::clearLastGPSInformation()`
`94`	`94`	`mLastGPSInformation.satellitesInView.clear();`
`95`	`95`	`mLastGPSInformation.speed = 0;`
`96`	`96`	`mLastGPSInformation.vdop = 0;`
	`97`	`+ mLastGPSInformation.utcDateTime.setDate( QDate() );`
	`98`	`+ mLastGPSInformation.utcDateTime.setTime( QTime() );`
`97`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,13 @@ void QgsNMEAConnection::processRMCSentence( const char* data, int len )`
`178`	`178`	`mLastGPSInformation.latitude = nmea_ndeg2degree( latitude );`
`179`	`179`	`mLastGPSInformation.speed = KNOTS_TO_KMH * result.speed;`
`180`	`180`	`mLastGPSInformation.direction = result.direction;`
	`181`	`+`
	`182`	`+ //date and time`
	`183`	`+ QDate date( result.utc.year, result.utc.day, result.utc.sec );`
	`184`	`+ QTime time( result.utc.hour, result.utc.min, result.utc.sec );`
	`185`	`+ mLastGPSInformation.utcDateTime.setTimeSpec( Qt::UTC );`
	`186`	`+ mLastGPSInformation.utcDateTime.setDate( date );`
	`187`	`+ mLastGPSInformation.utcDateTime.setTime( time );`
`181`	`188`	`}`
`182`	`189`	`}`
`183`	`190`