AbstractGroupItem::AbstractGroupItem(double /* fps */) :
- QObject(),
- QGraphicsItemGroup()
+ QObject(),
+ QGraphicsItemGroup()
{
setZValue(1);
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
int AbstractGroupItem::type() const
{
- return GROUPWIDGET;
+ return GroupWidget;
}
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)
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(const QPointF &offset) const
{
- return groupShape(AVWIDGET, offset);
+ return groupShape(TransitionWidget, offset);
}
-QPainterPath AbstractGroupItem::transitionGroupShape(QPointF offset) const
+QPainterPath AbstractGroupItem::groupShape(GraphicsRectItem type, const QPointF &offset) const
{
- return groupShape(TRANSITIONWIDGET, offset);
+ 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);
+ 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);
+ path.addRect(r);
+ }
+ }
+ }
+ }
+ return path;
}
-QPainterPath AbstractGroupItem::groupShape(GRAPHICSRECTITEM type, QPointF offset) const
+QPainterPath AbstractGroupItem::spacerGroupShape(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);
+ r.setRight(scene()->width());
path.addRect(r);
- } else if (children.at(i)->type() == GROUPWIDGET) {
+ } 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);
}
}
QColor bgcolor(100, 100, 200, 100);
QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1);
p->setClipRect(bound);
- const QRectF mapped = p->worldTransform().mapRect(option->exposedRect);
- p->setWorldMatrixEnabled(false);
p->setBrush(bgcolor);
QPen pen = p->pen();
pen.setColor(QColor(200, 90, 90));
pen.setStyle(Qt::DashLine);
pen.setWidthF(0.0);
p->setPen(pen);
- p->drawRoundedRect(mapped, 3, 3);
+ 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 yOffset = property("y_absolute").toInt() + newPos.y();
- int proposedTrack = yOffset / trackHeight;
-
+ 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++) {
+ 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();
- else if (children.at(i)->type() == GROUPWIDGET) currentTrack = static_cast <AbstractGroupItem*> (children.at(i))->track();
- else continue;
- if (children.at(i)->type() == AVWIDGET) {
+ 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;
topTrack = currentTrack;
}
- } else if (children.at(i)->type() == TRANSITIONWIDGET) {
+ } else if (children.at(i)->type() == TransitionWidget) {
if (topTrack == -1 || currentTrack < topTrack) {
offset = (int)(trackHeight / 3 * 2 - 1);
topTrack = currentTrack;
}
- } else if (children.at(i)->type() == GROUPWIDGET) {
+ } else if (children.at(i)->type() == GroupWidget) {
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;
QList<QGraphicsItem*> collidingItems;
QPainterPath shape;
- if (projectScene()->editMode() == NORMALEDIT) {
+ if (projectScene()->editMode() == NormalEdit) {
shape = clipGroupShape(newPos - pos());
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(this);
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == GROUPWIDGET) {
+ 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(subchildren.at(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) {
+ if (collision->type() == AVWidget) {
// Collision
if (newPos.y() != pos().y()) {
// Track change results in collision, restore original position
// 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++) {
- if (children.at(i)->type() == GROUPWIDGET) {
+ 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(subchildren.at(j));
}
collidingItems.removeAll(children.at(i));
}
- for (int i = 0; i < collidingItems.count(); i++)
- if (collidingItems.at(i)->type() == AVWIDGET) return pos();
+ for (int i = 0; i < collidingItems.count(); ++i)
+ if (collidingItems.at(i)->type() == AVWidget) return pos();
}
}
- if (projectScene()->editMode() == NORMALEDIT) {
+ if (projectScene()->editMode() == NormalEdit) {
shape = transitionGroupShape(newPos - pos());
collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(this);
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == GROUPWIDGET) {
+ 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(subchildren.at(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) {
+ if (collision->type() == TransitionWidget) {
// Collision
if (newPos.y() != pos().y()) {
// Track change results in collision, restore original position
}
// 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++)
- if (collidingItems.at(i)->type() == TRANSITIONWIDGET) return pos();
+ for (int i = 0; i < collidingItems.count(); ++i)
+ if (collidingItems.at(i)->type() == TransitionWidget) return pos();
}
}
return newPos;
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) {
+ for (int i = 0; i < selection.count(); ++i) {
+ if (selection.at(i)->type() == AVWidget) {
dropChild = (AbstractClipItem *) selection.at(i);
- break;
+ break;
}
- }
+ }
if (view) view->slotAddGroupEffect(e, this, dropChild);
}
// User want to do a rectangle selection, so ignore the event to pass it to the view
event->ignore();
} 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();
+ 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();
}
}
int itemcount = 0;
for (int i = 0; i < children.count(); ++i) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
- if (item && item->type() == AVWIDGET) {
+ if (item && item->type() == AVWidget) {
items << item;
if (info)
m_resizeInfos << item->info();
int itemcount = 0;
for (int i = 0; i < children.count(); ++i) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
- if (item && item->type() == AVWIDGET) {
+ if (item && item->type() == AVWidget) {
items << item;
if (info)
m_resizeInfos << item->info();
GenTime start = GenTime(-1.0);
GenTime end = GenTime();
for (int i = 0; i < children.count(); ++i) {
- if (children.at(i)->type() != GROUPWIDGET) {
+ if (children.at(i)->type() != GroupWidget) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
if (item) {
if (start < GenTime() || item->startPos() < start)
}
return end - start;
}
+
+#include "abstractgroupitem.moc"
projects / kdenlive / blobdiff