From 54c8c7fe5a046a4b73bf3b04c8fc64b7fbe461a9 Mon Sep 17 00:00:00 2001 From: Jorge Cuadrado Date: Sun, 30 Dec 2007 01:13:37 -0500 Subject: [PATCH] Fixed crash in iTween network --- yamf/drawing/private/guide.cpp | 8 ++++---- yamf/drawing/tool/commonalgorithms.cpp | 4 ---- yamf/drawing/tool/itween.cpp | 24 ++++++++++++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/yamf/drawing/private/guide.cpp b/yamf/drawing/private/guide.cpp index 4eaaf26..b24c7e1 100644 --- a/yamf/drawing/private/guide.cpp +++ b/yamf/drawing/private/guide.cpp @@ -45,11 +45,11 @@ Guide::Guide(Qt::Orientation o,QGraphicsScene *scene): QGraphicsItem(0, scene), { d->orientation = o; d->enabled = true; - + setZValue(1000); // setAcceptsHoverEvents(true); // setAcceptedMouseButtons(0); // setFlag(QGraphicsItem::ItemIsFocusable, false); - + setFlag(QGraphicsItem::ItemIgnoresTransformations, true); } @@ -70,11 +70,11 @@ QRectF Guide::boundingRect() const if(d->orientation == Qt::Vertical) { - return QRectF( QPointF(0,init.y()) , QSizeF(5, d->view->height())); + return QRectF( QPointF(0,init.y()) , QSizeF(5, d->view->height()*2)); } else { - return QRectF(QPointF(init.x(), 0), QSizeF(d->view->width(), 5)); + return QRectF(QPointF(init.x(), 0), QSizeF(d->view->width()*2, 5)); } } diff --git a/yamf/drawing/tool/commonalgorithms.cpp b/yamf/drawing/tool/commonalgorithms.cpp index 390aa44..b291960 100644 --- a/yamf/drawing/tool/commonalgorithms.cpp +++ b/yamf/drawing/tool/commonalgorithms.cpp @@ -51,8 +51,6 @@ CommonAlgorithms::~CommonAlgorithms() void CommonAlgorithms::createEditors(QList & editors, QList items, PaintArea *paintArea) { -// QList items = items; - QList::iterator it = editors.begin(); QList::iterator itEnd = editors.end(); @@ -61,8 +59,6 @@ void CommonAlgorithms::createEditors(QListitem()); - dfDebug << parentIndex; - D_SHOW_VAR(items.count()); if(parentIndex != -1 ) { items.removeAt(parentIndex); diff --git a/yamf/drawing/tool/itween.cpp b/yamf/drawing/tool/itween.cpp index b2f923b..f581a01 100644 --- a/yamf/drawing/tool/itween.cpp +++ b/yamf/drawing/tool/itween.cpp @@ -425,8 +425,6 @@ void ITween::press(const QGraphicsSceneMouseEvent *input) { case Private::Transform: { -// if( d->transformer == 0) -// { QList transformers; if(d->transformer) @@ -537,7 +535,21 @@ void ITween::release(const QGraphicsSceneMouseEvent *input) case Private::Transform: { d->saveChanges(); - d->transformer->show(); + if(d->transformer) + { + d->transformer->show(); + } + else + { + QList transformers; + CommonAlgorithms::createTransfromers(transformers, QList() << d->target->item(), paintArea); + + if(!transformers.isEmpty()) + { + d->transformer = transformers.first(); + } + } + } break; case Private::PathMotion: @@ -590,14 +602,10 @@ void ITween::release(const QGraphicsSceneMouseEvent *input) if(!editors.isEmpty()) { d->nodeEditor = editors.first(); - } - else - { - qDebug("here"); + d->nodeEditor->show(); } d->saveChanges(); - d->nodeEditor->show(); } break; case Private::Fill: -- 2.11.4.GIT