X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=b2af83a82cbf8552f6c3c34078bc212dca212ba3;hb=a12cf2d6e75a7a9857330a6109b36d5b99a2ccb4;hp=8df2212c3e73b994407be5e0c5aa041d5d3de2bf;hpb=c67890964525378ae77e821fad355486ac89da3c;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 8df2212c..b2af83a8 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -42,7 +42,7 @@ static int FRAME_SIZE; -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : +ClipItem::ClipItem(DocClipBase *clip, const ItemInfo& info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_startFade(0), @@ -90,7 +90,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i setAcceptDrops(true); m_audioThumbReady = m_clip->audioThumbCreated(); //setAcceptsHoverEvents(true); - connect(this , SIGNAL(prepareAudioThumb(double, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int))); + connect(this , SIGNAL(prepareAudioThumb(double,int,int,int,int)) , this, SLOT(slotPrepareAudioThumb(double,int,int,int,int))); if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { m_baseColor = QColor(141, 166, 215); @@ -100,7 +100,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i connect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); m_endThumbTimer.setSingleShot(true); connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); - connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage))); connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); } @@ -112,13 +112,14 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i } else if (m_clipType == IMAGE || m_clipType == TEXT) { m_baseColor = QColor(141, 166, 215); if (m_clipType == TEXT) { - connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage))); } //m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); } else if (m_clipType == AUDIO) { m_baseColor = QColor(141, 215, 166); connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } + m_paintColor = m_baseColor; } @@ -127,15 +128,16 @@ ClipItem::~ClipItem() blockSignals(true); m_endThumbTimer.stop(); m_startThumbTimer.stop(); - if (scene()) scene()->removeItem(this); + if (scene()) + scene()->removeItem(this); if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { - //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int,QImage)), this, SLOT(slotThumbReady(int,QImage))); //disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } delete m_timeLine; } -ClipItem *ClipItem::clone(ItemInfo info) const +ClipItem *ClipItem::clone(const ItemInfo &info) const { ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE); if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix); @@ -154,12 +156,12 @@ ClipItem *ClipItem::clone(ItemInfo info) const return duplicate; } -void ClipItem::setEffectList(const EffectsList effectList) +void ClipItem::setEffectList(const EffectsList &effectList) { m_effectList.clone(effectList); m_effectNames = m_effectList.effectNames().join(" / "); if (!m_effectList.isEmpty()) { - for (int i = 0; i < m_effectList.count(); i++) { + for (int i = 0; i < m_effectList.count(); ++i) { QDomElement effect = m_effectList.at(i); QString effectId = effect.attribute("id"); // check if it is a fade effect @@ -212,7 +214,7 @@ void ClipItem::setEffectList(const EffectsList effectList) else if (fade < 0) m_endFade = -fade; } - setSelectedEffect(0); + setSelectedEffect(1); } } @@ -237,7 +239,7 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) // Init parameter value & keyframes if required QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (e.isNull()) @@ -261,7 +263,7 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") { if (e.attribute("keyframes").isEmpty()) { // Effect has a keyframe type parameter, we need to set the values - e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default")); + e.setAttribute("keyframes", QString::number((int) cropStart().frames(m_fps)) + ':' + e.attribute("default")); } else if (offset != 0) { // adjust keyframes to this clip @@ -272,8 +274,8 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { // Effects with a geometry parameter need to sync in / out with parent clip - effect.setAttribute("in", QString::number(cropStart().frames(m_fps))); - effect.setAttribute("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1)); + effect.setAttribute("in", QString::number((int) cropStart().frames(m_fps))); + effect.setAttribute("out", QString::number((int) (cropStart() + cropDuration()).frames(m_fps) - 1)); effect.setAttribute("_sync_in_out", "1"); } } @@ -336,25 +338,29 @@ void ClipItem::initEffect(QDomElement effect, int diff, int offset) } } -const QString ClipItem::adjustKeyframes(QString keyframes, int offset) +const QString ClipItem::adjustKeyframes(const QString &keyframes, int offset) { QStringList result; // Simple keyframes const QStringList list = keyframes.split(';', QString::SkipEmptyParts); foreach(const QString &keyframe, list) { - int pos = keyframe.section(':', 0, 0).toInt() - offset; - QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1); - result.append(newKey); + int pos = keyframe.section(':', 0, 0).toInt() - offset; + QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1); + result.append(newKey); } return result.join(";"); } -bool ClipItem::checkKeyFrames() +bool ClipItem::checkKeyFrames(int width, int height, int previousDuration, int cutPos) { bool clipEffectsModified = false; QLocale locale; // go through all effects this clip has for (int ix = 0; ix < m_effectList.count(); ++ix) { + // Check geometry params + resizeGeometries(ix, width, height, previousDuration, cutPos == -1 ? 0 : cutPos, cropDuration().frames(m_fps) - 1); + + // Check keyframe params QStringList keyframeParams = keyframes(ix); QStringList newKeyFrameParams; bool effModified = false; @@ -368,7 +374,7 @@ bool ClipItem::checkKeyFrames() int lastPos = -1; double lastValue = -1; int start = cropStart().frames(m_fps); - int end = (cropStart() + cropDuration()).frames(m_fps); + int end = (cropStart() + cropDuration()).frames(m_fps) - 1; // go through all keyframes for one param foreach(const QString &str, keyframes) { @@ -382,8 +388,8 @@ bool ClipItem::checkKeyFrames() if (pos > start) { int diff = pos - lastPos; double ratio = (double)(start - lastPos) / diff; - double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(start) + ':' + locale.toString(newValue)); + int newValue = lastValue + (val - lastValue) * ratio; + newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue)); modified = true; } cutKeyFrame = false; @@ -394,13 +400,13 @@ bool ClipItem::checkKeyFrames() int diff = pos - lastPos; if (diff != 0) { double ratio = (double)(end - lastPos) / diff; - double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(end) + ':' + locale.toString(newValue)); + int newValue = lastValue + (val - lastValue) * ratio; + newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue)); modified = true; } break; } else { - newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val)); + newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); } } lastPos = pos; @@ -421,18 +427,18 @@ bool ClipItem::checkKeyFrames() return clipEffectsModified; } -void ClipItem::setKeyframes(const int ix, const QStringList keyframes) +void ClipItem::setKeyframes(const int ix, const QStringList &keyframes) { QDomElement effect = m_effectList.at(ix); if (effect.attribute("disable") == "1") return; QLocale locale; QDomNodeList params = effect.elementsByTagName("parameter"); int keyframeParams = 0; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && (!e.hasAttribute("intimeline") || e.attribute("intimeline") == "1")) { e.setAttribute("keyframes", keyframes.at(keyframeParams)); - if (ix == m_selectedEffect && keyframeParams == 0) { + if (ix + 1 == m_selectedEffect && keyframeParams == 0) { m_keyframes.clear(); m_visibleParam = i; double max = locale.toDouble(e.attribute("max")); @@ -465,9 +471,9 @@ void ClipItem::setSelectedEffect(const int ix) QDomElement effect = effectAtIndex(m_selectedEffect); if (!effect.isNull() && effect.attribute("disable") != "1") { QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && (!e.hasAttribute("intimeline") || e.attribute("intimeline") == "1")) { m_keyframes.clear(); m_limitedKeyFrames = e.attribute("type") == "keyframe"; m_visibleParam = i; @@ -499,13 +505,29 @@ void ClipItem::setSelectedEffect(const int ix) } } +void ClipItem::resizeGeometries(const int index, int width, int height, int previousDuration, int start, int duration) +{ + QString geom; + QDomElement effect = m_effectList.at(index); + QDomNodeList params = effect.elementsByTagName("parameter"); + + for (int i = 0; i < params.count(); ++i) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && e.attribute("type") == "geometry") { + geom = e.attribute("value"); + Mlt::Geometry geometry(geom.toUtf8().data(), previousDuration, width, height); + e.setAttribute("value", geometry.serialise(start, start + duration)); + } + } +} + QStringList ClipItem::keyframes(const int index) { QStringList result; QDomElement effect = m_effectList.at(index); QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) result.append(e.attribute("keyframes")); @@ -627,7 +649,7 @@ void ClipItem::slotGetEndThumb() } -void ClipItem::slotSetStartThumb(QImage img) +void ClipItem::slotSetStartThumb(const QImage &img) { if (!img.isNull() && img.format() == QImage::Format_ARGB32) { QPixmap pix = QPixmap::fromImage(img); @@ -638,7 +660,7 @@ void ClipItem::slotSetStartThumb(QImage img) } } -void ClipItem::slotSetEndThumb(QImage img) +void ClipItem::slotSetEndThumb(const QImage &img) { if (!img.isNull() && img.format() == QImage::Format_ARGB32) { QPixmap pix = QPixmap::fromImage(img); @@ -649,7 +671,7 @@ void ClipItem::slotSetEndThumb(QImage img) } } -void ClipItem::slotThumbReady(int frame, QImage img) +void ClipItem::slotThumbReady(int frame, const QImage &img) { if (scene() == NULL) return; QRectF r = boundingRect(); @@ -669,12 +691,12 @@ void ClipItem::slotThumbReady(int frame, QImage img) } } -void ClipItem::slotSetStartThumb(const QPixmap pix) +void ClipItem::slotSetStartThumb(const QPixmap &pix) { m_startPix = pix; } -void ClipItem::slotSetEndThumb(const QPixmap pix) +void ClipItem::slotSetEndThumb(const QPixmap &pix) { m_endPix = pix; } @@ -768,55 +790,75 @@ void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { - QColor paintColor; + QPalette palette = scene()->palette(); + QColor paintColor = m_paintColor; + QColor textColor; + QColor textBgColor; QPen framePen; - if (parentItem()) paintColor = QColor(255, 248, 149); - else paintColor = m_baseColor; if (isSelected() || (parentItem() && parentItem()->isSelected())) { - paintColor = paintColor.darker(); - framePen.setColor(Qt::red); - framePen.setWidthF(2.0); + textColor = palette.highlightedText().color(); + textBgColor = palette.highlight().color(); + framePen.setColor(textBgColor); + paintColor.setRed(qMin(paintColor.red() * 2, 255)); } else { - framePen.setColor(paintColor.darker()); + textColor = palette.text().color(); + textBgColor = palette.window().color(); + textBgColor.setAlpha(200); + framePen.setColor(m_paintColor.darker()); } - const QRectF exposed = option->exposedRect; - painter->setClipRect(exposed); - painter->fillRect(exposed, paintColor); - painter->setWorldMatrixEnabled(false);; - const QRectF mapped = painter->worldTransform().mapRect(rect()); + const QTransform transformation = painter->worldTransform(); + const QRectF mappedExposed = transformation.mapRect(exposed); + const QRectF mapped = transformation.mapRect(rect()); + painter->setWorldTransform(QTransform()); + QPainterPath p; + p.addRect(mappedExposed); + QPainterPath q; + q.addRoundedRect(mapped, 3, 3); + painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false); + painter->setClipPath(p.intersected(q)); + painter->setPen(Qt::NoPen); + painter->fillRect(mappedExposed, paintColor); + painter->setPen(m_paintColor.darker()); // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { - QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 150)); - painter->setPen(pen); + QRectF thumbRect; if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { - const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); - painter->drawPixmap(top, m_startPix); - QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); - painter->drawLine(l2); + if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height()); + thumbRect.moveTopRight(mapped.topRight()); + painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect()); + //const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); + //painter->drawPixmap(top, m_startPix); + //QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); + //painter->drawLine(l2); } else if (!m_endPix.isNull()) { - const QPointF top = mapped.topRight() - QPointF(m_endPix.width() - 1, 0); - painter->drawPixmap(top, m_endPix); - QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); - painter->drawLine(l2); + if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_endPix.height() * m_endPix.width(), mapped.height()); + thumbRect.moveTopRight(mapped.topRight()); + painter->drawPixmap(thumbRect, m_endPix, m_endPix.rect()); + //const QPointF top = mapped.topRight() - QPointF(m_endPix.width() - 1, 0); + //painter->drawPixmap(top, m_endPix); + //QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); + //painter->drawLine(l2); } if (!m_startPix.isNull()) { - painter->drawPixmap(mapped.topLeft(), m_startPix); - QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom()); - painter->drawLine(l2); + if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height()); + thumbRect.moveTopLeft(mapped.topLeft()); + painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect()); + //painter->drawPixmap(mapped.topLeft(), m_startPix); + //QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom()); + //painter->drawLine(l2); } // if we are in full zoom, paint thumbnail for every frame - if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->worldTransform().m11() == FRAME_SIZE) { + if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && transformation.m11() == FRAME_SIZE) { int offset = (m_info.startPos - m_info.cropStart).frames(m_fps); int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset); int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset); QPointF startPos = mapped.topLeft(); int startOffset = m_info.cropStart.frames(m_fps); if (clipType() == IMAGE || clipType() == TEXT) { - for (int i = left; i <= right; i++) { + for (int i = left; i <= right; ++i) { painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix); } } @@ -827,13 +869,14 @@ void ClipItem::paint(QPainter *painter, QImage img; QPen pen(Qt::white); pen.setStyle(Qt::DotLine); - painter->setPen(pen); QList missing; - for (int i = left; i <= right; i++) { + for (int i = left; i <= right; ++i) { img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); QPointF xpos = startPos + QPointF(FRAME_SIZE *(i - startOffset), 0); if (img.isNull()) missing << i; - else painter->drawImage(xpos, img); + else { + painter->drawImage(xpos, img); + } painter->drawLine(xpos, xpos + QPointF(0, mapped.height())); } if (!missing.isEmpty()) { @@ -844,9 +887,7 @@ void ClipItem::paint(QPainter *painter, #endif } } - painter->setPen(Qt::black); } - // draw audio thumbnails if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == AUDIO) && m_audioThumbReady) { @@ -865,26 +906,35 @@ void ClipItem::paint(QPainter *painter, mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2); } else mappedRect = mapped; - double scale = painter->worldTransform().m11(); + double scale = transformation.m11(); int channels = 0; if (isEnabled() && m_clip) channels = m_clip->getProperty("channels").toInt(); if (scale != m_framePixelWidth) m_audioThumbCachePic.clear(); double cropLeft = m_info.cropStart.frames(m_fps); const int clipStart = mappedRect.x(); - const int mappedStartPixel = painter->worldTransform().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; - const int mappedEndPixel = painter->worldTransform().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; + const int mappedStartPixel = transformation.map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; + const int mappedEndPixel = transformation.map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; if (channels >= 1) { - emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels); + emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels, (int) (mappedRect.height() + 0.5)); } - + QRectF pixmapRect(0, mappedRect.y(), 100, mappedRect.height()); for (int startCache = mappedStartPixel - (mappedStartPixel) % 100; startCache < mappedEndPixel; startCache += 100) { - if (m_audioThumbCachePic.contains(startCache) && !m_audioThumbCachePic[startCache].isNull()) - painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), m_audioThumbCachePic[startCache]); + if (!m_audioThumbCachePic.value(startCache).isNull()) { + //painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), m_audioThumbCachePic.value(startCache)); + QPixmap pix(m_audioThumbCachePic.value(startCache)); + pixmapRect.moveLeft(clipStart + startCache - cropLeft); + painter->drawPixmap(pixmapRect, pix, pix.rect()); + } } } + + if (m_isMainSelectedClip) { + framePen.setColor(Qt::red); + textBgColor = Qt::red; + } // only paint details if clip is big enough if (mapped.width() > 20) { @@ -892,36 +942,34 @@ void ClipItem::paint(QPainter *painter, // Draw effects names if (!m_effectNames.isEmpty() && mapped.width() > 40) { QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - QColor bgColor; + QColor bColor = palette.window().color(); + QColor tColor = palette.text().color(); + tColor.setAlpha(220); if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { qreal value = m_timeLine->currentValue(); txtBounding.setWidth(txtBounding.width() * value); - bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); - } else bgColor.setRgb(50, 50, 90, 180); - - QPainterPath rounded; - rounded.moveTo(txtBounding.bottomRight()); - rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); - rounded.lineTo(txtBounding.topLeft()); - rounded.lineTo(txtBounding.bottomLeft()); - painter->fillPath(rounded, bgColor); - painter->setPen(Qt::lightGray); - painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); + bColor.setAlpha(100 + 50 * value); + }; + + painter->setBrush(bColor); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding.adjusted(-1, -2, 4, -1), 3, 3); + painter->setPen(tColor); + painter->drawText(txtBounding.adjusted(2, 0, 1, -1), Qt::AlignCenter, m_effectNames); } - const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - painter->setBrush(framePen.color()); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding2, 3, 3); + // Draw clip name + const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignRight | Qt::AlignTop, m_clipName + ' ').adjusted(0, -1, 0, -1); + painter->setPen(Qt::NoPen); + painter->fillRect(txtBounding2.adjusted(-3, 0, 0, 0), textBgColor); painter->setBrush(QBrush(Qt::NoBrush)); - + painter->setPen(textColor); if (m_videoOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); } else if (m_audioOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); } - painter->setPen(Qt::white); - painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + painter->drawText(txtBounding2, Qt::AlignLeft, m_clipName); // draw markers @@ -930,28 +978,29 @@ void ClipItem::paint(QPainter *painter, QList < CommentedTime >::Iterator it = markers.begin(); GenTime pos; double framepos; - QBrush markerBrush(QColor(120, 120, 0, 140)); + QBrush markerBrush(QColor(120, 120, 0, 140)); QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 200)); - pen.setStyle(Qt::DotLine); for (; it != markers.end(); ++it) { pos = GenTime((int)((*it).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom()); - QLineF l2 = painter->worldTransform().map(l); + QLineF l2 = transformation.map(l); + pen.setColor(CommentedTime::markerColor((*it).markerType())); + pen.setStyle(Qt::DotLine); painter->setPen(pen); painter->drawLine(l2); if (KdenliveSettings::showmarkers()) { framepos = rect().x() + pos.frames(m_fps); - const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); - const QRectF r2 = painter->worldTransform().mapRect(r1); + const QRectF r1(framepos + 0.04, rect().height()/3, rect().width() - framepos - 2, rect().height() / 2); + const QRectF r2 = transformation.mapRect(r1); const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); painter->setBrush(markerBrush); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding3, 3, 3); - painter->setBrush(QBrush(Qt::NoBrush)); + pen.setStyle(Qt::SolidLine); + painter->setPen(pen); + painter->drawRect(txtBounding3); + painter->setBrush(Qt::NoBrush); painter->setPen(Qt::white); painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); } @@ -972,7 +1021,7 @@ void ClipItem::paint(QPainter *painter, fadeInPath.lineTo(0, rect().height()); fadeInPath.lineTo(m_startFade, 0); fadeInPath.closeSubpath(); - QPainterPath f1 = painter->worldTransform().map(fadeInPath); + QPainterPath f1 = transformation.map(fadeInPath); painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); /*if (isSelected()) { QLineF l(m_startFade * scale, 0, 0, itemHeight); @@ -985,7 +1034,7 @@ void ClipItem::paint(QPainter *painter, fadeOutPath.lineTo(rect().width(), rect().height()); fadeOutPath.lineTo(rect().width() - m_endFade, 0); fadeOutPath.closeSubpath(); - QPainterPath f1 = painter->worldTransform().map(fadeOutPath); + QPainterPath f1 = transformation.map(fadeOutPath); painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); /*if (isSelected()) { QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight); @@ -996,23 +1045,20 @@ void ClipItem::paint(QPainter *painter, painter->setPen(QPen(Qt::lightGray)); // draw effect or transition keyframes - drawKeyFrames(painter, m_limitedKeyFrames); + drawKeyFrames(painter, transformation, m_limitedKeyFrames); } // draw clip border // expand clip rect to allow correct painting of clip border painter->setClipping(false); + painter->setRenderHint(QPainter::Antialiasing, true); + framePen.setWidthF(1.5); painter->setPen(framePen); - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5)); - } - else { - painter->drawRect(mapped.adjusted(0, 0, -0.5, 0)); - } + painter->drawRoundedRect(mapped.adjusted(0.5, 0, -0.5, 0), 3, 3); } -OPERATIONTYPE ClipItem::operationMode(QPointF pos) +OPERATIONTYPE ClipItem::operationMode(const QPointF &pos) { if (isItemLocked()) return NONE; const double scale = projectScene()->scale().x(); @@ -1032,10 +1078,32 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { return FADEIN; } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { + // If we are in a group, allow resize only if all clips start at same position + if (parentItem()) { + QGraphicsItemGroup *dragGroup = static_cast (parentItem()); + QList list = dragGroup->childItems(); + for (int i = 0; i < list.count(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + ClipItem *c = static_cast (list.at(i)); + if (c->startPos() != startPos()) return MOVE; + } + } + } return RESIZESTART; } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { return FADEOUT; } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { + // If we are in a group, allow resize only if all clips end at same position + if (parentItem()) { + QGraphicsItemGroup *dragGroup = static_cast (parentItem()); + QList list = dragGroup->childItems(); + for (int i = 0; i < list.count(); ++i) { + if (list.at(i)->type() == AVWIDGET) { + ClipItem *c = static_cast (list.at(i)); + if (c->endPos() != endPos()) return MOVE; + } + } + } return RESIZEEND; } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { return TRANSITIONSTART; @@ -1064,7 +1132,7 @@ QList ClipItem::snapMarkers() const QList < GenTime > markers = m_clip->snapMarkers(); GenTime pos; - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { pos = GenTime((int)(markers.at(i).frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; @@ -1081,99 +1149,118 @@ QList ClipItem::commentedSnapMarkers() const QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); GenTime pos; - for (int i = 0; i < markers.size(); i++) { + for (int i = 0; i < markers.size(); ++i) { pos = GenTime((int)(markers.at(i).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; - else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment())); + else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment(), markers.at(i).markerType())); } } return snaps; } -void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels) +void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels, int pixelHeight) { - QRectF re = sceneBoundingRect(); - if (m_clipType == AV && !isAudioOnly()) re.setTop(re.y() + re.height() / 2); + // Bail out, if caller provided invalid data + if (channels <= 0) { + kWarning() << "Unable to draw image with " << channels << "number of channels"; + return; + } + int factor = 64; + if (KdenliveSettings::normaliseaudiothumbs()) { + factor = m_clip->getProperty("audio_max").toInt(); + } //kDebug() << "// PREP AUDIO THMB FRMO : scale:" << pixelForOneFrame<< ", from: " << startpixel << ", to: " << endpixel; //if ( (!audioThumbWasDrawn || framePixelWidth!=pixelForOneFrame ) && !baseClip()->audioFrameChache.isEmpty()){ + bool fullAreaDraw = pixelForOneFrame < 10; + bool simplifiedAudio = !KdenliveSettings::displayallchannels(); + QPen audiopen; + audiopen.setWidth(0); + if (simplifiedAudio) channels = 1; + int channelHeight = pixelHeight / channels; + QMap positiveChannelPaths; + QMap negativeChannelPaths; for (int startCache = startpixel - startpixel % 100; startCache < endpixel; startCache += 100) { - //kDebug() << "creating " << startCache; - //if (framePixelWidth!=pixelForOneFrame || if (m_framePixelWidth == pixelForOneFrame && m_audioThumbCachePic.contains(startCache)) continue; - if (m_audioThumbCachePic[startCache].isNull() || m_framePixelWidth != pixelForOneFrame) { - m_audioThumbCachePic[startCache] = QPixmap(100, (int)(re.height())); - m_audioThumbCachePic[startCache].fill(QColor(180, 180, 200, 140)); + if (m_audioThumbCachePic.value(startCache).isNull() || m_framePixelWidth != pixelForOneFrame) { + QPixmap pix(100, pixelHeight); + pix.fill(QColor(180, 180, 180, 150)); + m_audioThumbCachePic[startCache] = pix; } - bool fullAreaDraw = pixelForOneFrame < 10; - QMap positiveChannelPaths; - QMap negativeChannelPaths; + positiveChannelPaths.clear(); + negativeChannelPaths.clear(); + QPainter pixpainter(&m_audioThumbCachePic[startCache]); - QPen audiopen; - audiopen.setWidth(0); - pixpainter.setPen(audiopen); - //pixpainter.setRenderHint(QPainter::Antialiasing,true); - //pixpainter.drawLine(0,0,100,re.height()); - // Bail out, if caller provided invalid data - if (channels <= 0) { - kWarning() << "Unable to draw image with " << channels << "number of channels"; - return; - } - - int channelHeight = m_audioThumbCachePic[startCache].height() / channels; - for (int i = 0; i < channels; i++) { - - positiveChannelPaths[i].moveTo(0, channelHeight*i + channelHeight / 2); - negativeChannelPaths[i].moveTo(0, channelHeight*i + channelHeight / 2); - } + for (int i = 0; i < channels; ++i) { + if (simplifiedAudio) { + positiveChannelPaths[i].moveTo(-1, channelHeight); + } + else if (fullAreaDraw) { + positiveChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2); + negativeChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2); + } + else { + positiveChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2); + audiopen.setColor(QColor(60, 60, 60, 50)); + pixpainter.setPen(audiopen); + pixpainter.drawLine(0, channelHeight*i + channelHeight / 2, 100, channelHeight*i + channelHeight / 2); + } + } for (int samples = 0; samples <= 100; samples++) { double frame = (double)(samples + startCache - 0) / pixelForOneFrame; int sample = (int)((frame - (int)(frame)) * 20); // AUDIO_FRAME_SIZE if (frame < 0 || sample < 0 || sample > 19) continue; - QMap frame_channel_data = baseClip()->m_audioFrameCache[(int)frame]; - - for (int channel = 0; channel < channels && frame_channel_data[channel].size() > 0; channel++) { - - int y = channelHeight * channel + channelHeight / 2; - int delta = (int)(frame_channel_data[channel][sample] - 127 / 2) * channelHeight / 64; - if (fullAreaDraw) { - positiveChannelPaths[channel].lineTo(samples, 0.1 + y + qAbs(delta)); - negativeChannelPaths[channel].lineTo(samples, 0.1 + y - qAbs(delta)); + const QMap frame_channel_data = baseClip()->audioFrameCache.value((int)frame); + + for (int channel = 0; channel < channels && !frame_channel_data.value(channel).isEmpty(); channel++) { + int y = channelHeight * channel + channelHeight / 2; + if (simplifiedAudio) { + double delta = qAbs((frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / factor); + positiveChannelPaths[channel].lineTo(samples, channelHeight - delta); + } else if (fullAreaDraw) { + double delta = qAbs((frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / (2 * factor)); + positiveChannelPaths[channel].lineTo(samples, y + delta); + negativeChannelPaths[channel].lineTo(samples, y - delta); } else { - positiveChannelPaths[channel].lineTo(samples, 0.1 + y + delta); - negativeChannelPaths[channel].lineTo(samples, 0.1 + y - delta); + double delta = (frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / (2 * factor); + positiveChannelPaths[channel].lineTo(samples, y + delta); } } - for (int channel = 0; channel < channels ; channel++) - if (fullAreaDraw && samples == 100) { - positiveChannelPaths[channel].lineTo(samples, channelHeight*channel + channelHeight / 2); - negativeChannelPaths[channel].lineTo(samples, channelHeight*channel + channelHeight / 2); - positiveChannelPaths[channel].lineTo(0, channelHeight*channel + channelHeight / 2); - negativeChannelPaths[channel].lineTo(0, channelHeight*channel + channelHeight / 2); - } - } - pixpainter.setPen(QPen(QColor(0, 0, 0))); - pixpainter.setBrush(QBrush(QColor(60, 60, 60))); - - for (int i = 0; i < channels; i++) { + for (int channel = 0; channel < channels; channel++) { + if (simplifiedAudio) { + positiveChannelPaths[channel].lineTo(101, channelHeight); + } else if (fullAreaDraw) { + int y = channelHeight * channel + channelHeight / 2; + positiveChannelPaths[channel].lineTo(101, y); + negativeChannelPaths[channel].lineTo(101, y); + } + } + if (fullAreaDraw || simplifiedAudio) { + audiopen.setColor(QColor(80, 80, 80, 200)); + pixpainter.setPen(audiopen); + pixpainter.setBrush(QBrush(QColor(120, 120, 120, 200))); + } + else { + audiopen.setColor(QColor(60, 60, 60, 100)); + pixpainter.setPen(audiopen); + pixpainter.setBrush(Qt::NoBrush); + } + pixpainter.setRenderHint(QPainter::Antialiasing, false); + for (int i = 0; i < channels; ++i) { if (fullAreaDraw) { - //pixpainter.fillPath(positiveChannelPaths[i].united(negativeChannelPaths[i]),QBrush(Qt::SolidPattern));//or singleif looks better - pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths[i]));//or singleif looks better + pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths.value(i))); } else - pixpainter.drawPath(positiveChannelPaths[i]); + pixpainter.drawPath(positiveChannelPaths.value(i)); } } - //audioThumbWasDrawn=true; m_framePixelWidth = pixelForOneFrame; - - //} } int ClipItem::fadeIn() const @@ -1242,7 +1329,7 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) } */ -void ClipItem::resizeStart(int posx, bool /*size*/) +void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange) { bool sizeLimit = false; if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) { @@ -1265,9 +1352,15 @@ void ClipItem::resizeStart(int posx, bool /*size*/) m_startThumbTimer.start(150); } } + if (emitChange) slotUpdateRange(); +} + +void ClipItem::slotUpdateRange() +{ + if (m_isMainSelectedClip) emit updateRange(); } -void ClipItem::resizeEnd(int posx) +void ClipItem::resizeEnd(int posx, bool emitChange) { const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps); if (posx > max && maxDuration() != GenTime()) posx = max; @@ -1286,14 +1379,17 @@ void ClipItem::resizeEnd(int posx) m_endThumbTimer.start(150); } } + if (emitChange) slotUpdateRange(); } //virtual QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) { if (change == QGraphicsItem::ItemSelectedChange) { - if (value.toBool()) setZValue(10); - else setZValue(2); + if (value.toBool()) + setZValue(10); + else + setZValue(2); } if (change == ItemPositionChange && scene()) { // calculate new position. @@ -1308,6 +1404,11 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) int newTrack = yOffset / 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() + 1)); // Only one clip is moving QRectF sceneShape = rect(); @@ -1319,7 +1420,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) 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! @@ -1365,6 +1466,11 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) //kDebug()<<"// ITEM NEW POS: "<(); + if (parent) m_paintColor = m_baseColor.lighter(135); + else m_paintColor = m_baseColor; + } return QGraphicsItem::itemChange(change, value); } @@ -1506,7 +1612,6 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt(); }*/ } else if (effectId == "fade_from_black") { - kDebug()<<"// FOUND FTB:"<views()[0]; - if (view) view->slotAddEffect(e, m_info.startPos, track()); + if (view) view->slotDropEffect(this, e, m_info.startPos, track()); } else return; } @@ -1767,6 +1872,10 @@ void ClipItem::setAudioOnly(bool force) } else if (m_clipType == AUDIO) m_baseColor = QColor(141, 215, 166); else m_baseColor = QColor(141, 166, 215); } + if (parentItem()) + m_paintColor = m_baseColor.lighter(135); + else + m_paintColor = m_baseColor; m_audioThumbCachePic.clear(); } @@ -1787,7 +1896,7 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) effect.setAttribute("active_keyframe", pos); m_editedKeyframe = pos; QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString kfr = e.attribute("keyframes"); @@ -1827,7 +1936,7 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double QDomNodeList params = effect.elementsByTagName("parameter"); int start = cropStart().frames(m_fps); int end = (cropStart() + cropDuration()).frames(m_fps) - 1; - for (int i = 0; i < params.count(); i++) { + for (int i = 0; i < params.count(); ++i) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString kfr = e.attribute("keyframes"); @@ -1887,7 +1996,7 @@ Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) QMap ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo) { QMap effects; - for (int i = 0; i < m_effectList.count(); i++) { + for (int i = 0; i < m_effectList.count(); ++i) { QDomElement effect = m_effectList.at(i); if (effect.attribute("id").startsWith("fade")) { @@ -1909,8 +2018,9 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, effects[i] = effect.cloneNode().toElement(); EffectsList::setParameter(effect, "out", QString::number(clipEnd)); } - if (effects.contains(i)) + if (effects.contains(i)) { setFadeIn(out - in); + } } else { if (out != clipEnd) { effects[i] = effect.cloneNode().toElement(); @@ -1923,7 +2033,7 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, if (in < cropStart().frames(m_fps)) { if (!effects.contains(i)) effects[i] = effect.cloneNode().toElement(); - EffectsList::setParameter(effect, "in", QString::number(cropStart().frames(m_fps))); + EffectsList::setParameter(effect, "in", QString::number((int) cropStart().frames(m_fps))); } if (effects.contains(i)) setFadeOut(out - in); @@ -2078,5 +2188,6 @@ void ClipItem::slotGotThumbsCache() update(); } + #include "clipitem.moc"