#include <QPropertyAnimation>
#endif
-Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
- AbstractClipItem(info, QRectF(), fps),
- m_forceTransitionTrack(false),
- m_automaticTransition(automaticTransition),
- m_secondClip(NULL),
- m_transitionTrack(transitiontrack)
+Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement ¶ms, bool automaticTransition) :
+ AbstractClipItem(info, QRectF(), fps),
+ m_forceTransitionTrack(false),
+ m_automaticTransition(automaticTransition),
+ m_transitionTrack(transitiontrack)
{
setZValue(3);
m_info.cropDuration = info.endPos - info.startPos;
else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
- m_secondClip = 0;
-
- //m_referenceClip->addTransition(this);
}
Transition::~Transition()
Transition *Transition::clone()
{
- QDomElement xml = toXML().cloneNode().toElement();
+ const QDomElement xml = toXML().cloneNode().toElement();
Transition *tr = new Transition(info(), transitionEndTrack(), m_fps, xml);
return tr;
}
update();
}
-void Transition::setTransitionParameters(const QDomElement params)
+void Transition::setTransitionParameters(const QDomElement ¶ms)
{
- 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 = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
- update();
-}
-
-
-bool Transition::invertedTransition() const
-{
- return false; //m_parameters.attribute("reverse").toInt();
-}
-
-void Transition::setTransitionDirection(bool /*inv*/)
-{
- //m_parameters.setAttribute("reverse", inv);
+ if (m_parameters != params) {
+ 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 = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
+ update();
+ }
}
int Transition::transitionEndTrack() const
const QStyleOptionGraphicsItem *option,
QWidget */*widget*/)
{
- const QRectF exposed = option->exposedRect;
- painter->setClipRect(exposed);
+ const QRectF exposed = painter->worldTransform().mapRect(option->exposedRect);
const QRectF br = rect();
QPen framePen;
+ framePen.setWidthF(1.2);
const QRectF mapped = painter->worldTransform().mapRect(br);
- painter->fillRect(exposed, brush());
-
QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
- painter->setWorldMatrixEnabled(false);
+ painter->setWorldTransform(QTransform());
+ QPainterPath p;
+ p.addRect(exposed);
+
+ QPainterPath q;
+ q.addRoundedRect(mapped, 3, 3);
+ painter->setClipPath(p.intersected(q));
+ painter->fillRect(exposed, brush());
const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString());
// Draw clip name
if (isSelected() || (parentItem() && parentItem()->isSelected())) {
+ framePen.setColor(scene()->palette().highlight().color());
framePen.setColor(Qt::red);
- framePen.setWidthF(2.0);
}
else {
framePen.setColor(brush().color().darker());
const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' ');
painter->setBrush(framePen.color());
- painter->setPen(Qt::NoPen);
+ painter->setPen(framePen.color());
painter->drawRoundedRect(txtBounding, 3, 3);
painter->setBrush(QBrush(Qt::NoBrush));
// Draw frame
painter->setPen(framePen);
painter->setClipping(false);
- painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5));
+ painter->setRenderHint(QPainter::Antialiasing, true);
+ painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3);
}
int Transition::type() const
int newTrack = newPos.y() / KdenliveSettings::trackheight();
newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
newTrack = qMax(newTrack, 0);
+ QStringList lockedTracks = property("locked_tracks").toStringList();
+ if (lockedTracks.contains(QString::number(newTrack))) {
+ // Trying to move to a locked track
+ return pos();
+ }
newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
// Only one clip is moving
QRectF sceneShape = rect();
bool forwardMove = newPos.x() > pos().x();
int offset = 0;
if (!items.isEmpty()) {
- for (int i = 0; i < items.count(); i++) {
+ for (int i = 0; i < items.count(); ++i) {
if (!items.at(i)->isEnabled()) continue;
if (items.at(i)->type() == type()) {
// Collision!
}
}
}
-
+
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();
}
-OPERATIONTYPE Transition::operationMode(QPointF pos)
+OPERATIONTYPE Transition::operationMode(const QPointF &pos)
{
if (isItemLocked()) return NONE;
return MOVE;
}
+//static
int Transition::itemHeight()
{
return (int) (KdenliveSettings::trackheight() / 3 * 2 - 1);
}
+//static
int Transition::itemOffset()
{
return (int) (KdenliveSettings::trackheight() / 3 * 2);
}
-bool Transition::hasClip(const ClipItem * clip) const
-{
- if (clip == m_secondClip) return true;
- return false;
-}
-
-bool Transition::belongsToClip(const ClipItem * clip) const
-{
- if (clip == m_referenceClip) return true;
- return false;
-}
-
-/*
-Transition *Transition::clone() {
- return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps);
-}*/
-
-/*
-Transition *Transition::reparent(ClipItem * clip) {
- return new Transition::Transition(rect(), clip, toXML(), m_fps, m_referenceClip->startPos());
-}*/
-
-bool Transition::isValid() const
-{
- return true; //(m_transitionDuration != GenTime());
-}
-
-const ClipItem *Transition::referencedClip() const
-{
- return m_referenceClip;
-}
QDomElement Transition::toXML()
{
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()));
- m_parameters.setAttribute("clipb_track", transitionEndTrack());
- }
return m_parameters.cloneNode().toElement();
}
bool Transition::hasGeometry()
{
QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
- for (int i = 0; i < namenode.count() ; i++) {
+ for (int i = 0; i < namenode.count() ; ++i) {
QDomElement pa = namenode.item(i).toElement();
if (pa.attribute("type") == "geometry") return true;
}
return 3;
}
-bool Transition::updateKeyframes()
+bool Transition::updateKeyframes(int oldEnd)
{
QString keyframes;
QDomElement pa;
bool modified = false;
QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
- for (int i = 0; i < namenode.count() ; i++) {
+ for (int i = 0; i < namenode.count() ; ++i) {
pa = namenode.item(i).toElement();
if (pa.attribute("type") == "geometry") {
keyframes = pa.attribute("value");
}
if (keyframes.isEmpty()) return false;
int duration = cropDuration().frames(m_fps) - 1;
- QStringList values = keyframes.split(";");
+ QStringList values = keyframes.split(';');
int frame;
int i = 0;
- foreach(const QString &pos, values) {
- if (!pos.contains('=')) {
- i++;
- continue;
+ if (oldEnd < duration) {
+ // Transition was expanded, check if we had a keyframe at end position
+ foreach(QString pos, values) {
+ if (!pos.contains('=')) {
+ ++i;
+ continue;
+ }
+ frame = pos.section('=', 0, 0).toInt();
+ if (frame == oldEnd) {
+ // Move that keyframe to new end
+ values[i] = QString::number(duration) + '=' + pos.section('=', 1);
+ pa.setAttribute("value", values.join(";"));
+ return true;
+ }
+ ++i;
}
- frame = pos.section('=', 0, 0).toInt();
- if (frame > duration) {
- modified = true;
- break;
+ return false;
+ }
+ else {
+ // Transition was shortened, check for out of bounds keyframes
+ foreach(const QString &pos, values) {
+ if (!pos.contains('=')) {
+ ++i;
+ continue;
+ }
+ frame = pos.section('=', 0, 0).toInt();
+ if (frame > duration) {
+ modified = true;
+ break;
+ }
+ ++i;
}
- i++;
}
if (modified) {
if (i > 0) {
return true;
}
+
+#include "transition.moc"
projects / kdenlive / blobdiff