Updated.

diff --git a/images.qrc b/images.qrc
index e38df87..da5e096 100644 (file)
--- a/images.qrc
+++ b/images.qrc
@@ -22,5 +22,6 @@
         <file>res/images/list_item_bottom.png</file>
         <file>res/images/list_item_middle.png</file>
         <file>res/images/list_item_top.png</file>
+        <file>res/dummy/nmealog.txt</file>
     </qresource>
 </RCC>

diff --git a/src/gps/gpsposition.cpp b/src/gps/gpsposition.cpp
index 510e42a..3afae1b 100644 (file)
--- a/src/gps/gpsposition.cpp
+++ b/src/gps/gpsposition.cpp
@@ -20,6 +20,10 @@
 */
 
 #include <QGeoPositionInfoSource>
+#include <QNmeaPositionInfoSource>
+#include <QFile>
+#include <QDir>
+#include <QApplication>
 #include <QDebug>
 
 #include "gpsposition.h"
@@ -27,13 +31,20 @@
 GPSPosition::GPSPosition(QObject *parent)
     : QObject(parent)
 {
-    m_gpsSource = QGeoPositionInfoSource::createDefaultSource(this);
+    m_gpsSource = 0; //QGeoPositionInfoSource::createDefaultSource(this);
 
-    if (m_gpsSource)
-        m_gpsSource->setUpdateInterval(10000);
+//    if (!m_gpsSource) {
+        QNmeaPositionInfoSource *nmeaSource = new QNmeaPositionInfoSource(QNmeaPositionInfoSource::SimulationMode, this);
+        QFile *logFile = new QFile(":/res/dummy/nmealog.txt", this);
+        nmeaSource->setDevice(logFile);
+        m_gpsSource = nmeaSource;
+//    }
+
+    m_gpsSource->setUpdateInterval(5000);
 
     connect(m_gpsSource, SIGNAL(positionUpdated(QGeoPositionInfo)),
             this, SLOT(positionUpdated(QGeoPositionInfo)));
+    connect(m_gpsSource, SIGNAL(updateTimeout()), this, SLOT(updateTimeout()));
 }
 
 GPSPosition::~GPSPosition()
@@ -60,8 +71,13 @@ void GPSPosition::requestUpdate()
 
 void GPSPosition::positionUpdated(QGeoPositionInfo positionInfo)
 {
-    qDebug() << positionInfo;
+    qDebug() << __PRETTY_FUNCTION__ << " " << positionInfo;
 
     emit position(QPointF(positionInfo.coordinate().longitude(),
                           positionInfo.coordinate().latitude()));
 }
+
+void GPSPosition::updateTimeout()
+{
+    qDebug() << __PRETTY_FUNCTION__;
+}

diff --git a/src/gps/gpsposition.h b/src/gps/gpsposition.h
index da1ba59..890dce5 100644 (file)
--- a/src/gps/gpsposition.h
+++ b/src/gps/gpsposition.h
@@ -42,6 +42,7 @@ public:
 private slots:
     void requestUpdate();
     void positionUpdated(QGeoPositionInfo positionInfo);
+    void updateTimeout();
 
 signals:
     void position(QPointF latLonCoordinate);