From c7a0a2dbc5f07824a1784f8be122ad37a75f0a7e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 22 Jan 2008 22:57:22 +0000 Subject: [PATCH] Some funny timeline animation tooltips svn path=/branches/KDE4/; revision=1815 --- src/clipitem.cpp | 71 +++++++++++++------ src/clipitem.h | 5 +- src/customtrackview.cpp | 150 ++++++++++++++++++++++++++++++++++++---- src/customtrackview.h | 10 ++- src/definitions.h | 2 + src/labelitem.cpp | 5 +- src/trackview.cpp | 1 + 7 files changed, 203 insertions(+), 41 deletions(-) diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 5e16fce1..89e8c495 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -28,7 +28,7 @@ #include "clipitem.h" ClipItem::ClipItem(int clipType, QString name, int producer, int maxDuration, const QRectF & rect) - : QGraphicsRectItem(rect), m_resizeMode(0), m_grabPoint(0), m_clipType(clipType), m_clipName(name), m_producer(producer), m_cropStart(0), m_cropDuration(maxDuration), m_maxDuration(maxDuration) + : QGraphicsRectItem(rect), m_resizeMode(NONE), m_grabPoint(0), m_clipType(clipType), m_clipName(name), m_producer(producer), m_cropStart(0), m_cropDuration(maxDuration), m_maxDuration(maxDuration) { setToolTip(name); //setCursor(Qt::SizeHorCursor); @@ -37,6 +37,7 @@ ClipItem::ClipItem(int clipType, QString name, int producer, int maxDuration, co QRectF textRect = m_label->boundingRect(); m_textWidth = textRect.width(); m_label->setPos(rect.x() + rect.width()/2 - m_textWidth/2, rect.y() + rect.height() / 2 - textRect.height()/2); + setBrush(QColor(100, 100, 150)); } int ClipItem::type () const @@ -69,29 +70,54 @@ int ClipItem::maxDuration() const QStyleOptionGraphicsItem *option, QWidget *widget) { - painter->setClipRect( option->exposedRect ); + + //painter->setClipRect( option->exposedRect ); + /*painter->setRenderHint(QPainter::TextAntialiasing); painter->fillRect(rect(), QColor(200, 50, 50, 150)); + QPointF pos = option->matrix.map(QPointF(1.0, 1.0)); + //painter->setPen(QPen(Qt::black, 1.0 / option->levelOfDetail)); + painter->setPen(QPen(Qt::black, 1.0 / pos.x())); + double scale = 1.0 / pos.x(); + //QPointF size = option->matrix.map(QPointF(1, 1)); + //double off = painter->pen().width(); + QRectF br = boundingRect(); + QRectF recta(rect().x(), rect().y(), scale,rect().height()); + painter->drawRect(recta); + //painter->drawLine(rect().x() + 1, rect().y(), rect().x() + 1, rect().y() + rect().height()); + painter->drawLine(rect().x() + rect().width(), rect().y(), rect().x() + rect().width(), rect().y() + rect().height()); + painter->setPen(QPen(Qt::black, 1.0 / pos.y())); + painter->drawLine(rect().x(), rect().y(), rect().x() + rect().width(), rect().y()); + painter->drawLine(rect().x(), rect().y() + rect().height(), rect().x() + rect().width(), rect().y() + rect().height());*/ + + QGraphicsRectItem::paint(painter, option, widget); + //QPen pen(Qt::green, 1.0 / size.x() + 0.5); + //painter->setPen(pen); + //painter->drawLine(rect().x(), rect().y(), rect().x() + rect().width(), rect().y());*/ //kDebug()<<"ITEM REPAINT RECT: "<drawText(rect(), Qt::AlignCenter, m_name); - painter->drawRect(rect()); + // painter->drawRect(boundingRect()); //painter->drawRoundRect(-10, -10, 20, 20); } -int ClipItem::operationMode(QPointF pos) +OPERATIONTYPE ClipItem::operationMode(QPointF pos) { - if (abs(pos.x() - rect().x()) < 6) - return 1; - else if (abs(pos.x() - (rect().x() + rect().width())) < 6) - return 2; - return 0; + if (abs(pos.x() - rect().x()) < 6) { + if (abs(pos.y() - rect().y()) < 6) return FADEIN; + return RESIZESTART; + } + else if (abs(pos.x() - (rect().x() + rect().width())) < 6) { + if (abs(pos.y() - rect().y()) < 6) return FADEOUT; + return RESIZEEND; + } + return MOVE; } // virtual void ClipItem::mousePressEvent ( QGraphicsSceneMouseEvent * event ) { m_resizeMode = operationMode(event->pos()); - if (m_resizeMode == 0) { + if (m_resizeMode == MOVE) { m_grabPoint = (int) (event->pos().x() - rect().x()); } QGraphicsRectItem::mousePressEvent(event); @@ -100,7 +126,7 @@ int ClipItem::operationMode(QPointF pos) // virtual void ClipItem::mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) { - m_resizeMode = 0; + m_resizeMode = NONE; QGraphicsRectItem::mouseReleaseEvent(event); } @@ -110,7 +136,7 @@ int ClipItem::operationMode(QPointF pos) double origY = rect().y(); setRect(x, origY + offset, rect().width(), rect().height()); - QList collisionList = collidingItems(); + QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisionList.size(); ++i) { QGraphicsItem *item = collisionList.at(i); if (item->type() == 70000) @@ -146,14 +172,14 @@ int ClipItem::operationMode(QPointF pos) double moveX = (int) event->scenePos().x(); double originalX = rect().x(); double originalWidth = rect().width(); - if (m_resizeMode == 1) { + if (m_resizeMode == RESIZESTART) { if (m_cropStart - (originalX - moveX) < 0) moveX = originalX - m_cropStart; if (originalX + rect().width() - moveX < 1) moveX = originalX + rect().width() + 2; m_cropStart -= originalX - moveX; kDebug()<<"MOVE CLIP START TO: "<scenePos()<<", CROP: "< collisionList = collidingItems(); + QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisionList.size(); ++i) { QGraphicsItem *item = collisionList.at(i); if (item->type() == 70000) @@ -171,13 +197,13 @@ int ClipItem::operationMode(QPointF pos) } return; } - if (m_resizeMode == 2) { + if (m_resizeMode == RESIZEEND) { int newWidth = moveX - originalX; if (newWidth < 1) newWidth = 2; if (newWidth > m_maxDuration) newWidth = m_maxDuration; setRect(originalX, rect().y(), newWidth, rect().height()); - QList collisionList = collidingItems(); + QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisionList.size(); ++i) { QGraphicsItem *item = collisionList.at(i); if (item->type() == 70000) @@ -195,12 +221,13 @@ int ClipItem::operationMode(QPointF pos) } return; } - int moveTrack = (int) event->scenePos().y() / 50; - int currentTrack = (int) rect().y() / 50; - int offset = moveTrack - currentTrack; - if (offset != 0) offset = 50 * offset; - moveTo(moveX - m_grabPoint, offset); - + if (m_resizeMode == MOVE) { + int moveTrack = (int) event->scenePos().y() / 50; + int currentTrack = (int) rect().y() / 50; + int offset = moveTrack - currentTrack; + if (offset != 0) offset = 50 * offset; + moveTo(moveX - m_grabPoint, offset); + } } diff --git a/src/clipitem.h b/src/clipitem.h index 3ac0983b..4de4bf1c 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -25,6 +25,7 @@ #include #include "labelitem.h" +#include "definitions.h" class ClipItem : public QGraphicsRectItem { @@ -36,7 +37,7 @@ class ClipItem : public QGraphicsRectItem QWidget *widget); virtual int type () const; void moveTo(double x, double offset); - int operationMode(QPointF pos); + OPERATIONTYPE operationMode(QPointF pos); int clipProducer(); int clipType(); QString clipName(); @@ -50,7 +51,7 @@ class ClipItem : public QGraphicsRectItem private: LabelItem *m_label; int m_textWidth; - uint m_resizeMode; + OPERATIONTYPE m_resizeMode; int m_grabPoint; int m_producer; int m_clipType; diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 93aed657..2020467e 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -22,6 +22,7 @@ #include #include + #include #include #include @@ -34,15 +35,21 @@ #include "addtimelineclipcommand.h" CustomTrackView::CustomTrackView(KUndoStack *commandStack, QGraphicsScene * scene, QWidget *parent) - : QGraphicsView(scene, parent), m_commandStack(commandStack), m_tracksCount(0), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(0), m_startPos(QPointF()), m_dragItem(NULL) + : QGraphicsView(scene, parent), m_commandStack(commandStack), m_tracksCount(0), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_startPos(QPointF()), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL) { setMouseTracking(true); setAcceptDrops(true); + m_animationTimer = new QTimeLine(800); + m_animationTimer->setFrameRange(0, 5); + m_animationTimer->setUpdateInterval(100); + m_animationTimer->setLoopCount(0); + m_tipColor = QColor(230, 50, 0, 150); } void CustomTrackView::initView() { m_cursorLine = scene()->addLine(0, 0, 0, height()); + m_cursorLine->setZValue(1000); } // virtual @@ -60,7 +67,18 @@ void CustomTrackView::mouseMoveEvent ( QMouseEvent * event ) else if (event->modifiers() == Qt::ShiftModifier) setDragMode(QGraphicsView::RubberBandDrag); else { - QList itemList = items ( event->pos()); + + if (event->button() == Qt::LeftButton) { + // a button was pressed, delete visual tips + if (m_animation) delete m_animation; + m_animation = NULL; + if (m_visualTip) delete m_visualTip; + m_visualTip = NULL; + QGraphicsView::mouseMoveEvent(event); + return; + } + + QList itemList = items( event->pos()); int i = 0; QGraphicsItem *item = NULL; for (int i = 0; i < itemList.count(); i++) { @@ -70,16 +88,119 @@ void CustomTrackView::mouseMoveEvent ( QMouseEvent * event ) } } if (item) { - int cursorPos = event->x(); - QRectF itemRect = item->sceneBoundingRect(); - int itemStart = mapFromScene(itemRect.x(), 0).x(); - int itemEnd = mapFromScene(itemRect.x() + itemRect.width(), 0).x(); - if (abs(itemStart - cursorPos) < 6 || abs(itemEnd - cursorPos) < 6) + ClipItem *clip = (ClipItem*) item; + double size = mapToScene(QPoint(8, 0)).x(); + OPERATIONTYPE opMode = clip->operationMode(mapToScene(event->pos())); + if (opMode == m_moveOpMode) { + QGraphicsView::mouseMoveEvent(event); + return; + } + else { + if (m_visualTip) { + if (m_animation) delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } + } + m_moveOpMode = opMode; + if (opMode == MOVE) { + setCursor(Qt::OpenHandCursor); + } + else if (opMode == RESIZESTART) { + kDebug()<<"******** RESIZE CLIP START; WIDTH: "<rect().x(), clip->rect().y(), size, clip->rect().height()); + ((QGraphicsRectItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsRectItem*) m_visualTip)->setPen(QPen(Qt::transparent)); + m_visualTip->setZValue (100); + m_animation = new QGraphicsItemAnimation; + m_animation->setItem(m_visualTip); + m_animation->setTimeLine(m_animationTimer); + m_visualTip->setPos(0, 0); + double scale = 2.0; + m_animation->setScaleAt(.5, scale, 1); + m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0)); + scale = 1.0; + m_animation->setScaleAt(1, scale, 1); + m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0)); + scene()->addItem(m_visualTip); + m_animationTimer->start(); + } setCursor(Qt::SizeHorCursor); - else setCursor(Qt::OpenHandCursor); - + } + else if (opMode == RESIZEEND) { + if (m_visualTip == NULL) { + m_visualTip = new QGraphicsRectItem(clip->rect().x() + clip->rect().width() - size, clip->rect().y(), size, clip->rect().height()); + ((QGraphicsRectItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsRectItem*) m_visualTip)->setPen(QPen(Qt::transparent)); + m_visualTip->setZValue (100); + m_animation = new QGraphicsItemAnimation; + m_animation->setItem(m_visualTip); + m_animation->setTimeLine(m_animationTimer); + m_visualTip->setPos(0, 0); + double scale = 2.0; + m_animation->setScaleAt(.5, scale, 1); + m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0)); + scale = 1.0; + m_animation->setScaleAt(1, scale, 1); + m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0)); + scene()->addItem(m_visualTip); + m_animationTimer->start(); + } + setCursor(Qt::SizeHorCursor); + } + else if (opMode == FADEIN) { + if (m_visualTip == NULL) { + m_visualTip = new QGraphicsEllipseItem(clip->rect().x() - size, clip->rect().y() - 8, size * 2, 16); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(QPen(Qt::transparent)); + m_visualTip->setZValue (100); + m_animation = new QGraphicsItemAnimation; + m_animation->setItem(m_visualTip); + m_animation->setTimeLine(m_animationTimer); + m_visualTip->setPos(0, 0); + double scale = 2.0; + m_animation->setScaleAt(.5, scale, scale); + m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale)); + scale = 1.0; + m_animation->setScaleAt(1, scale, scale); + m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale)); + scene()->addItem(m_visualTip); + m_animationTimer->start(); + } + setCursor(Qt::PointingHandCursor); + } + else if (opMode == FADEOUT) { + if (m_visualTip == NULL) { + m_visualTip = new QGraphicsEllipseItem(clip->rect().x() + clip->rect().width() - size, clip->rect().y() - 8, size*2, 16); + ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor); + ((QGraphicsEllipseItem*) m_visualTip)->setPen(QPen(Qt::transparent)); + m_visualTip->setZValue (100); + m_animation = new QGraphicsItemAnimation; + m_animation->setItem(m_visualTip); + m_animation->setTimeLine(m_animationTimer); + m_visualTip->setPos(0, 0); + double scale = 2.0; + m_animation->setScaleAt(.5, scale, scale); + m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), clip->rect().y() - clip->rect().y() * scale)); + scale = 1.0; + m_animation->setScaleAt(1, scale, scale); + m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, clip->rect().y() - clip->rect().y() * scale)); + scene()->addItem(m_visualTip); + m_animationTimer->start(); + } + setCursor(Qt::PointingHandCursor); + } } else { + m_moveOpMode = NONE; + if (m_visualTip) { + if (m_animation) delete m_animation; + m_animation = NULL; + delete m_visualTip; + m_visualTip = NULL; + } setCursor(Qt::ArrowCursor); } } @@ -100,8 +221,8 @@ void CustomTrackView::mousePressEvent ( QMouseEvent * event ) if (item && item->type() == 70000) { m_dragItem = (ClipItem *) item; m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos()))); - if (m_operationMode != 2) m_startPos = QPointF(m_dragItem->rect().x(), m_dragItem->rect().y()); - else m_startPos = QPointF(m_dragItem->rect().x() + m_dragItem->rect().width(), m_dragItem->rect().y()); + if (m_operationMode == MOVE || m_operationMode == RESIZESTART) m_startPos = QPointF(m_dragItem->rect().x(), m_dragItem->rect().y()); + else if (m_operationMode == RESIZEEND) m_startPos = QPointF(m_dragItem->rect().x() + m_dragItem->rect().width(), m_dragItem->rect().y()); kDebug()<<"//////// ITEM CLICKED: "<parentItem()) @@ -225,17 +346,17 @@ void CustomTrackView::mouseReleaseEvent ( QMouseEvent * event ) setDragMode(QGraphicsView::NoDrag); if (m_dragItem == NULL) return; //kDebug()<<"/// MOVING CLIP: "<rect().x(),m_dragItem->rect().y()); - if (m_operationMode == 0) { + if (m_operationMode == MOVE) { // move clip MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->rect().x(), m_dragItem->rect().y()), false); m_commandStack->push(command); } - else if (m_operationMode == 1) { + else if (m_operationMode == RESIZESTART) { // resize start ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->rect().x(), m_dragItem->rect().y()), true, false); m_commandStack->push(command); } - else if (m_operationMode == 2) { + else if (m_operationMode == RESIZEEND) { // resize end ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->rect().x() + m_dragItem->rect().width(), m_dragItem->rect().y()), false, false); m_commandStack->push(command); @@ -304,6 +425,7 @@ void CustomTrackView::resizeClip ( const QPointF &startPos, const QPointF &endPo void CustomTrackView::drawBackground ( QPainter * painter, const QRectF & rect ) { //kDebug()<<"///// DRAWING BG: "<setPen(QColor(150, 150, 150, 255)); painter->drawLine(rect.x(), 0, rect.x() + rect.width(), 0); for (uint i = 0; i < m_tracksCount;i++) { diff --git a/src/customtrackview.h b/src/customtrackview.h index cbea5571..1fe8d629 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -22,6 +22,9 @@ #define CUSTOMTRACKVIEW_H #include +#include +#include + #include #include "clipitem.h" @@ -63,9 +66,14 @@ class CustomTrackView : public QGraphicsView void addItem(QString producer, QPoint pos); QGraphicsLineItem *m_cursorLine; QPointF m_startPos; - int m_operationMode; + OPERATIONTYPE m_operationMode; + OPERATIONTYPE m_moveOpMode; ClipItem *m_dragItem; KUndoStack *m_commandStack; + QGraphicsItem *m_visualTip; + QGraphicsItemAnimation *m_animation; + QTimeLine *m_animationTimer; + QColor m_tipColor; signals: void cursorMoved(int); diff --git a/src/definitions.h b/src/definitions.h index efeb5648..c0fb3858 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -23,6 +23,8 @@ #define FRAME_SIZE 90 +enum OPERATIONTYPE { NONE = 0, MOVE = 1, RESIZESTART = 2, RESIZEEND = 3, FADEIN = 4, FADEOUT = 5}; + struct TrackViewClip { int startTime; int duration; diff --git a/src/labelitem.cpp b/src/labelitem.cpp index edd8fe26..5cd54e22 100644 --- a/src/labelitem.cpp +++ b/src/labelitem.cpp @@ -51,11 +51,12 @@ int LabelItem::type () const QRectF par = mapFromScene(parent->rect()).boundingRect(); QRectF parrect = option->matrix.map(mapFromScene(par)).boundingRect(); painter->setClipRect( parrect ); //option->exposedRect ); - QPainterPath path; + QGraphicsSimpleTextItem::paint(painter, option, widget); + /*QPainterPath path; path.addRoundRect(boundingRect(), 40); painter->fillPath(path, QColor(200, 200, 200, 100)); //painter->fillRect(parrect, QColor(200, 50, 200, 100)); - painter->drawText(boundingRect(), Qt::AlignCenter, text()); + painter->drawText(boundingRect(), Qt::AlignCenter, text());*/ } #include "labelitem.moc" diff --git a/src/trackview.cpp b/src/trackview.cpp index 3ad21237..8544cb8e 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -124,6 +124,7 @@ void TrackView::slotChangeZoom(int factor) m_currentZoom = factor; kDebug()<<"///// ZOOMING: "<scale(m_scale, 1); + m_trackview->centerOn(QPointF(m_trackview->cursorPos(), 50)); /* for (int i = 0; i < documentTracks.count(); i++) { kDebug()<<"------REPAINTING OBJECT"; -- 2.39.5