Added simple compass to routesave dialog. Compass shows direction of motion to eight...

diff --git a/Client/gpsdata.cpp b/Client/gpsdata.cpp
index abd4141..1fa4983 100644 (file)
--- a/Client/gpsdata.cpp
+++ b/Client/gpsdata.cpp
@@ -105,6 +105,7 @@ void GPSData::agnss()
         longitude   = location->getLongitude(); //Returns longitude.
         altitude    = location->getAltitude();  //Returns fix altitude in meters.
         speed       = location->getSpeed();     //Returns current speed in km/h.
+        track = location->getTrack(); //Returns direction of motion in degrees(0-359).
 
         QFile routeTempFile("routetemp.xml");//Temp xml.
 
@@ -288,3 +289,12 @@ double GPSData::getDistanceTraveled()
 {
     return distance;
 }
+
+/**
+  *This function returns direction of motion in degrees(0-359).
+  *@return double track
+  */
+double GPSData::getDirection()
+{
+    return track;
+}

diff --git a/Client/gpsdata.h b/Client/gpsdata.h
index 0327c45..f2e42cc 100644 (file)
--- a/Client/gpsdata.h
+++ b/Client/gpsdata.h
@@ -27,6 +27,7 @@ public:
     int roundCounter; //testing, move private!!!
 
     double getDistanceTraveled();
+    double getDirection();
 
 private:
     Maemo5Location *location;

diff --git a/Client/routesavedialog.cpp b/Client/routesavedialog.cpp
index fcccd5f..d24bcb2 100644 (file)
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@ -9,6 +9,19 @@
 #include "routesavedialog.h"
 #include "ui_routesavedialog.h"
 #include <QDebug>
+#include <QPainter>
+
+const QPoint arrowStartEast(100, 100);
+const QPoint arrowEndEast(140, 100);
+
+const QPoint arrowStartNorth(120, 120);
+const QPoint arrowEndNorth(120, 80);
+
+const QPoint arrowStartNortheast(100, 120);
+const QPoint arrowEndNortheast(140, 80);
+
+const QPoint arrowStartNorthwest(140, 120);
+const QPoint arrowEndNorthwest(100, 80);
 
 /**
   * Constructor of this class.
@@ -32,6 +45,7 @@ RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
     speed = 0.0;
     allSpeeds = 0.0;
     speedCount = 0;
+    direction = 0.0;
 
     //Button settings
     buttonStatus = true;
@@ -114,7 +128,100 @@ void RouteSaveDialog::changeEvent(QEvent *e)
 }
 
 /**
-  * This slot function is called when route start/stop button clicked.
+  * Draws compass to the UI
+  * @param QPaintEvent
+ */
+void RouteSaveDialog::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(QPen((Qt::gray),2));
+
+    painter.drawEllipse(arrowStartEast.x() - 30, arrowStartEast.y() - 50, 100, 100);
+
+    QFont font;
+    font.setPixelSize(26);
+    painter.setFont(font);
+    painter.drawText(arrowStartNorth.x() - 10, arrowEndNorth.y() - 45, "N");
+    painter.drawText(arrowStartEast.x() - 65, arrowStartEast.y() + 5, "W");
+    painter.drawText(arrowStartNorth.x()-10, arrowStartNorth.y()+55, "S");
+    painter.drawText(arrowEndEast.x() + 40, arrowEndEast.y() + 5, "E");
+
+    font.setPixelSize(12);
+    painter.setFont(font);
+    painter.drawText(arrowStartNorth.x() + 40, arrowEndNorth.y() - 25, "NE");
+    painter.drawText(arrowStartNorth.x() + 40, arrowStartEast.y() + 45, "SE");
+    painter.drawText(arrowStartEast.x() - 45, arrowStartEast.y() + 45, "SW");
+    painter.drawText(arrowStartEast.x() - 45, arrowEndNorth.y() - 25, "NW");
+
+    if (direction >= 67.5 && direction <= 112.5)
+    {
+        // East arrow
+        painter.drawLine(arrowStartEast, arrowEndEast);
+        painter.drawLine(arrowEndEast.x(), arrowEndEast.y(), arrowEndEast.x()-10, arrowEndEast.y()-5);
+        painter.drawLine(arrowEndEast.x(), arrowEndEast.y(), arrowEndEast.x()-10, arrowEndEast.y()+5);
+    }
+
+    else if (direction <= 292.5 && direction >= 247.5)
+    {
+        // West arrow
+        painter.drawLine(arrowStartEast, arrowEndEast);
+        painter.drawLine(arrowStartEast.x(), arrowStartEast.y(), arrowStartEast.x()+10, arrowEndEast.y()-5);
+        painter.drawLine(arrowStartEast.x(), arrowStartEast.y(), arrowStartEast.x()+10, arrowStartEast.y()+5);
+    }
+
+    else if (direction <= 202.5 && direction >= 157.5)
+    {
+        // South arrow
+        painter.drawLine(arrowStartNorth, arrowEndNorth);
+        painter.drawLine(arrowStartNorth.x(), arrowStartNorth.y(), arrowStartNorth.x()-5, arrowStartNorth.y()-10);
+        painter.drawLine(arrowStartNorth.x(), arrowStartNorth.y(), arrowStartNorth.x()+5, arrowStartNorth.y()-10);
+    }
+
+    else if (direction > 22.5 && direction < 67.5)
+    {
+        // Northeast arrow
+        painter.drawLine(arrowStartNortheast, arrowEndNortheast);
+        painter.drawLine(arrowEndNortheast.x(), arrowEndNortheast.y(), arrowEndNortheast.x()-10, arrowEndNortheast.y());
+        painter.drawLine(arrowEndNortheast.x(), arrowEndNortheast.y(), arrowEndNortheast.x(), arrowEndNortheast.y()+10);
+    }
+
+    else if (direction > 202.5 && direction < 247.5)
+    {
+        // Southwest arrow
+        painter.drawLine(arrowStartNortheast, arrowEndNortheast);
+        painter.drawLine(arrowStartNortheast.x(), arrowStartNortheast.y(), arrowStartNortheast.x(), arrowStartNortheast.y() - 10);
+        painter.drawLine(arrowStartNortheast.x(), arrowStartNortheast.y(), arrowStartNortheast.x() + 10, arrowStartNortheast.y());
+    }
+
+    else if (direction > 292.5 && direction < 336.5)
+    {
+        // Northwest arrow
+        painter.drawLine(arrowStartNorthwest, arrowEndNorthwest);
+        painter.drawLine(arrowEndNorthwest.x(), arrowEndNorthwest.y(), arrowEndNorthwest.x(), arrowEndNorthwest.y()+10);
+        painter.drawLine(arrowEndNorthwest.x(), arrowEndNorthwest.y(), arrowEndNorthwest.x()+10, arrowEndNorthwest.y());
+    }
+
+    else if (direction > 112.5 && direction < 157.5)
+    {
+        // Southeast arrow
+        painter.drawLine(arrowStartNorthwest, arrowEndNorthwest);
+        painter.drawLine(arrowStartNorthwest.x(), arrowStartNorthwest.y(), arrowStartNorthwest.x(), arrowStartNorthwest.y()-10);
+        painter.drawLine(arrowStartNorthwest.x(), arrowStartNorthwest.y(), arrowStartNorthwest.x()-10, arrowStartNorthwest.y());
+    }
+
+    else
+    {
+        // North arrow
+        painter.drawLine(arrowStartNorth, arrowEndNorth);
+        painter.drawLine(arrowEndNorth.x(), arrowEndNorth.y(), arrowEndNorth.x()-5, arrowEndNorth.y()+10);
+        painter.drawLine(arrowEndNorth.x(), arrowEndNorth.y(), arrowEndNorth.x()+5, arrowEndNorth.y()+10);
+    }
+}
+
+/**
+  *This slot function is called when route start/stop button clicked.
   */
 void RouteSaveDialog::on_buttonRouteStartStop_clicked()
 {
@@ -264,6 +371,10 @@ void RouteSaveDialog::gpsStatus()
             //Get GPS speed
             speed = location->getSpeed();
 
+            //Get GPS track means direction
+            direction = gpsData->getDirection();
+            repaint();
+
             //Set GPS speed
             gpsSpeed.sprintf("%.0f", speed);
             ui->labelGpsSpeed->setText(gpsSpeed + " km/h");
@@ -273,7 +384,7 @@ void RouteSaveDialog::gpsStatus()
             allSpeeds += speed;
             averageSpeed = allSpeeds/speedCount;
             gpsSpeed.sprintf("%.0f",averageSpeed);
-            ui->labelGpsAvgSpeed->setText("Average: " + gpsSpeed + " km/h");
+            ui->labelGpsAvgSpeed->setText("Avg: " + gpsSpeed + " km/h");
             ui->labelGpsAvgSpeed->setVisible(1);
             speedCount++;
 

diff --git a/Client/routesavedialog.h b/Client/routesavedialog.h
index ed35e68..924b4d6 100644 (file)
--- a/Client/routesavedialog.h
+++ b/Client/routesavedialog.h
@@ -36,6 +36,7 @@ public:
 
 protected:
     void changeEvent(QEvent *e);
+    void paintEvent(QPaintEvent *);
 
 private:
     Ui::RouteSaveDialog *ui;
@@ -55,6 +56,7 @@ private:
     double speed;
     double allSpeeds;
     int speedCount;
+    double direction;
 
 private slots:
     void on_pushButtonInfo_clicked();

diff --git a/Client/routesavedialog.ui b/Client/routesavedialog.ui
index 1537c1b..c3f8a0f 100644 (file)
--- a/Client/routesavedialog.ui
+++ b/Client/routesavedialog.ui
@@ -53,7 +53,7 @@
   <widget class="QLabel" name="labelRouteSatellitePicture">
    <property name="geometry">
     <rect>
-     <x>200</x>
+     <x>250</x>
      <y>60</y>
      <width>80</width>
      <height>80</height>
@@ -78,7 +78,7 @@
   <widget class="QLabel" name="labelRouteSatelliteStatus">
    <property name="geometry">
     <rect>
-     <x>90</x>
+     <x>140</x>
      <y>80</y>
      <width>301</width>
      <height>51</height>
@@ -99,7 +99,7 @@
   <widget class="QLabel" name="labelRoutePicture">
    <property name="geometry">
     <rect>
-     <x>200</x>
+     <x>250</x>
      <y>170</y>
      <width>80</width>
      <height>80</height>
@@ -124,7 +124,7 @@
   <widget class="QLabel" name="labelRouteStatus">
    <property name="geometry">
     <rect>
-     <x>90</x>
+     <x>140</x>
      <y>190</y>
      <width>301</width>
      <height>51</height>
@@ -148,8 +148,8 @@
   <widget class="QLabel" name="labelGpsSpeed">
    <property name="geometry">
     <rect>
-     <x>540</x>
-     <y>40</y>
+     <x>390</x>
+     <y>60</y>
      <width>241</width>
      <height>91</height>
     </rect>
@@ -163,7 +163,7 @@
     <string>GPS speed</string>
    </property>
    <property name="alignment">
-    <set>Qt::AlignCenter</set>
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="QLabel" name="label">
@@ -234,29 +234,29 @@
   <widget class="QLabel" name="labelGpsAvgSpeed">
    <property name="geometry">
     <rect>
-     <x>540</x>
-     <y>100</y>
-     <width>241</width>
+     <x>340</x>
+     <y>130</y>
+     <width>291</width>
      <height>91</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>20</pointsize>
+     <pointsize>36</pointsize>
     </font>
    </property>
    <property name="text">
     <string>GPS avg speed</string>
    </property>
    <property name="alignment">
-    <set>Qt::AlignCenter</set>
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>
   <widget class="QLabel" name="labelDistance">
    <property name="geometry">
     <rect>
-     <x>350</x>
-     <y>250</y>
+     <x>390</x>
+     <y>210</y>
      <width>241</width>
      <height>91</height>
     </rect>
@@ -270,7 +270,7 @@
     <string>Distance</string>
    </property>
    <property name="alignment">
-    <set>Qt::AlignCenter</set>
+    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
    </property>
   </widget>
  </widget>