Re-factored the source to use the new coordinate classes

[situare] / src / coordinates / scenecoordinate.cpp

diff --git a/src/coordinates/scenecoordinate.cpp b/src/coordinates/scenecoordinate.cpp
index 14965e6..4618eb7 100644 (file)
--- a/src/coordinates/scenecoordinate.cpp
+++ b/src/coordinates/scenecoordinate.cpp
@@ -22,6 +22,7 @@
 #include <cmath>
 
 #include <QDebug>
+#include <QPointF>
 
 #include "geocoordinate.h"
 #include "map/osm.h"
@@ -42,7 +43,7 @@ SceneCoordinate::SceneCoordinate(double x, double y) :
     qDebug() << __PRETTY_FUNCTION__;
 }
 
-SceneCoordinate::SceneCoordinate(GeoCoordinate &coordinate)
+SceneCoordinate::SceneCoordinate(const GeoCoordinate &coordinate)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -86,32 +87,39 @@ void SceneCoordinate::normalize(double &value, int min, int max)
         value -= max - min + 1;
 }
 
-double SceneCoordinate::x() const
+void SceneCoordinate::setX(double x)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    return m_x;
+    m_x = x;
 }
 
-double SceneCoordinate::y() const
+void SceneCoordinate::setY(double y)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    return m_y;
+    m_y = y;
 }
 
-void SceneCoordinate::setX(double x)
+QPointF SceneCoordinate::toPointF() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_x = x;
+    return QPointF(m_x, m_y);
 }
 
-void SceneCoordinate::setY(double y)
+double SceneCoordinate::x() const
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_y = y;
+    return m_x;
+}
+
+double SceneCoordinate::y() const
+{
+    qDebug() << __PRETTY_FUNCTION__;
+
+    return m_y;
 }
 
 QDebug operator<<(QDebug dbg, const SceneCoordinate &coordinate)