Removed the doublePoint class, using QPointF

city.cpp

@@ -1,6 +1,6 @@
 #include "city.h"
 
 void City::pushPoint(double x, double y) {
-    geometry->push_back(DoublePoint(x,y));
+    geometry->push_back(QPointF(x,y));
 
 }

city.h

@@ -1,7 +1,7 @@
 #ifndef CITY_H
 #define CITY_H
 
-#include <doublepoint.h>
+#include <QPointF>
 #include <QVector>
 
 ///
@@ -11,7 +11,7 @@
 
 class City {
 public:
-    QVector<DoublePoint> *geometry;
+    QVector<QPointF> *geometry;
     
     /// \fn City()
     /// \~English
@@ -37,13 +37,13 @@ public:
     ///
     virtual int getSize() const { return geometry->size(); }
 
-    /// \fn QVector<DoublePoint> *getGeometry()
+    /// \fn QVector<QPointF> *getGeometry()
     /// \~English
     /// \brief get a pointer to the vector of points
     /// \~Spanish
     /// \brief devuelve un puntero al vector de puntos
     ///
-    QVector<DoublePoint> *getGeometry() const { return geometry; }
+    QVector<QPointF> *getGeometry() const { return geometry; }
     
 
     /// \fn ~City()

country.cpp

@@ -8,19 +8,19 @@
 void Country::limits(){
     QMap<QString,City*>::iterator it = Cities.begin();
 
-    minX = maxX = Cities.begin().value()->geometry->at(0).x;
-    minY = maxY = Cities.begin().value()->geometry->at(0).y;
+    minX = maxX = Cities.begin().value()->geometry->at(0).x();
+    minY = maxY = Cities.begin().value()->geometry->at(0).y();
 
     for (it = Cities.begin() + 1; it != Cities.end(); ++it) {
 
         City *c = it.value();
 
         for (int i = 0; i < c->getSize(); i++) {
-            if (c->geometry->at(i).x != 0.0) {
-            if (c->geometry->at(i).x > maxX ) maxX = c->geometry->at(i).x;
-            if (c->geometry->at(i).y > maxY ) maxY = c->geometry->at(i).y;
-            if (c->geometry->at(i).x < minX ) minX = c->geometry->at(i).x;
-            if (c->geometry->at(i).y < minY ) minY = c->geometry->at(i).y;
+            if (c->geometry->at(i).x() != 0.0) {
+            if (c->geometry->at(i).x() > maxX ) maxX = c->geometry->at(i).x();
+            if (c->geometry->at(i).y() > maxY ) maxY = c->geometry->at(i).y();
+            if (c->geometry->at(i).x() < minX ) minX = c->geometry->at(i).x();
+            if (c->geometry->at(i).y() < minY ) minY = c->geometry->at(i).y();
             }
         }
     }
@@ -43,12 +43,12 @@ bool Country::readInfoFromJSON(const QString &fileName) {
 
     int ctr = 1;
     foreach(QJsonValue obj, topLevelArray) {
-        QVector<DoublePoint> *points = new QVector<DoublePoint>;
+        QVector<QPointF> *points = new QVector<QPointF>;
         QJsonArray geometryArray = obj.toObject()["geometry"].toObject()["coordinates"].toArray();
         QString polyType = obj.toObject()["geometry"].toObject()["type"].toString();
         if (polyType == "Polygon") {
             for (int i = 0; i < geometryArray[0].toArray().size(); i++) {
-                points->push_back(DoublePoint(
+                points->push_back(QPointF(
                                 geometryArray[0].toArray()[i].toArray()[0].toDouble(),
                                 geometryArray[0].toArray()[i].toArray()[1].toDouble()));
             }
@@ -58,13 +58,13 @@ bool Country::readInfoFromJSON(const QString &fileName) {
             for (int i = 0; i <geometryArray.size() ; i++) {
                 // for every point in the city's polygon
                 for (int j = 0; j < geometryArray[i].toArray()[0].toArray().size(); j++) {
-                    points->push_back(DoublePoint(
+                    points->push_back(QPointF(
                                           geometryArray[i].toArray()[0].toArray()[j].toArray()[0].toDouble(),
                                           geometryArray[i].toArray()[0].toArray()[j].toArray()[1].toDouble()));
 
                 }
                 // I will push a 0,0 between each polygon of a multipolygon to distinguish
-                points->push_back(DoublePoint(0,0));
+                points->push_back(QPointF(0,0));
             }
         }
 

country.h

@@ -1,7 +1,7 @@
 #ifndef COUNTRY_H
 #define COUNTRY_H
 
-#include <doublepoint.h>
+#include <QPointF>
 #include <city.h>
 #include <QMap>
 

doublepoint.cpp

@@ -1,3 +0,0 @@
-#include "doublepoint.h"
-
-

doublepoint.h

@@ -1,32 +0,0 @@
-#ifndef DOUBLEPOINT_H
-#define DOUBLEPOINT_H
-
-/// \brief A class to display to represent a point in the x,y plane.
-
-class DoublePoint {
-public:
-    double x, y;
-
-    /// \fn DoublePoint()
-    /// \~English
-    /// \brief default constructor
-    /// \~Spanish
-    /// \brief constructor por defecto
-    ///
-    DoublePoint() {x = 0; y = 0;}
-
-
-    /// \fn DoublePoint(double xp, double yp)
-    /// \~English
-    /// \brief constructor that sets the coordinates
-    /// \param xp value for x
-    /// \param yp value for y
-    /// \~Spanish
-    /// \brief constructor que setea las coordenadas
-    /// \param xp valor para coordenada x
-    /// \param yp valor para coordenada y
-    ///
-    DoublePoint(double xp, double yp) { x = xp; y = yp; }
-};
-
-#endif // DOUBLEPOINT_H

gispoi.h

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <QDebug>
 #include <cmath>
-#include "doublepoint.h"
+#include <QPointF>
 using namespace std;
 
 const double EARTH_RADIUS =  6372.8;

mainwindow.cpp

@@ -15,7 +15,7 @@
 #include <QPolygon>
 #include <city.h>
 #include <country.h>
-#include <doublepoint.h>
+#include <QPointF>
 #include <gispoi.h>
 
 using namespace std;

map.cpp

@@ -94,11 +94,11 @@ void Map::paintEvent(QPaintEvent *) {
         City *c = it.value();
 
         int x1 ,y1, x2, y2;
-        x1 = factorX * (c->getGeometry()->at(0).x - myCountry->minX);
-        y1 = height() - factorY*(c->getGeometry()->at(0).y - myCountry->minY)  ;
+        x1 = factorX * (c->getGeometry()->at(0).x() - myCountry->minX);
+        y1 = height() - factorY*(c->getGeometry()->at(0).y() - myCountry->minY)  ;
 
-        DoublePoint p1 = c->getGeometry()->at(0);
-        DoublePoint p2;
+        QPointF p1 = c->getGeometry()->at(0);
+        QPointF p2;
         int ctr = 0;
 
         QPoint *qp = qpA[cityCounter];
@@ -116,16 +116,16 @@ void Map::paintEvent(QPaintEvent *) {
         for(int i = 0; i < c->getSize() + 1; i++) {
             p2 = c->getGeometry()->at((i+1)%c->getSize());
 
-            x2 = factorX * (p2.x - myCountry->minX);
-            y2 = height() - factorY*(p2.y - myCountry->minY)  ;
+            x2 = factorX * (p2.x() - myCountry->minX);
+            y2 = height() - factorY*(p2.y() - myCountry->minY)  ;
 
-            if (p2.x != 0 && p1.x != 0) {
+            if (p2.x() != 0 && p1.x() != 0) {
                 qp->setX(x2);
                 qp->setY(y2);
                 ctr++;
                 qp++;
             }
-            else if (p2.x == 0) {
+            else if (p2.x() == 0) {
                 QPolygon yourPoly;
                 for (int i = 0; i < ctr; i++) yourPoly.push_back(qpBegin[i]);
                 QPainterPath tmpPath;

prMap.pro

@@ -17,14 +17,12 @@ SOURCES += main.cpp\
         mainwindow.cpp \
     city.cpp \
     country.cpp \
-    doublepoint.cpp \
     map.cpp \
     gispoi.cpp
 
 HEADERS  += mainwindow.h \
     city.h \
     country.h \
-    doublepoint.h \
     map.h \
     gispoi.h