X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractclipitem.cpp;h=a616219cf4e9d6e71909129e419f5e82d16e7aa8;hb=86e06b615e11677bf2b1e83d1f46754946006e41;hp=cf9c60c328043f70642463c8d3553094fe5122a8;hpb=8a14e93ad75ed21559b1b7be75439fb3270c4e43;p=kdenlive diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index cf9c60c3..a616219c 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -24,22 +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_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 @@ -50,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 } @@ -109,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; } @@ -125,31 +138,34 @@ 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; - //kDebug() << "-- RESCALE DIFF=" << durationDiff.frames(25) << ", CLIP: " << startPos().frames(25) << "-" << endPos().frames(25); - if (type() == AVWIDGET && hasSizeLimit && cropStart() + durationDiff < GenTime()) { - durationDiff = GenTime() - cropStart(); + if (type() == AVWIDGET && hasSizeLimit && (cropStart() + durationDiff < GenTime())) { + durationDiff = GenTime() - cropStart(); } else if (durationDiff >= cropDuration()) { return; - if (cropDuration() > GenTime(3, m_fps)) durationDiff = GenTime(3, m_fps); - else return; + /*if (cropDuration() > GenTime(3, m_fps)) durationDiff = GenTime(3, m_fps); + else return;*/ } - //kDebug()<<"// DURATION DIFF: "< 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()); } } @@ -238,54 +261,72 @@ GenTime AbstractClipItem::maxDuration() const return m_maxDuration; } -void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF /*exposedRect*/) +void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform &transformation, bool limitedKeyFrames) { - if (m_keyframes.count() < 1) return; + if (m_keyframes.count() < 1) + return; QRectF br = rect(); double maxw = br.width() / cropDuration().frames(m_fps); double maxh = br.height() / 100.0 * m_keyframeFactor; - double x1; - double y1; - double x2; - double y2; + double start = cropStart().frames(m_fps); + double x1, y1, x2, y2; + bool antialiasing = painter->renderHints() & QPainter::Antialiasing; // draw line showing default value bool active = isSelected() || (parentItem() && parentItem()->isSelected()); if (active) { x1 = br.x(); x2 = br.right(); - y1 = br.bottom() - m_keyframeDefault * maxh; + if (limitedKeyFrames) { + QMap::const_iterator end = m_keyframes.constEnd(); + --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)); painter->drawLine(l2.translated(0, 1)); painter->setPen(QColor(Qt::white)); + painter->setRenderHint(QPainter::Antialiasing); } // draw keyframes QMap::const_iterator i = m_keyframes.constBegin(); QColor color(Qt::blue); - x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); - y1 = br.bottom() - i.value() * maxh; QLineF l2; + x1 = br.x() + maxw * (i.key() - start); + y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; + + + + // make sure line begins with clip beginning + if (!limitedKeyFrames && i.key() != start) { + QLineF l(br.x(), y1, x1, y1); + l2 = transformation.map(l); + painter->drawLine(l2); + } while (i != m_keyframes.constEnd()) { - if (i.key() == m_editedKeyframe) color = QColor(Qt::red); - else color = QColor(Qt::blue); + if (i.key() == m_editedKeyframe) + color = QColor(Qt::red); + else + color = QColor(Qt::blue); ++i; - if (i == m_keyframes.constEnd() && m_keyframes.count() != 1) { + if (i == m_keyframes.constEnd() && m_keyframes.count() != 1) break; - } + if (m_keyframes.count() == 1) { x2 = br.right(); y2 = y1; } else { - x2 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); - y2 = br.bottom() - i.value() * maxh; + x2 = br.x() + maxw * (i.key() - start); + 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); @@ -294,10 +335,19 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, QRectF /*exposedRect*/) x1 = x2; y1 = y2; } - if (active) { + + // make sure line ends at clip end + if (!limitedKeyFrames && x1 != br.right()) { + QLineF l(x1, y1, br.right(), y1); + painter->drawLine(transformation.map(l)); + } + + if (active && m_keyframes.count() > 1) { const QRectF frame(l2.x2() - 3, l2.y2() - 3, 6, 6); painter->fillRect(frame, color); } + + painter->setRenderHint(QPainter::Antialiasing, antialiasing); } int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset) @@ -307,15 +357,15 @@ 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() * 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; + } else if (x1 > pos.x()) { + break; + } ++i; } } @@ -325,13 +375,14 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset) void AbstractClipItem::updateSelectedKeyFrame() { - if (m_editedKeyframe == -1) return; + if (m_editedKeyframe == -1) + return; QRectF br = sceneBoundingRect(); double maxw = br.width() / cropDuration().frames(m_fps); double maxh = br.height() / 100.0 * m_keyframeFactor; - update(br.x() + maxw *(m_selectedKeyframe - cropStart().frames(m_fps)) - 3, br.bottom() - m_keyframes[m_selectedKeyframe] * maxh - 3, 12, 12); + update(br.x() + maxw *(m_selectedKeyframe - cropStart().frames(m_fps)) - 3, br.bottom() - (m_keyframes.value(m_selectedKeyframe) - m_keyframeOffset) * maxh - 3, 12, 12); m_selectedKeyframe = m_editedKeyframe; - update(br.x() + maxw *(m_selectedKeyframe - cropStart().frames(m_fps)) - 3, br.bottom() - m_keyframes[m_selectedKeyframe] * maxh - 3, 12, 12); + update(br.x() + maxw *(m_selectedKeyframe - cropStart().frames(m_fps)) - 3, br.bottom() - (m_keyframes.value(m_selectedKeyframe) - m_keyframeOffset) * maxh - 3, 12, 12); } int AbstractClipItem::editedKeyFramePos() const @@ -354,19 +405,33 @@ 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; + if (!m_keyframes.contains(m_editedKeyframe)) + return; int newpos = (int) pos.frames(m_fps); - int start = cropStart().frames(m_fps); - int end = (cropStart() + cropDuration()).frames(m_fps) - 1; - newpos = qMax(newpos, start); - newpos = qMin(newpos, end); + int min = (int) cropStart().frames(m_fps) - 1; + int max = (int)(cropStart() + cropDuration()).frames(m_fps); + QMap::const_iterator i = m_keyframes.constBegin(); + while (i.key() < m_editedKeyframe) { + min = qMax(i.key(), min); + ++i; + } + i = m_keyframes.constEnd() - 1; + while (i.key() > m_editedKeyframe) { + max = qMin(i.key(), max); + --i; + } + if (newpos <= min) + newpos = min + 1; + if (newpos >= max) + newpos = max - 1; double newval = qMax(value, 0.0); newval = qMin(newval, 100.0); - newval = newval / m_keyframeFactor; - if (m_editedKeyframe != newpos) m_keyframes.remove(m_editedKeyframe); + newval = newval / m_keyframeFactor + m_keyframeOffset; + if (m_editedKeyframe != newpos) + m_keyframes.remove(m_editedKeyframe); m_keyframes[newpos] = (int) newval; m_editedKeyframe = newpos; update(); @@ -377,11 +442,31 @@ double AbstractClipItem::keyFrameFactor() const return m_keyframeFactor; } -int AbstractClipItem::addKeyFrame(const GenTime pos, const double value) +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(); double maxh = 100.0 / br.height() / m_keyframeFactor; - int newval = (br.bottom() - value) * maxh; + int newval = (br.bottom() - value) * maxh + m_keyframeOffset; //kDebug() << "Rect: " << br << "/ SCENE: " << sceneBoundingRect() << ", VALUE: " << value << ", MAX: " << maxh << ", NEWVAL: " << newval; int newpos = (int) pos.frames(m_fps) ; m_keyframes[newpos] = newval; @@ -408,20 +493,18 @@ bool AbstractClipItem::hasKeyFrames() const CustomTrackScene* AbstractClipItem::projectScene() { - if (scene()) return static_cast (scene()); + if (scene()) + return static_cast (scene()); return NULL; } void AbstractClipItem::setItemLocked(bool locked) { - if (locked) { + if (locked) setSelected(false); - setFlag(QGraphicsItem::ItemIsMovable, false); - setFlag(QGraphicsItem::ItemIsSelectable, false); - } else { - setFlag(QGraphicsItem::ItemIsMovable, true); - setFlag(QGraphicsItem::ItemIsSelectable, true); - } + + setFlag(QGraphicsItem::ItemIsMovable, !locked); + setFlag(QGraphicsItem::ItemIsSelectable, !locked); } bool AbstractClipItem::isItemLocked() const @@ -435,6 +518,32 @@ void AbstractClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) if (event->modifiers() & Qt::ShiftModifier) { // User want to do a rectangle selection, so ignore the event to pass it to the view event->ignore(); - } else QGraphicsItem::mousePressEvent(event); + } else { + QGraphicsItem::mousePressEvent(event); + } } +int AbstractClipItem::itemHeight() +{ + return 0; +} + +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"