Update the Effect and Warp items

2 files changed, 14 insertions, 14 deletions

diff --git a/sigmodr/widgets/EffectItem.cpp b/sigmodr/widgets/EffectItem.cpp
index 8f3049af..1699660b 100644
--- a/sigmodr/widgets/EffectItem.cpp
+++ b/sigmodr/widgets/EffectItem.cpp
@@ -42,27 +42,27 @@ EffectItem::EffectItem(MapEffect* effect, QGraphicsScene* parent) :
 
 QRectF EffectItem::boundingRect() const
 {
-    return m_effect->area();
+    QRectF rect = m_effect->area().boundingRect();
+    rect.moveTo(m_effect->position());
+    return rect;
 }
 
 void EffectItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     painter->setBrush(QBrush(Qt::red));
     painter->setPen(QPen(Qt::black, 2));
-    painter->drawRect(m_effect->area());
+    painter->drawPath(m_effect->area());
     MapItem::paint(painter, option, widget);
 }
 
 void EffectItem::moveTo(const QPoint& point)
 {
-    QRect area = m_effect->area();
-    area.setTopLeft(point);
-    m_effect->setArea(area);
+    m_effect->setPosition(point);
 }
 
 void EffectItem::effectChanged()
 {
-    setPos(m_effect->area().topLeft());
+    setPos(m_effect->position());
     resetLabel();
     update();
 }
@@ -70,6 +70,6 @@ void EffectItem::effectChanged()
 void EffectItem::resetLabel()
 {
     m_label->setText(m_effect->name());
-    QSizeF size = m_label->boundingRect().size() / 2 - m_effect->area().size() / 2;
+    QSizeF size = m_label->boundingRect().size() / 2 - m_effect->area().boundingRect().size() / 2;
     m_label->setPos(-size.width(), -size.height());
 }
diff --git a/sigmodr/widgets/WarpItem.cpp b/sigmodr/widgets/WarpItem.cpp
index 88278e73..2e7fbacd 100644
--- a/sigmodr/widgets/WarpItem.cpp
+++ b/sigmodr/widgets/WarpItem.cpp
@@ -42,27 +42,27 @@ WarpItem::WarpItem(MapWarp* warp, QGraphicsScene* parent) :
 
 QRectF WarpItem::boundingRect() const
 {
-    return m_warp->area();
+    QRectF rect = m_warp->area().boundingRect();
+    rect.moveTo(m_warp->position());
+    return rect;
 }
 
 void WarpItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     painter->setBrush(QBrush(Qt::green));
     painter->setPen(QPen(Qt::black, 2));
-    painter->drawRect(m_warp->area());
+    painter->drawPath(m_warp->area());
     MapItem::paint(painter, option, widget);
 }
 
 void WarpItem::moveTo(const QPoint& point)
 {
-    QRect area = m_warp->area();
-    area.setTopLeft(point);
-    m_warp->setArea(area);
+    m_warp->setPosition(point);
 }
 
 void WarpItem::warpChanged()
 {
-    setPos(m_warp->area().topLeft());
+    setPos(m_warp->position());
     resetLabel();
     update();
 }
@@ -70,6 +70,6 @@ void WarpItem::warpChanged()
 void WarpItem::resetLabel()
 {
     m_label->setText(m_warp->name());
-    QSizeF size = m_label->boundingRect().size() / 2 - m_warp->area().size() / 2;
+    QSizeF size = m_label->boundingRect().size() / 2 - m_warp->area().boundingRect().size() / 2;
     m_label->setPos(-size.width(), -size.height());
 }