Direction indicator triange updating

 - fixed azimuth calculation in SceneCoordinate::azimuthTo()

 - delivering new values from MapEngine to IndicatorButton

diff --git a/src/coordinates/scenecoordinate.cpp b/src/coordinates/scenecoordinate.cpp
index e3de4c5..c4b555e 100644 (file)
--- a/src/coordinates/scenecoordinate.cpp
+++ b/src/coordinates/scenecoordinate.cpp
@@ -55,7 +55,7 @@ SceneCoordinate::SceneCoordinate(const GeoCoordinate &coordinate)
 qreal SceneCoordinate::azimuthTo(const SceneCoordinate &to) const
 {
     QLineF line = QLineF(this->toPointF(), to.toPointF());
-    return line.angle();
+    return -line.angle() + 90.0;
 }
 
 void SceneCoordinate::convertFrom(const GeoCoordinate &coordinate)

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 9b78942..c809e26 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -673,6 +673,9 @@ void SituareEngine::signalsFromMapEngine()
 
     connect(m_mapEngine, SIGNAL(newMapResolution(qreal)),
             m_ui, SIGNAL(newMapResolution(qreal)));
+
+    connect(m_mapEngine, SIGNAL(directionIndicatorValuesUpdate(qreal,qreal)),
+            m_ui, SIGNAL(directionIndicatorValuesUpdate(qreal,qreal)));
 }
 
 void SituareEngine::signalsFromRoutingService()

diff --git a/src/engine/engine.h b/src/engine/engine.h
index b710b3b..35e3991 100644 (file)
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -292,6 +292,15 @@ signals:
     void clearUpdateLocationDialogData();
 
     /**
+    * @brief Signal when direction and distance from current map center point to current GPS
+    *        location is changed
+    *
+    * @param direction Direction in degrees
+    * @param distance Distance in kilometers
+    */
+    void directionIndicatorValuesUpdate(qreal direction, qreal distance);
+
+    /**
     * @brief Signals when new friends data is ready
     *
     * @param friendList List of User instances (friends)

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index 7d839a6..f858c17 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -549,6 +549,8 @@ int MapEngine::tilesPerSide(int zoomLevel)
 
 void MapEngine::updateDirectionIndicator()
 {
+    qDebug() << __PRETTY_FUNCTION__;
+
     /// @todo implement distance calculation
     qreal distance = 0;
 

diff --git a/src/map/mapengine.h b/src/map/mapengine.h
index a651195..7faffca 100644 (file)
--- a/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@ -387,6 +387,9 @@ signals:
     /**
     * @brief Signal when direction and distance from current map center point to current GPS
     *        location is changed
+    *
+    * @param direction Direction in degrees
+    * @param distance Distance in kilometers
     */
     void directionIndicatorValuesUpdate(qreal direction, qreal distance);
 

diff --git a/src/ui/indicatorbutton.cpp b/src/ui/indicatorbutton.cpp
index 8bdc29f..97d046a 100644 (file)
--- a/src/ui/indicatorbutton.cpp
+++ b/src/ui/indicatorbutton.cpp
@@ -168,11 +168,6 @@ void IndicatorButton::mouseReleaseEvent(QMouseEvent *event)
     QToolButton::mouseReleaseEvent(event);
 }
 
-void IndicatorButton::setDirection(qreal direction)
-{
-    m_direction = direction;
-}
-
 void IndicatorButton::setDraggable(bool mode, QPoint eventPosition)
 {
     qDebug() << __PRETTY_FUNCTION__;
@@ -286,3 +281,10 @@ void IndicatorButton::timerExpired()
 
     setDraggable(true, m_dragPosition);
 }
+
+void IndicatorButton::updateValues(qreal direction, qreal distance)
+{
+    qWarning() << __PRETTY_FUNCTION__ << "direction:" << direction;
+
+    m_direction = direction;
+}

diff --git a/src/ui/indicatorbutton.h b/src/ui/indicatorbutton.h
index f9572f1..9cf1eea 100644 (file)
--- a/src/ui/indicatorbutton.h
+++ b/src/ui/indicatorbutton.h
@@ -103,7 +103,14 @@ public slots:
      */
     void screenResized(const QSize &size);
 
-    void setDirection(qreal direction);
+    /**
+    * @brief Called when direction and distance from current map center point to current GPS
+    *        location is changed
+    *
+    * @param direction Direction in degrees
+    * @param distance Distance in kilometers
+    */
+    void updateValues(qreal direction, qreal distance);
 
     /**
      * @brief Toggle distance indicator button draggability

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 7f5997f..0756168 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -189,6 +189,9 @@ void MainWindow::buildIndicatorButton()
 
     connect(m_mapView, SIGNAL(viewResized(QSize)),
             m_indicatorButton, SLOT(screenResized(QSize)));
+
+    connect(this, SIGNAL(directionIndicatorValuesUpdate(qreal,qreal)),
+            m_indicatorButton, SLOT(updateValues(qreal,qreal)));
 }
 
 void MainWindow::buildInformationBox(const QString &message, bool modal)

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 6c0177f..f4a47d6 100644 (file)
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -432,6 +432,15 @@ signals:
     void centerToSceneCoordinates(const SceneCoordinate &coordinate);
 
     /**
+    * @brief Signal when direction and distance from current map center point to current GPS
+    *        location is changed
+    *
+    * @param direction Direction in degrees
+    * @param distance Distance in kilometers
+    */
+    void directionIndicatorValuesUpdate(qreal direction, qreal distance);
+
+    /**
      * @brief Signal for enabling automatic location update.
      *
      * @param enabled true if enabled, false otherwise