From 9938793ddd0ac6ad7e8751f18c1de8347f46ef71 Mon Sep 17 00:00:00 2001
From: Tats <info@sofianaudry.com>
Date: Sun, 9 Feb 2014 01:21:22 -0500
Subject: [PATCH] Adapted ellipse code to latest changes (Point -> QPointF).

---
 Mapper.cpp |  8 ++++----
 Shape.h    | 19 ++++++++++---------
 Util.cpp   | 16 ++++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Mapper.cpp b/Mapper.cpp
index 3f557d5..6c4a864 100644
--- a/Mapper.cpp
+++ b/Mapper.cpp
@@ -244,8 +244,8 @@ void EllipseColorMapper::draw(QPainter* painter)
   painter->setBrush(color->getColor());
 //  painter->translate()
   //painter->translate(0, rect.height()/2);
-  QPointF p0 = outputEllipse->getVertex(0)->toPoint();
-  QPointF center = outputEllipse->getCenter();
+  const QPointF& p0     = outputEllipse->getVertex(0);
+  const QPointF& center = outputEllipse->getCenter();
   float rx = rect.width() / 2;
   float ry = rect.height() / 2;
   painter->translate(center);
@@ -265,8 +265,8 @@ void EllipseColorMapper::draw(QPainter* painter)
     else
       painter->setBrush(QColor("#ffffff"));
 
-    painter->drawEllipse(outputEllipse->getVertex(i)->toPoint(), 5, 5);
-    painter->drawStaticText(outputEllipse->getVertex(i)->toPoint(), QString(i));
+    painter->drawEllipse(outputEllipse->getVertex(i), 5, 5);
+    painter->drawStaticText(outputEllipse->getVertex(i), QString(i));
   }
 
   painter->restore(); // restore saved painter state
diff --git a/Shape.h b/Shape.h
index 87919b2..88fb96a 100644
--- a/Shape.h
+++ b/Shape.h
@@ -22,6 +22,7 @@
 
 #include <tr1/memory>
 #include <iostream>
+#include <cmath>
 
 #include <QtGlobal>
 #include <QObject>
@@ -222,23 +223,23 @@ public:
   }
 
   QPointF getCenter() const {
-    return getVertex(0)->toPoint() + (getHorizontalAxis() / 2);
+    return getVertex(0) + (getHorizontalAxis() / 2);
   }
 
   QPointF getHorizontalAxis() const {
-    return getVertex(2)->toPoint() - getVertex(0)->toPoint();
+    return getVertex(2) - getVertex(0);
   }
 
   QPointF getVerticalAxis() const {
-    return getVertex(1)->toPoint() - getVertex(3)->toPoint();
+    return getVertex(1) - getVertex(3);
   }
 
-protected:
-  virtual void _vertexChanged(int i, Point* p=NULL) {
-    // Get horizontal and vertical axis length.
-    qreal hAxisLength = Point::dist(getVertex(0)->toPoint(), getVertex(2)->toPoint());
-    qreal vAxisLength = Point::dist(getVertex(1)->toPoint(), getVertex(3)->toPoint());
-  }
+//protected:
+//  virtual void _vertexChanged(int i, Point* p=NULL) {
+//    // Get horizontal and vertical axis length.
+//    qreal hAxisLength = Point::dist(getVertex(0)->toPoint(), getVertex(2)->toPoint());
+//    qreal vAxisLength = Point::dist(getVertex(1)->toPoint(), getVertex(3)->toPoint());
+//  }
 };
 
 #endif /* SHAPE_H_ */
diff --git a/Util.cpp b/Util.cpp
index c84d438..c396e99 100644
--- a/Util.cpp
+++ b/Util.cpp
@@ -83,10 +83,10 @@ Ellipse* createEllipseForTexture(Texture* texture, int frameWidth,
   qreal halfHeight = texture->getHeight() / 2;
 
   return new Ellipse(
-    Point(texture->getX(), texture->getY() + halfHeight),
-    Point(texture->getX() + halfWidth, texture->getY()),
-    Point(texture->getX() + texture->getWidth(), texture->getY() + halfHeight),
-    Point(texture->getX() + halfWidth, texture->getY() + texture->getHeight())
+    QPointF(texture->getX(), texture->getY() + halfHeight),
+    QPointF(texture->getX() + halfWidth, texture->getY()),
+    QPointF(texture->getX() + texture->getWidth(), texture->getY() + halfHeight),
+    QPointF(texture->getX() + halfWidth, texture->getY() + texture->getHeight())
   );
 }
 
@@ -114,10 +114,10 @@ Triangle* createTriangleForColor(int frameWidth, int frameHeight)
 Ellipse* createEllipseForColor(int frameWidth, int frameHeight)
 {
   return new Ellipse(
-    Point(frameWidth / 4, frameHeight / 2),
-    Point(frameWidth / 2, frameHeight / 4),
-    Point(frameWidth * 3 / 4, frameHeight / 2),
-    Point(frameWidth / 2, frameHeight * 3 / 4)
+    QPointF(frameWidth / 4, frameHeight / 2),
+    QPointF(frameWidth / 2, frameHeight / 4),
+    QPointF(frameWidth * 3 / 4, frameHeight / 2),
+    QPointF(frameWidth / 2, frameHeight * 3 / 4)
   );
 }