#include <QMimeData>
#include <QGraphicsSceneMouseEvent>
+
AbstractGroupItem::AbstractGroupItem(double /* fps */) :
- QObject(),
- QGraphicsItemGroup()
+ QObject(),
+ QGraphicsItemGroup()
{
setZValue(1);
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
int AbstractGroupItem::track() const
{
- return (int)(scenePos().y() / KdenliveSettings::trackheight());
+ //return (int)(scenePos().y() / KdenliveSettings::trackheight());
+ int topTrack = -1;
+ QList<QGraphicsItem *> children = childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ children.append(children.at(i)->childItems());
+ continue;
+ }
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ if (item && (topTrack == -1 || topTrack > item->track())) {
+ topTrack = item->track();
+ }
+ }
+ return topTrack;
}
void AbstractGroupItem::setItemLocked(bool locked)
{
- if (locked) {
+ if (locked)
setSelected(false);
- setFlag(QGraphicsItem::ItemIsMovable, false);
- setFlag(QGraphicsItem::ItemIsSelectable, false);
- } else {
- setFlag(QGraphicsItem::ItemIsMovable, true);
- setFlag(QGraphicsItem::ItemIsSelectable, true);
- }
+
+ setFlag(QGraphicsItem::ItemIsMovable, !locked);
+ setFlag(QGraphicsItem::ItemIsSelectable, !locked);
+
+ foreach (QGraphicsItem *child, childItems())
+ ((AbstractClipItem *)child)->setItemLocked(locked);
}
bool AbstractGroupItem::isItemLocked() const
return NULL;
}
-QPainterPath AbstractGroupItem::clipGroupShape(QPointF offset) const
+QPainterPath AbstractGroupItem::clipGroupSpacerShape(const QPointF &offset) const
+{
+ return spacerGroupShape(AVWIDGET, offset);
+}
+
+QPainterPath AbstractGroupItem::clipGroupShape(const QPointF &offset) const
{
return groupShape(AVWIDGET, offset);
}
-QPainterPath AbstractGroupItem::transitionGroupShape(QPointF offset) const
+QPainterPath AbstractGroupItem::transitionGroupShape(const QPointF &offset) const
{
return groupShape(TRANSITIONWIDGET, offset);
}
-QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, QPointF offset) const
+QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, const QPointF &offset) const
{
QPainterPath path;
QList<QGraphicsItem *> children = childItems();
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == (int)type) {
QRectF r(children.at(i)->sceneBoundingRect());
r.translate(offset);
return path;
}
+QPainterPath AbstractGroupItem::spacerGroupShape(GRAPHICSRECTITEM type, const QPointF &offset) const
+{
+ QPainterPath path;
+ QList<QGraphicsItem *> children = childItems();
+ for (int i = 0; i < children.count(); ++i) {
+ if (children.at(i)->type() == (int)type) {
+ QRectF r(children.at(i)->sceneBoundingRect());
+ r.translate(offset);
+ r.setRight(scene()->width());
+ path.addRect(r);
+ } else if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ for (int j = 0; j < subchildren.count(); j++) {
+ if (subchildren.at(j)->type() == (int)type) {
+ QRectF r(subchildren.at(j)->sceneBoundingRect());
+ r.translate(offset);
+ r.setRight(scene()->width());
+ path.addRect(r);
+ }
+ }
+ }
+ }
+ return path;
+}
+
void AbstractGroupItem::addItem(QGraphicsItem * item)
{
addToGroup(item);
- //fixItemRect();
+ item->setFlag(QGraphicsItem::ItemIsMovable, false);
+}
+
+void AbstractGroupItem::removeItem(QGraphicsItem * item)
+{
+ removeFromGroup(item);
}
void AbstractGroupItem::fixItemRect()
// virtual
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);
+ p->setBrush(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));
+ p->drawRoundedRect(boundingRect().adjusted(0, 0, -1, 0), 3, 3);
}
//virtual
int xpos = projectScene()->getSnapPointForPos((int)(start.x() + newPos.x() - pos().x()), KdenliveSettings::snaptopoints());
xpos = qMax(xpos, 0);
- //kDebug()<<"GRP XPOS:"<<xpos<<", START:"<<start.x()<<",NEW:"<<newPos.x()<<";
SCENE:"<<scenePos().x()<<",POS:"<<pos().x();
+ //kDebug()<<"GRP XPOS:"<<xpos<<", START:"<<start.x()<<",NEW:"<<newPos.x()<<";
SCENE:"<<scenePos().x()<<",POS:"<<pos().x();
newPos.setX((int)(pos().x() + xpos - (int) start.x()));
-
- //int startTrack = (start.y() + trackHeight / 2) / trackHeight;
-
- 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);
-
+ QStringList lockedTracks = property("locked_tracks").toStringList();
+ int proposedTrack = (property("y_absolute").toInt() + newPos.y()) / trackHeight;
// Check if top item is a clip or a transition
int offset = 0;
int topTrack = -1;
+ QList<int> groupTracks;
QList<QGraphicsItem *> children = childItems();
- for (int i = 0; i < children.count(); i++) {
- int currentTrack = (int)(children.at(i)->scenePos().y() / trackHeight);
+ for (int i = 0; i < children.count(); ++i) {
+ int currentTrack = 0;
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+ currentTrack = static_cast <AbstractClipItem*> (children.at(i))->track();
+ if (!groupTracks.contains(currentTrack)) groupTracks.append(currentTrack);
+ }
+ else if (children.at(i)->type() == GROUPWIDGET) {
+ currentTrack = static_cast <AbstractGroupItem*> (children.at(i))->track();
+ }
+ else continue;
if (children.at(i)->type() == AVWIDGET) {
if (topTrack == -1 || currentTrack <= topTrack) {
offset = 0;
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
bool clipGroup = false;
for (int j = 0; j < subchildren.count(); j++) {
- if (subchildren.at(j)->type() == AVWIDGET) {
+ if (subchildren.at(j)->type() == AVWIDGET || subchildren.at(j)->type() == TRANSITIONWIDGET) {
+ int subTrack = static_cast <AbstractClipItem*> (subchildren.at(j))->track();
+ if (!groupTracks.contains(subTrack)) groupTracks.append(subTrack);
clipGroup = true;
- break;
}
}
if (clipGroup) {
}
}
}
+ // Check no clip in the group goes outside of existing tracks
+ int maximumTrack = projectScene()->tracksCount() - 1;
+ int groupHeight = 0;
+ for (int i = 0; i < groupTracks.count(); ++i) {
+ int offset = groupTracks.at(i) - topTrack;
+ if (offset > groupHeight) groupHeight = offset;
+ }
+ maximumTrack -= groupHeight;
+ proposedTrack = qMin(proposedTrack, maximumTrack);
+ proposedTrack = qMax(proposedTrack, 0);
+ int groupOffset = proposedTrack - topTrack;
+ if (!lockedTracks.isEmpty()) {
+ for (int i = 0; i < groupTracks.count(); ++i) {
+ if (lockedTracks.contains(QString::number(groupTracks.at(i) + groupOffset))) {
+ return pos();
+ }
+ }
+ }
newPos.setY((int)((proposedTrack) * trackHeight) + offset);
//if (newPos == start) return start;
shape = clipGroupShape(newPos - pos());
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(this);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++) {
if (!collidingItems.isEmpty()) {
bool forwardMove = xpos > start.x();
int offset = 0;
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
QGraphicsItem *collision = collidingItems.at(i);
if (collision->type() == AVWIDGET) {
// Collision
// If there is still a collision after our position adjust, restore original pos
collidingItems = scene()->items(clipGroupShape(newPos - pos()), Qt::IntersectsItemShape);
collidingItems.removeAll(this);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++) {
}
collidingItems.removeAll(children.at(i));
}
- for (int i = 0; i < collidingItems.count(); i++)
+ for (int i = 0; i < collidingItems.count(); ++i)
if (collidingItems.at(i)->type() == AVWIDGET) return pos();
}
}
shape = transitionGroupShape(newPos - pos());
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(this);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
if (children.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
for (int j = 0; j < subchildren.count(); j++) {
else {
bool forwardMove = xpos > start.x();
int offset = 0;
- for (int i = 0; i < collidingItems.count(); i++) {
+ for (int i = 0; i < collidingItems.count(); ++i) {
QGraphicsItem *collision = collidingItems.at(i);
if (collision->type() == TRANSITIONWIDGET) {
// Collision
}
// If there is still a collision after our position adjust, restore original pos
collidingItems = scene()->items(transitionGroupShape(newPos - pos()), Qt::IntersectsItemShape);
- for (int i = 0; i < children.count(); i++) {
+ for (int i = 0; i < children.count(); ++i) {
collidingItems.removeAll(children.at(i));
}
- for (int i = 0; i < collidingItems.count(); i++)
+ for (int i = 0; i < collidingItems.count(); ++i)
if (collidingItems.at(i)->type() == TRANSITIONWIDGET) return pos();
}
}
//virtual
void AbstractGroupItem::dropEvent(QGraphicsSceneDragDropEvent * event)
{
- QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
+ QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
QDomDocument doc;
doc.setContent(effects, true);
QDomElement e = doc.documentElement();
+ e.setAttribute("kdenlive_ix", 0);
CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
- if (view) view->slotAddGroupEffect(e, this);
+ QPointF dropPos = event->scenePos();
+ QList<QGraphicsItem *> selection = scene()->items(dropPos);
+ AbstractClipItem *dropChild = NULL;
+ for (int i = 0; i < selection.count(); ++i) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ dropChild = (AbstractClipItem *) selection.at(i);
+ break;
+ }
+ }
+ if (view) view->slotAddGroupEffect(e, this, dropChild);
}
//virtual
void AbstractGroupItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
{
- Q_UNUSED(event);
+ Q_UNUSED(event)
}
// virtual
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);
+ } else {
+ QList <QGraphicsItem *>list = scene()->items(event->scenePos());
+ // only allow group move if we click over an item in the group
+ foreach(const QGraphicsItem *item, list) {
+ if (item->type() == TRANSITIONWIDGET || item->type() == AVWIDGET) {
+ QGraphicsItem::mousePressEvent(event);
+ return;
+ }
+ }
+ event->ignore();
+ }
+}
+
+void AbstractGroupItem::resizeStart(int diff)
+{
+ bool info = false;
+ if (m_resizeInfos.isEmpty())
+ info = true;
+ int maximum = diff;
+ QList <QGraphicsItem *> children = childItems();
+ QList <AbstractClipItem *> items;
+ int itemcount = 0;
+ for (int i = 0; i < children.count(); ++i) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ if (item && item->type() == AVWIDGET) {
+ items << item;
+ if (info)
+ m_resizeInfos << item->info();
+ item->resizeStart((int)(m_resizeInfos.at(itemcount).startPos.frames(item->fps())) + diff);
+ int itemdiff = (int)(item->startPos() - m_resizeInfos.at(itemcount).startPos).frames(item->fps());
+ if (qAbs(itemdiff) < qAbs(maximum))
+ maximum = itemdiff;
+ ++itemcount;
+ }
+ }
+
+ for (int i = 0; i < items.count(); ++i)
+ items.at(i)->resizeStart((int)(m_resizeInfos.at(i).startPos.frames(items.at(i)->fps())) + maximum);
}
void AbstractGroupItem::resizeEnd(int diff)
}
return end - start;
}
+
+#include "abstractgroupitem.moc"
projects / kdenlive / blobdiff