diff options
author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-19 19:49:43 -0400 |
---|---|---|
committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-19 19:51:47 -0400 |
commit | 8c30f7ed7f5902203e0a1ed3afdf8433c0969c60 (patch) | |
tree | b1e0d431dc725532b85ec4e324588df24b1b0cf2 /sigmodr/widgets | |
parent | 0356b40894df3ae481c575673be8b3b4fd14109e (diff) | |
download | sigen-8c30f7ed7f5902203e0a1ed3afdf8433c0969c60.tar.gz sigen-8c30f7ed7f5902203e0a1ed3afdf8433c0969c60.tar.xz sigen-8c30f7ed7f5902203e0a1ed3afdf8433c0969c60.zip |
Update the Effect and Warp items
Diffstat (limited to 'sigmodr/widgets')
-rw-r--r-- | sigmodr/widgets/EffectItem.cpp | 14 | ||||
-rw-r--r-- | sigmodr/widgets/WarpItem.cpp | 14 |
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()); } |