[QGIS Commit] r12862 - in trunk/qgis/src: app/gps core/gps

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-02-03 05:09:31 -0500 (Wed, 03 Feb 2010)
New Revision: 12862

Modified:
   trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
   trunk/qgis/src/core/gps/qgsgpsconnection.cpp
   trunk/qgis/src/core/gps/qgsgpsconnection.h
   trunk/qgis/src/core/gps/qgsnmeaconnection.cpp
Log:
Added utc date and time to gps information and insert connection into the registry

Modified: trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp
===================================================================
--- trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2010-02-02 20:53:39 UTC (rev 12861)
+++ trunk/qgis/src/app/gps/qgsgpsinformationwidget.cpp	2010-02-03 10:09:31 UTC (rev 12862)
@@ -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 @@
                     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" ) );

Modified: trunk/qgis/src/core/gps/qgsgpsconnection.cpp
===================================================================
--- trunk/qgis/src/core/gps/qgsgpsconnection.cpp	2010-02-02 20:53:39 UTC (rev 12861)
+++ trunk/qgis/src/core/gps/qgsgpsconnection.cpp	2010-02-03 10:09:31 UTC (rev 12862)
@@ -94,4 +94,6 @@
   mLastGPSInformation.satellitesInView.clear();
   mLastGPSInformation.speed = 0;
   mLastGPSInformation.vdop = 0;
+  mLastGPSInformation.utcDateTime.setDate( QDate() );
+  mLastGPSInformation.utcDateTime.setTime( QTime() );
 }

Modified: trunk/qgis/src/core/gps/qgsgpsconnection.h
===================================================================
--- trunk/qgis/src/core/gps/qgsgpsconnection.h	2010-02-02 20:53:39 UTC (rev 12861)
+++ trunk/qgis/src/core/gps/qgsgpsconnection.h	2010-02-03 10:09:31 UTC (rev 12862)
@@ -18,6 +18,7 @@
 #ifndef QGSGPSCONNECTION_H
 #define QGSGPSCONNECTION_H
 
+#include <QDateTime>
 #include <QObject>
 
 class QIODevice;
@@ -42,6 +43,7 @@
   double pdop;
   double hdop;
   double vdop;
+  QDateTime utcDateTime;
 };
 
 /**Abstract base class for connection to a GPS device*/

Modified: trunk/qgis/src/core/gps/qgsnmeaconnection.cpp
===================================================================
--- trunk/qgis/src/core/gps/qgsnmeaconnection.cpp	2010-02-02 20:53:39 UTC (rev 12861)
+++ trunk/qgis/src/core/gps/qgsnmeaconnection.cpp	2010-02-03 10:09:31 UTC (rev 12862)
@@ -178,6 +178,13 @@
     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 );
   }
 }