X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractclipitem.cpp;h=8179a83fc0d02b1ebc58e182512675a1d126d252;hb=c24658bd34221d735f0641c924b890e1a6be7101;hp=50290cb154cf724a32d0a1d7d245cf562a70ea29;hpb=53f235426c2c1c3c15b671135989bda32be5ec96;p=kdenlive diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 50290cb1..8179a83f 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -23,22 +23,26 @@ #include "kdenlivesettings.h" #include -#include +#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) + 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 @@ -56,14 +60,16 @@ void AbstractClipItem::closeAnimation() #if QT_VERSION >= 0x040600 if (!isEnabled()) return; setEnabled(false); + setFlag(QGraphicsItem::ItemIsSelectable, false); if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) { // animation disabled deleteLater(); return; } QPropertyAnimation *closeAnimation = new QPropertyAnimation(this, "rect"); - connect(closeAnimation, SIGNAL(finished()), this, SLOT(deleteLater())); + 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); @@ -73,7 +79,13 @@ void AbstractClipItem::closeAnimation() closeAnimation->setStartValue(r); closeAnimation->setEndValue(r2); closeAnimation->setEasingCurve(QEasingCurve::InQuad); - closeAnimation->start(QAbstractAnimation::DeleteWhenStopped); + 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,12 +138,12 @@ 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; - if (type() == AVWIDGET && hasSizeLimit && (cropStart() + durationDiff < GenTime())) { + if (type() == AVWidget && hasSizeLimit && (cropStart() + durationDiff < GenTime())) { durationDiff = GenTime() - cropStart(); } else if (durationDiff >= cropDuration()) { return; @@ -142,7 +154,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit) // set to true if crop from start is negative (possible for color clips, images as they have no size limit) bool negCropStart = false; - if (type() == AVWIDGET) { + if (type() == AVWidget) { m_info.cropStart += durationDiff; if (m_info.cropStart < GenTime()) negCropStart = true; @@ -156,7 +168,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit) //kDebug() << "////// WARNING, DIFF IN XPOS: " << pos().x() << " == " << m_info.startPos.frames(m_fps); GenTime diff = m_info.startPos - GenTime(posx, m_fps); - if (type() == AVWIDGET) + if (type() == AVWidget) m_info.cropStart += diff; m_info.cropDuration -= diff; @@ -181,7 +193,7 @@ void AbstractClipItem::resizeStart(int posx, bool hasSizeLimit) setRect(0, 0, (m_cropDuration - diff).frames(m_fps) - 0.02, rect().height()); setPos((m_startPos + diff).frames(m_fps), pos().y()); m_startPos += diff; - if (type() == AVWIDGET) m_cropStart += diff; + if (type() == AVWidget) m_cropStart += diff; m_cropDuration = m_cropDuration - diff; break; } @@ -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; @@ -249,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; @@ -267,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->worldTransform().map(l); + QLineF l2 = transformation.map(l); painter->setPen(QColor(168, 168, 168, 180)); painter->drawLine(l2); painter->setPen(QColor(108, 108, 108, 180)); @@ -294,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->worldTransform().map(l); + l2 = transformation.map(l); painter->drawLine(l2); } while (i != m_keyframes.constEnd()) { @@ -314,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->worldTransform().map(l); + l2 = transformation.map(l); painter->drawLine(l2); if (active) { const QRectF frame(l2.x1() - 3, l2.y1() - 3, 6, 6); @@ -327,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->worldTransform().map(l)); + painter->drawLine(transformation.map(l)); } if (active && m_keyframes.count() > 1) { @@ -345,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; @@ -437,6 +447,21 @@ int AbstractClipItem::keyFrameNumber() const return m_keyframes.count(); } +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(); @@ -508,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"