X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractclipitem.cpp;h=a616219cf4e9d6e71909129e419f5e82d16e7aa8;hb=86e06b615e11677bf2b1e83d1f46754946006e41;hp=d294df380e0a5233e2da6f7d1560ee7fc119efdb;hpb=a142111d51186bd642bfd1717fa26ab818f46e7d;p=kdenlive diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index d294df38..a616219c 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -24,23 +24,25 @@ #include #include +#include #include #include #include - -AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps) : - QObject(), - QGraphicsRectItem(rect), - m_info(info), - m_editedKeyframe(-1), - m_selectedKeyframe(0), - m_keyframeFactor(1), - m_keyframeOffset(0), - m_fps(fps) -#if QT_VERSION >= 0x040600 - , m_closeAnimation(NULL) -#endif +#include + +AbstractClipItem::AbstractClipItem(const ItemInfo &info, const QRectF& rect, double fps) : + QObject() + , QGraphicsRectItem(rect) + , m_info(info) + , m_editedKeyframe(-1) + , m_selectedKeyframe(0) + , m_keyframeFactor(1) + , m_keyframeOffset(0) + , m_keyframeDefault(0) + , m_visibleParam(0) + , m_fps(fps) + , m_isMainSelectedClip(false) { setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); #if QT_VERSION >= 0x040600 @@ -51,29 +53,39 @@ AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, doub AbstractClipItem::~AbstractClipItem() { -#if QT_VERSION >= 0x040600 - if (m_closeAnimation) delete m_closeAnimation; -#endif } void AbstractClipItem::closeAnimation() { #if QT_VERSION >= 0x040600 - if (m_closeAnimation) return; + if (!isEnabled()) return; setEnabled(false); - m_closeAnimation = new QPropertyAnimation(this, "rect"); - connect(m_closeAnimation, SIGNAL(finished()), this, SLOT(deleteLater())); - m_closeAnimation->setDuration(200); + setFlag(QGraphicsItem::ItemIsSelectable, false); + if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) { + // animation disabled + deleteLater(); + return; + } + QPropertyAnimation *closeAnimation = new QPropertyAnimation(this, "rect"); + QPropertyAnimation *closeAnimation2 = new QPropertyAnimation(this, "opacity"); + closeAnimation->setDuration(200); + closeAnimation2->setDuration(200); QRectF r = rect(); QRectF r2 = r; r2.setLeft(r.left() + r.width() / 2); r2.setTop(r.top() + r.height() / 2); r2.setWidth(1); r2.setHeight(1); - m_closeAnimation->setStartValue(r); - m_closeAnimation->setEndValue(r2); - m_closeAnimation->setEasingCurve(QEasingCurve::InQuad); - m_closeAnimation->start(); + closeAnimation->setStartValue(r); + closeAnimation->setEndValue(r2); + closeAnimation->setEasingCurve(QEasingCurve::InQuad); + closeAnimation2->setStartValue(1.0); + closeAnimation2->setEndValue(0.0); + QParallelAnimationGroup *group = new QParallelAnimationGroup; + connect(group, SIGNAL(finished()), this, SLOT(deleteLater())); + group->addAnimation(closeAnimation); + group->addAnimation(closeAnimation2); + group->start(QAbstractAnimation::DeleteWhenStopped); #endif } @@ -110,7 +122,7 @@ GenTime AbstractClipItem::cropDuration() const return m_info.cropDuration; } -void AbstractClipItem::setCropStart(GenTime pos) +void AbstractClipItem::setCropStart(const GenTime &pos) { m_info.cropStart = pos; } @@ -126,7 +138,7 @@ void AbstractClipItem::updateRectGeometry() setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height()); } -void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit) +void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit, bool /*emitChange*/) { GenTime durationDiff = GenTime(posx, m_fps) - m_info.startPos; if (durationDiff == GenTime()) return; @@ -189,7 +201,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit) }*/ } -void AbstractClipItem::resizeEnd(int posx) +void AbstractClipItem::resizeEnd(int posx, bool /*emitChange*/) { GenTime durationDiff = GenTime(posx, m_fps) - endPos(); if (durationDiff == GenTime()) return; @@ -203,19 +215,22 @@ void AbstractClipItem::resizeEnd(int posx) setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height()); if (durationDiff > GenTime()) { QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); + bool fixItem = false; for (int i = 0; i < collisionList.size(); ++i) { if (!collisionList.at(i)->isEnabled()) continue; QGraphicsItem *item = collisionList.at(i); if (item->type() == type() && item->pos().x() > pos().x()) { - kDebug() << "///////// COLLISION DETECTED!!!!!!!!!"; - kDebug() << "///////// CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos(); - kDebug() << "///////// COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos(); + //kDebug() << "///////// COLLISION DETECTED!!!!!!!!!"; + //kDebug() << "///////// CURRENT: " << startPos().frames(25) << "x" << endPos().frames(25) << ", RECT: " << rect() << "-" << pos(); + //kDebug() << "///////// COLLISION: " << ((AbstractClipItem *)item)->startPos().frames(25) << "x" << ((AbstractClipItem *)item)->endPos().frames(25) << ", RECT: " << ((AbstractClipItem *)item)->rect() << "-" << item->pos(); GenTime diff = ((AbstractClipItem *)item)->startPos() - startPos(); - m_info.cropDuration = diff; - setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height()); - break; + if (fixItem == false || diff < m_info.cropDuration) { + fixItem = true; + m_info.cropDuration = diff; + } } } + if (fixItem) setRect(0, 0, cropDuration().frames(m_fps) - 0.02, rect().height()); } } @@ -246,7 +261,7 @@ GenTime AbstractClipItem::maxDuration() const return m_maxDuration; } -void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames) +void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform &transformation, bool limitedKeyFrames) { if (m_keyframes.count() < 1) return; @@ -264,13 +279,13 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames) x2 = br.right(); if (limitedKeyFrames) { QMap::const_iterator end = m_keyframes.constEnd(); - end--; + --end; x2 = x1 + maxw * (end.key() - start); x1 += maxw * (m_keyframes.constBegin().key() - start); } y1 = br.bottom() - (m_keyframeDefault - m_keyframeOffset) * maxh; QLineF l(x1, y1, x2, y1); - QLineF l2 = painter->matrix().map(l); + QLineF l2 = transformation.map(l); painter->setPen(QColor(168, 168, 168, 180)); painter->drawLine(l2); painter->setPen(QColor(108, 108, 108, 180)); @@ -291,7 +306,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames) // make sure line begins with clip beginning if (!limitedKeyFrames && i.key() != start) { QLineF l(br.x(), y1, x1, y1); - l2 = painter->matrix().map(l); + l2 = transformation.map(l); painter->drawLine(l2); } while (i != m_keyframes.constEnd()) { @@ -311,7 +326,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames) y2 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; } QLineF l(x1, y1, x2, y2); - l2 = painter->matrix().map(l); + l2 = transformation.map(l); painter->drawLine(l2); if (active) { const QRectF frame(l2.x1() - 3, l2.y1() - 3, 6, 6); @@ -324,7 +339,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames) // make sure line ends at clip end if (!limitedKeyFrames && x1 != br.right()) { QLineF l(x1, y1, br.right(), y1); - painter->drawLine(painter->matrix().map(l)); + painter->drawLine(transformation.map(l)); } if (active && m_keyframes.count() > 1) { @@ -342,13 +357,11 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset) double maxh = br.height() / 100.0 * m_keyframeFactor; if (m_keyframes.count() > 0) { QMap::const_iterator i = m_keyframes.constBegin(); - double x1; - double y1; while (i != m_keyframes.constEnd()) { - x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); - y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; + double x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); + double y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; if (qAbs(pos.x() - x1) < maxOffset && qAbs(pos.y() - y1) < 10) { - setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + "]"); + setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + ']'); return i.key(); } else if (x1 > pos.x()) { break; @@ -392,7 +405,7 @@ double AbstractClipItem::selectedKeyFrameValue() const return m_keyframes.value(m_selectedKeyframe); } -void AbstractClipItem::updateKeyFramePos(const GenTime pos, const double value) +void AbstractClipItem::updateKeyFramePos(const GenTime &pos, const double value) { if (!m_keyframes.contains(m_editedKeyframe)) return; @@ -434,7 +447,22 @@ int AbstractClipItem::keyFrameNumber() const return m_keyframes.count(); } -int AbstractClipItem::addKeyFrame(const GenTime pos, const double value) +int AbstractClipItem::checkForSingleKeyframe() +{ + // Check if we have only one keyframe + if (!m_keyframes.isEmpty() && m_keyframes.count() == 1) { + int min = (int) cropStart().frames(m_fps); + int max = (int)(cropStart() + cropDuration()).frames(m_fps) - 1; + if (m_keyframes.contains(min)) { + // Add keyframe at end of clip to allow inserting a new keframe in between + m_keyframes[max] = m_keyframes.value(min); + return m_keyframes.value(min); + } + } + return -1; +} + +int AbstractClipItem::addKeyFrame(const GenTime &pos, const double value) { QRectF br = sceneBoundingRect(); double maxh = 100.0 / br.height() / m_keyframeFactor; @@ -505,4 +533,17 @@ int AbstractClipItem::itemOffset() return 0; } +void AbstractClipItem::setMainSelectedClip(bool selected) +{ + if (selected == m_isMainSelectedClip) return; + m_isMainSelectedClip = selected; + update(); +} + +bool AbstractClipItem::isMainSelectedClip() +{ + return m_isMainSelectedClip; +} + +#include "abstractclipitem.moc"