X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractgroupitem.cpp;h=aed9c10837da7393ee33ca90ba8891723d678511;hb=fec4b6aba639dac658d35475512c6f232c8aebe3;hp=136745daeea515cda61586bd34719d2a3d7bf0c3;hpb=4a47150aaf6f75c45ddca8a071c3bc291117bdd3;p=kdenlive diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index 136745da..aed9c108 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -22,32 +22,43 @@ #include "abstractclipitem.h" #include "kdenlivesettings.h" #include "customtrackscene.h" +#include "customtrackview.h" #include #include #include +#include +#include +#include - -AbstractGroupItem::AbstractGroupItem(double fps): QGraphicsItemGroup(), m_fps(fps) { - setZValue(2); - setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); +AbstractGroupItem::AbstractGroupItem(double /* fps */) : + QObject(), + QGraphicsItemGroup() +{ + setZValue(1); + setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + setAcceptDrops(true); } -int AbstractGroupItem::type() const { +int AbstractGroupItem::type() const +{ return GROUPWIDGET; } -int AbstractGroupItem::track() const { +int AbstractGroupItem::track() const +{ return (int)(scenePos().y() / KdenliveSettings::trackheight()); } -CustomTrackScene* AbstractGroupItem::projectScene() { +CustomTrackScene* AbstractGroupItem::projectScene() +{ if (scene()) return static_cast (scene()); return NULL; } -QPainterPath AbstractGroupItem::groupShape(QPointF offset) { +QPainterPath AbstractGroupItem::clipGroupShape(QPointF offset) const +{ QPainterPath path; QList children = childItems(); for (int i = 0; i < children.count(); i++) { @@ -60,12 +71,28 @@ QPainterPath AbstractGroupItem::groupShape(QPointF offset) { return path; } -void AbstractGroupItem::addItem(QGraphicsItem * item) { +QPainterPath AbstractGroupItem::transitionGroupShape(QPointF offset) const +{ + QPainterPath path; + QList children = childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == TRANSITIONWIDGET) { + QRectF r(children.at(i)->sceneBoundingRect()); + r.translate(offset); + path.addRect(r); + } + } + return path; +} + +void AbstractGroupItem::addItem(QGraphicsItem * item) +{ addToGroup(item); //fixItemRect(); } -void AbstractGroupItem::fixItemRect() { +void AbstractGroupItem::fixItemRect() +{ QPointF start = boundingRect().topLeft(); if (start != QPointF(0, 0)) { translate(0 - start.x(), 0 - start.y()); @@ -73,27 +100,54 @@ void AbstractGroupItem::fixItemRect() { } } +/*ItemInfo AbstractGroupItem::info() const { + ItemInfo itemInfo; + itemInfo.startPos = m_startPos; + itemInfo.track = m_track; + return itemInfo; +}*/ + // virtual -void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *) { - p->fillRect(option->exposedRect, QColor(200, 100, 100, 100)); +void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *) +{ + const double scale = option->matrix.m11(); + QColor bgcolor(100, 100, 200, 100); + QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1); + p->setClipRect(bound); + p->fillRect(option->exposedRect, bgcolor); + QPen pen = p->pen(); + pen.setColor(QColor(200, 90, 90)); + pen.setStyle(Qt::DashLine); + pen.setWidthF(0.0); + //pen.setCosmetic(true); + p->setPen(pen); + p->drawRect(boundingRect().adjusted(0, 0, - 1 / scale, 0)); } //virtual -QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant &value) { - if (change == ItemPositionChange && scene()) { +QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange && scene() && parentItem() == 0) { // calculate new position. const int trackHeight = KdenliveSettings::trackheight(); + QPointF start = sceneBoundingRect().topLeft(); QPointF newPos = value.toPointF(); - int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints()); + //kDebug()<<"REAL:"<getSnapPointForPos((int)(start.x() + newPos.x() - pos().x()), KdenliveSettings::snaptopoints()); + xpos = qMax(xpos, 0); - newPos.setX(xpos); + //kDebug()<<"GRP XPOS:"<tracksCount() - 1; - newTrack = qMin(newTrack, projectScene()->tracksCount() - (int)(boundingRect().height() + 5) / trackHeight); - newTrack = qMax(newTrack, 0); + + int realTrack = (start.y() + newPos.y() - pos().y()) / trackHeight; + int proposedTrack = newPos.y() / trackHeight; + + int correctedTrack = qMin(realTrack, projectScene()->tracksCount() - (int)(boundingRect().height() + 5) / trackHeight); + correctedTrack = qMax(correctedTrack, 0); + + proposedTrack += (correctedTrack - realTrack); // Check if top item is a clip or a transition int offset = 0; @@ -111,33 +165,52 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant offset = (int)(trackHeight / 3 * 2 - 1); topTrack = currentTrack; } + } else if (children.at(i)->type() == GROUPWIDGET) { + QList subchildren = children.at(i)->childItems(); + bool clipGroup = false; + for (int j = 0; j < subchildren.count(); j++) { + if (subchildren.at(j)->type() == AVWIDGET) { + clipGroup = true; + break; + } + } + if (clipGroup) { + if (topTrack == -1 || currentTrack <= topTrack) { + offset = 0; + topTrack = currentTrack; + } + } else { + if (topTrack == -1 || currentTrack < topTrack) { + offset = (int)(trackHeight / 3 * 2 - 1); + topTrack = currentTrack; + } + } } } - newPos.setY((int)((newTrack) * trackHeight) + offset); - if (newPos == start) return start; + newPos.setY((int)((proposedTrack) * trackHeight) + offset); + //if (newPos == start) return start; - if (newPos.x() < 0) { + /*if (newPos.x() < 0) { // If group goes below 0, adjust position to 0 return QPointF(pos().x() - start.x(), pos().y()); - } + }*/ - QPainterPath shape = groupShape(newPos - pos()); + QPainterPath shape = clipGroupShape(newPos - pos()); QList collindingItems = scene()->items(shape, Qt::IntersectsItemShape); for (int i = 0; i < children.count(); i++) { collindingItems.removeAll(children.at(i)); } - if (collindingItems.isEmpty()) return newPos; - else { - bool forwardMove = newPos.x() > start.x(); + + if (!collindingItems.isEmpty()) { + bool forwardMove = xpos > start.x(); int offset = 0; for (int i = 0; i < collindingItems.count(); i++) { QGraphicsItem *collision = collindingItems.at(i); if (collision->type() == AVWIDGET) { // Collision - //kDebug()<<"// COLLISION WIT:"<sceneBoundingRect(); - if (newPos.y() != start.y()) { + if (newPos.y() != pos().y()) { // Track change results in collision, restore original position - return start; + return pos(); } AbstractClipItem *item = static_cast (collision); if (forwardMove) { @@ -162,16 +235,96 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant newPos.setX(newPos.x() + offset); } // If there is still a collision after our position adjust, restore original pos - collindingItems = scene()->items(groupShape(newPos - pos()), Qt::IntersectsItemShape); + collindingItems = scene()->items(clipGroupShape(newPos - pos()), Qt::IntersectsItemShape); for (int i = 0; i < children.count(); i++) { collindingItems.removeAll(children.at(i)); } for (int i = 0; i < collindingItems.count(); i++) if (collindingItems.at(i)->type() == AVWIDGET) return pos(); } - return newPos; } + + + shape = transitionGroupShape(newPos - pos()); + collindingItems = scene()->items(shape, Qt::IntersectsItemShape); + for (int i = 0; i < children.count(); i++) { + collindingItems.removeAll(children.at(i)); + } + if (collindingItems.isEmpty()) return newPos; + else { + bool forwardMove = xpos > start.x(); + int offset = 0; + for (int i = 0; i < collindingItems.count(); i++) { + QGraphicsItem *collision = collindingItems.at(i); + if (collision->type() == TRANSITIONWIDGET) { + // Collision + if (newPos.y() != pos().y()) { + // Track change results in collision, restore original position + return pos(); + } + AbstractClipItem *item = static_cast (collision); + if (forwardMove) { + // Moving forward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } else { + // Moving backward, determine best pos + QPainterPath clipPath; + clipPath.addRect(item->sceneBoundingRect()); + QPainterPath res = shape.intersected(clipPath); + offset = qMax(offset, (int)(res.boundingRect().width() + 0.5)); + } + } + } + if (offset > 0) { + if (forwardMove) { + newPos.setX(newPos.x() - offset); + } else { + newPos.setX(newPos.x() + offset); + } + // If there is still a collision after our position adjust, restore original pos + collindingItems = scene()->items(transitionGroupShape(newPos - pos()), Qt::IntersectsItemShape); + for (int i = 0; i < children.count(); i++) { + collindingItems.removeAll(children.at(i)); + } + for (int i = 0; i < collindingItems.count(); i++) + if (collindingItems.at(i)->type() == TRANSITIONWIDGET) return pos(); + } + } + return newPos; } return QGraphicsItemGroup::itemChange(change, value); } +//virtual +void AbstractGroupItem::dropEvent(QGraphicsSceneDragDropEvent * event) +{ + QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); + QDomDocument doc; + doc.setContent(effects, true); + QDomElement e = doc.documentElement(); + CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + if (view) view->slotAddGroupEffect(e, this); +} + +//virtual +void AbstractGroupItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) +{ + event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist")); +} + +void AbstractGroupItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) +{ + Q_UNUSED(event); +} + +// virtual +void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event) +{ + if (event->modifiers() & Qt::ShiftModifier) { + // User want to do a rectangle selection, so ignore the event to pass it to the view + event->ignore(); + } else QGraphicsItem::mousePressEvent(event); +}