{
setZValue(3);
m_info.cropDuration = info.endPos - info.startPos;
- setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2));
+ setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + itemOffset() + 1));
#if QT_VERSION >= 0x040600
m_startAnimation = new QPropertyAnimation(this, "rect");
m_startAnimation->setDuration(200);
- QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, 1);
- QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
+ QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
+ QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
m_startAnimation->setStartValue(r);
m_startAnimation->setEndValue(r2);
m_startAnimation->setEasingCurve(QEasingCurve::OutQuad);
m_startAnimation->start();
#else
- setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
+ setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight());
#endif
m_info.cropStart = GenTime();
if (m_automaticTransition) m_parameters.setAttribute("automatic", 1);
else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
- m_name = m_parameters.elementsByTagName("name").item(0).toElement().text();
+ m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
m_secondClip = 0;
//m_referenceClip->addTransition(this);
return tr;
}
-QString Transition::transitionName() const
+QString Transition::transitionTag() const
{
- return m_name;
+ return m_parameters.attribute("tag");
}
-QString Transition::transitionTag() const
+QStringList Transition::transitionInfo() const
{
- return m_parameters.attribute("tag");
+ QStringList info;
+ info << m_name << m_parameters.attribute("tag") << m_parameters.attribute("id");
+ return info;
}
bool Transition::isAutomatic() const
m_parameters = params;
if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
- m_name = m_parameters.elementsByTagName("name").item(0).toElement().text();
+ m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
update();
}
//virtual
QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value)
{
+ if (change == QGraphicsItem::ItemSelectedChange) {
+ if (value.toBool()) setZValue(10);
+ else setZValue(3);
+ }
if (change == ItemPositionChange && scene()) {
// calculate new position.
QPointF newPos = value.toPointF();
QRectF sceneShape = rect();
sceneShape.translate(newPos);
QList<QGraphicsItem*> items;
- if (projectScene()->editMode() == NORMALEDIT)
- items = scene()->items(sceneShape, Qt::IntersectsItemShape);
+ // TODO: manage transitions in OVERWRITE MODE
+ //if (projectScene()->editMode() == NORMALEDIT)
+ items = scene()->items(sceneShape, Qt::IntersectsItemShape);
items.removeAll(this);
+ bool forwardMove = newPos.x() > pos().x();
+ int offset = 0;
if (!items.isEmpty()) {
for (int i = 0; i < items.count(); i++) {
- if (!items.at(i)->isEnabled()) continue;
+ if (!items.at(i)->isEnabled()) continue;
if (items.at(i)->type() == type()) {
- // Collision! Don't move.
- //kDebug()<<"/// COLLISION WITH ITEM: "<<items.at(i)->boundingRect()<<", POS: "<<items.at(i)->pos()<<", ME: "<<newPos;
+ // Collision!
QPointF otherPos = items.at(i)->pos();
- if ((int) otherPos.y() != (int) pos().y()) return pos();
- //kDebug()<<"//// CURRENT Y: "<<pos().y()<<", COLLIDING Y: "<<otherPos.y();
- if (pos().x() < otherPos.x()) {
- int npos = (static_cast < AbstractClipItem* >(items.at(i))->startPos() - m_info.cropDuration).frames(m_fps);
- newPos.setX(npos);
+ if ((int) otherPos.y() != (int) pos().y()) {
+ return pos();
+ }
+ if (forwardMove) {
+ offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - cropDuration()).frames(m_fps)));
} else {
- // get pos just after colliding clip
- int npos = static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps);
- newPos.setX(npos);
+ offset = qMax(offset, (int)((static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps)) - newPos.x()));
+ }
+
+ if (offset > 0) {
+ if (forwardMove) {
+ sceneShape.translate(QPointF(-offset, 0));
+ newPos.setX(newPos.x() - offset);
+ } else {
+ sceneShape.translate(QPointF(offset, 0));
+ newPos.setX(newPos.x() + offset);
+ }
+ QList<QGraphicsItem*> subitems = scene()->items(sceneShape, Qt::IntersectsItemShape);
+ subitems.removeAll(this);
+ for (int j = 0; j < subitems.count(); j++) {
+ if (!subitems.at(j)->isEnabled()) continue;
+ if (subitems.at(j)->type() == type()) {
+ // move was not successful, revert to previous pos
+ m_info.startPos = GenTime((int) pos().x(), m_fps);
+ return pos();
+ }
+ }
}
+
m_info.track = newTrack;
- //kDebug()<<"// ITEM NEW POS: "<<newPos.x()<<", mapped: "<<mapToScene(newPos.x(), 0).x();
m_info.startPos = GenTime((int) newPos.x(), m_fps);
+
return newPos;
}
}
}
+
m_info.track = newTrack;
m_info.startPos = GenTime((int) newPos.x(), m_fps);
//kDebug()<<"// ITEM NEW POS: "<<newPos.x()<<", mapped: "<<mapToScene(newPos.x(), 0).x();
return MOVE;
}
+int Transition::itemHeight()
+{
+ return (int) (KdenliveSettings::trackheight() / 3 * 2 - 1);
+}
+
+int Transition::itemOffset()
+{
+ return (int) (KdenliveSettings::trackheight() / 3 * 2);
+}
+
bool Transition::hasClip(const ClipItem * clip) const
{
if (clip == m_secondClip) return true;
m_parameters.setAttribute("start", startPos().frames(m_fps));
m_parameters.setAttribute("end", endPos().frames(m_fps));
m_parameters.setAttribute("force_track", m_forceTransitionTrack);
+ m_parameters.setAttribute("automatic", m_automaticTransition);
if (m_secondClip) {
m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps()));
return 3;
}
+bool Transition::updateKeyframes()
+{
+ QString keyframes;
+ QDomElement pa;
+ bool modified = false;
+ QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
+ for (int i = 0; i < namenode.count() ; i++) {
+ pa = namenode.item(i).toElement();
+ if (pa.attribute("type") == "geometry") {
+ keyframes = pa.attribute("value");
+ break;
+ }
+ }
+ if (keyframes.isEmpty()) return false;
+ int duration = cropDuration().frames(m_fps) - 1;
+ QStringList values = keyframes.split(";");
+ int frame;
+ int i = 0;
+ foreach(const QString &pos, values) {
+ if (!pos.contains('=')) {
+ i++;
+ continue;
+ }
+ frame = pos.section('=', 0, 0).toInt();
+ if (frame > duration) {
+ modified = true;
+ break;
+ }
+ i++;
+ }
+ if (modified) {
+ if (i > 0) {
+ // Check if there is a keyframe at transition end
+ QString prev = values.at(i-1);
+ bool done = false;
+ if (prev.contains('=')) {
+ int previousKeyframe = prev.section('=', 0, 0).toInt();
+ if (previousKeyframe == duration) {
+ // Remove the last keyframes
+ while (values.count() > i) {
+ values.removeLast();
+ }
+ done = true;
+ }
+ }
+ if (!done) {
+ // Add new keyframe at end and remove last keyframes
+ QString last = values.at(i);
+ last = QString::number(duration) + '=' + last.section('=', 1);
+ values[i] = last;
+ while (values.count() > (i + 1)) {
+ values.removeLast();
+ }
+ }
+ }
+ pa.setAttribute("value", values.join(";"));
+ }
+
+ return true;
+}
+
projects / kdenlive / blobdiff