X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclipitem.cpp;h=958af22d9d0443949fc7b479fd98a7682238e92b;hb=f10ecf3c4538b19705753e118c3bc8c4702d4747;hp=19413d3076347108c1ad3a504b4c6dfff6105ec8;hpb=83a2992a570941a8e7c04bc5c55c08434560ef83;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 19413d30..958af22d 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -30,31 +30,31 @@ #include -#include - #include "clipitem.h" #include "customtrackview.h" #include "renderer.h" +#include "docclipbase.h" +#include "transition.h" #include "events.h" #include "kdenlivesettings.h" +#include "kthumb.h" + +ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps) + : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1) { + QRectF rect((double) info.startPos.frames(fps) * scale, (double)(info.track * KdenliveSettings::trackheight() + 1), (double)(info.endPos - info.startPos).frames(fps) * scale, (double)(KdenliveSettings::trackheight() - 1)); + setRect(rect); -ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF & rect, GenTime duration, double fps) - : AbstractClipItem(rect), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_hover(false) { - //setToolTip(name); - // kDebug() << "******* CREATING NEW TML CLIP, DUR: " << duration; - m_fps = fps; - m_startPos = startpos; - m_track = track; - m_xml = clip->toXML(); m_clipName = clip->name(); m_producer = clip->getId(); m_clipType = clip->clipType(); - m_cropStart = GenTime(); - m_maxDuration = duration; - if (duration != GenTime()) m_cropDuration = duration; - else m_cropDuration = m_maxDuration; + m_cropStart = cropStart; + m_maxDuration = clip->maxDuration(); setAcceptDrops(true); audioThumbReady = clip->audioThumbCreated(); + /*m_keyframes[0] = 50; + m_keyframes[30] = 20; + m_keyframes[70] = 90; + m_keyframes[100] = 10;*/ /* m_cropStart = xml.attribute("in", 0).toInt(); m_maxDuration = xml.attribute("duration", 0).toInt(); @@ -69,7 +69,7 @@ ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF connect(this , SIGNAL(prepareAudioThumb(double, QPainterPath, int, int)) , this, SLOT(slotPrepareAudioThumb(double, QPainterPath, int, int))); setBrush(QColor(141, 166, 215)); - if (m_clipType == VIDEO || m_clipType == AV) { + if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW) { m_hasThumbs = true; connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(extractImage(int, int))); connect(clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap))); @@ -82,15 +82,13 @@ ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF endThumbTimer = new QTimer(this); endThumbTimer->setSingleShot(true); connect(endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); - } else if (m_clipType == COLOR) { - m_maxDuration = GenTime(10000, m_fps); - QString colour = m_xml.attribute("colour"); + QString colour = clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); setBrush(QColor(colour.left(7))); - } else if (m_clipType == IMAGE) { - m_maxDuration = GenTime(10000, m_fps); - m_startPix = KThumb::getImage(KUrl(m_xml.attribute("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50); + } else if (m_clipType == IMAGE || m_clipType == TEXT) { + m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50); + m_endPix = m_startPix; } else if (m_clipType == AUDIO) { connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } @@ -102,6 +100,108 @@ ClipItem::~ClipItem() { if (endThumbTimer) delete endThumbTimer; } +int ClipItem::selectedEffectIndex() const { + return m_selectedEffect; +} + + +void ClipItem::setSelectedEffect(int ix) { + //if (ix == m_selectedEffect) return; + m_selectedEffect = ix; + QDomElement effect = effectAt(m_selectedEffect); + 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") == "keyframe") { + int max = e.attribute("max").toInt(); + int min = e.attribute("min").toInt(); + int def = e.attribute("default").toInt(); + int factor = e.attribute("factor").toInt(); + if (factor == 0) factor = 1; + + // Effect has a keyframe type parameter, we need to set the values + if (e.attribute("keyframes").isEmpty()) { + // no keyframes defined, set up 2 keyframes (start and end) with default value. + m_keyframes[m_cropStart.frames(m_fps)] = 100 * def / (max - min); + m_keyframes[(m_cropStart + m_cropDuration).frames(m_fps)] = 100 * def / (max - min); + } else { + // parse keyframes + QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + foreach(QString str, keyframes) { + int pos = str.section(":", 0, 0).toInt(); + double val = str.section(":", 1, 1).toDouble(); + m_keyframes[pos] = val; + } + } + update(); + return; + } + } + if (!m_keyframes.isEmpty()) { + m_keyframes.clear(); + update(); + } +} + +void ClipItem::updateKeyframeEffect() { + QDomElement effect = effectAt(m_selectedEffect); + 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") == "keyframe") { + int max = e.attribute("max").toInt(); + int min = e.attribute("min").toInt(); + int def = e.attribute("default").toInt(); + int factor = e.attribute("factor").toInt(); + if (factor == 0) factor = 1; + QString keyframes; + + if (m_keyframes.count() > 1) { + QMap::const_iterator i = m_keyframes.constBegin(); + double x1; + double y1; + while (i != m_keyframes.constEnd()) { + keyframes.append(QString::number(i.key()) + ":" + QString::number(i.value()) + ";"); + /*x1 = m_cropDuration.frames(m_fps) * i.key() / 100.0; + y1 = (min + i.value() * (max - min) / 100.0) / factor; + keyframes.append(QString::number(x1) + ":" + QString::number(y1) + ";");*/ + ++i; + } + } + // Effect has a keyframe type parameter, we need to set the values + kDebug() << "::::::::::::::: SETTING EFFECT KEYFRAMES: " << keyframes; + e.setAttribute("keyframes", keyframes); + break; + } + } +} + +QDomElement ClipItem::selectedEffect() { + if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement(); + return effectAt(m_selectedEffect); +} + +void ClipItem::resetThumbs() { + slotFetchThumbs(); + audioThumbCachePic.clear(); +} + + +void ClipItem::refreshClip() { + m_maxDuration = m_clip->maxDuration(); + if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW) slotFetchThumbs(); + else if (m_clipType == COLOR) { + QString colour = m_clip->getProperty("colour"); + colour = colour.replace(0, 2, "#"); + setBrush(QColor(colour.left(7))); + } else if (m_clipType == IMAGE || m_clipType == TEXT) { + m_startPix = KThumb::getImage(KUrl(m_clip->getProperty("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50); + m_endPix = m_startPix; + } +} + void ClipItem::slotFetchThumbs() { m_thumbsRequested += 2; emit getThumb((int)m_cropStart.frames(m_fps), (int)(m_cropStart + m_cropDuration).frames(m_fps)); @@ -119,173 +219,164 @@ void ClipItem::slotGetEndThumb() { void ClipItem::slotThumbReady(int frame, QPixmap pix) { if (m_thumbsRequested == 0) return; - if (frame == m_cropStart.frames(m_fps)) m_startPix = pix; - else m_endPix = pix; - update(); + if (frame == m_cropStart.frames(m_fps)) { + m_startPix = pix; + QRectF r = boundingRect(); + r.setRight(pix.width() + 2); + update(r); + } else { + m_endPix = pix; + QRectF r = boundingRect(); + r.setLeft(r.right() - pix.width() - 2); + update(r); + } m_thumbsRequested--; } void ClipItem::slotGotAudioData() { audioThumbReady = true; - update(); + if (m_clipType == AV) { + QRectF r = boundingRect(); + r.setTop(r.top() + r.height() / 2 - 1); + update(r); + } else update(); } int ClipItem::type() const { - return 70000; + return AVWIDGET; } -DocClipBase *ClipItem::baseClip() { +DocClipBase *ClipItem::baseClip() const { return m_clip; } QDomElement ClipItem::xml() const { - return m_xml; + return m_clip->toXML(); } -int ClipItem::clipType() { +int ClipItem::clipType() const { return m_clipType; } -QString ClipItem::clipName() { +QString ClipItem::clipName() const { return m_clipName; } -int ClipItem::clipProducer() { +int ClipItem::clipProducer() const { return m_producer; } -GenTime ClipItem::maxDuration() const { - return m_maxDuration; -} - -GenTime ClipItem::cropStart() const { - return m_cropStart; -} - void ClipItem::flashClip() { if (m_timeLine == 0) { m_timeLine = new QTimeLine(750, this); + m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve); connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animate(qreal))); } m_timeLine->start(); } void ClipItem::animate(qreal value) { - m_opacity = value; - update(); + QRectF r = boundingRect(); + r.setHeight(20); + update(r); } // virtual void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget) { + QWidget *) { painter->setOpacity(m_opacity); QBrush paintColor = brush(); - if (isSelected()) paintColor = QBrush(QColor(79, 93, 121)); QRectF br = rect(); double scale = br.width() / m_cropDuration.frames(m_fps); - QRect rectInView;//this is the rect that is visible by the user - if (scene()->views().size() > 0) { - rectInView = scene()->views()[0]->viewport()->rect(); - rectInView.moveTo(scene()->views()[0]->horizontalScrollBar()->value(), scene()->views()[0]->verticalScrollBar()->value()); - rectInView.adjust(-10, -10, 10, 10);//make view rect 10 pixel greater on each site, or repaint after scroll event - //kDebug() << scene()->views()[0]->viewport()->rect() << " " << scene()->views()[0]->horizontalScrollBar()->value(); - } - if (rectInView.isNull()) - return; - QPainterPath clippath; - clippath.addRect(rectInView); - int startpixel = (int)(rectInView.x() - rect().x()); //start and endpixel that is viewable from rect() + // kDebug()<<"/// EXPOSED RECT: "<exposedRect.x()<<" X "<exposedRect.right(); + + int startpixel = (int)option->exposedRect.x() - rect().x(); if (startpixel < 0) startpixel = 0; - int endpixel = rectInView.width() + rectInView.x(); + int endpixel = (int)option->exposedRect.right() - rect().x(); if (endpixel < 0) endpixel = 0; //painter->setRenderHints(QPainter::Antialiasing); - QPainterPath roundRectPathUpper, roundRectPathLower; - double roundingY = 20; - double roundingX = 20; - double offset = 1; + QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br); painter->setClipRect(option->exposedRect); - if (roundingX > br.width() / 2) roundingX = br.width() / 2; - - int br_endx = (int)(br.x() + br .width() - offset); - int br_startx = (int)(br.x() + offset); - int br_starty = (int)(br.y()); - int br_halfy = (int)(br.y() + br.height() / 2 - offset); - int br_endy = (int)(br.y() + br.height()); - int left_upper = 0, left_lower = 0, right_upper = 0, right_lower = 0; - - if (m_hover && false) { - if (!true) /*TRANSITIONSTART to upper clip*/ - left_upper = 40; - if (!false) /*TRANSITIONSTART to lower clip*/ - left_lower = 40; - if (!true) /*TRANSITIONEND to upper clip*/ - right_upper = 40; - if (!false) /*TRANSITIONEND to lower clip*/ - right_lower = 40; - } // build path around clip - roundRectPathUpper.moveTo(br_endx - right_upper , br_halfy); - roundRectPathUpper.arcTo(br_endx - roundingX - right_upper , br_starty , roundingX, roundingY, 0.0, 90.0); - roundRectPathUpper.lineTo(br_startx + roundingX + left_upper, br_starty); - roundRectPathUpper.arcTo(br_startx + left_upper, br_starty , roundingX, roundingY, 90.0, 90.0); - roundRectPathUpper.lineTo(br_startx + left_upper, br_halfy); - - roundRectPathLower.moveTo(br_startx + left_lower, br_halfy); - roundRectPathLower.arcTo(br_startx + left_lower, br_endy - roundingY , roundingX, roundingY, 180.0, 90.0); - roundRectPathLower.lineTo(br_endx - roundingX - right_lower , br_endy); - roundRectPathLower.arcTo(br_endx - roundingX - right_lower , br_endy - roundingY, roundingX, roundingY, 270.0, 90.0); - roundRectPathLower.lineTo(br_endx - right_lower , br_halfy); - QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower); + painter->fillPath(resultClipPath, paintColor); - painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip); - //painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red))); - painter->fillRect(br.intersected(rectInView), paintColor); - //painter->fillRect(QRectF(br.x() + br.width() - m_endPix.width(), br.y(), m_endPix.width(), br.height()), QBrush(QColor(Qt::black))); - + painter->setClipPath(resultClipPath, Qt::IntersectClip); // draw thumbnails if (!m_startPix.isNull() && KdenliveSettings::videothumbnails()) { if (m_clipType == IMAGE) { - painter->drawPixmap(QPointF(br.x() + br.width() - m_startPix.width(), br.y()), m_startPix); - QLineF l(br.x() + br.width() - m_startPix.width(), br.y(), br.x() + br.width() - m_startPix.width(), br.y() + br.height()); + painter->drawPixmap(QPointF(br.right() - m_startPix.width(), br.y()), m_startPix); + QLine l(br.right() - m_startPix.width(), br.y(), br.right() - m_startPix.width(), br.y() + br.height()); painter->drawLine(l); } else { - painter->drawPixmap(QPointF(br.x() + br.width() - m_endPix.width(), br.y()), m_endPix); - QLineF l(br.x() + br.width() - m_endPix.width(), br.y(), br.x() + br.width() - m_endPix.width(), br.y() + br.height()); + painter->drawPixmap(QPointF(br.right() - m_endPix.width(), br.y()), m_endPix); + QLine l(br.right() - m_endPix.width(), br.y(), br.right() - m_endPix.width(), br.y() + br.height()); painter->drawLine(l); } painter->drawPixmap(QPointF(br.x(), br.y()), m_startPix); - QLineF l2(br.x() + m_startPix.width(), br.y(), br.x() + m_startPix.width(), br.y() + br.height()); + QLine l2(br.x() + m_startPix.width(), br.y(), br.x() + m_startPix.width(), br.y() + br.height()); painter->drawLine(l2); } // draw audio thumbnails - if ((m_clipType == AV || m_clipType == AUDIO) && audioThumbReady && KdenliveSettings::audiothumbnails()) { + if (KdenliveSettings::audiothumbnails() && ((m_clipType == AV && option->exposedRect.bottom() > br.height() / 2) || m_clipType == AUDIO) && audioThumbReady) { - QPainterPath path = m_clipType == AV ? roundRectPathLower : roundRectPathUpper.united(roundRectPathLower); + QPainterPath path = m_clipType == AV ? roundRectPathLower : resultClipPath; if (m_clipType == AV) painter->fillPath(path, QBrush(QColor(200, 200, 200, 140))); int channels = 2; if (scale != framePixelWidth) audioThumbCachePic.clear(); emit prepareAudioThumb(scale, path, startpixel, endpixel + 200);//200 more for less missing parts before repaint after scrolling - int cropLeft = (m_cropStart).frames(m_fps) * scale; + int cropLeft = (int)((m_cropStart).frames(m_fps) * scale); for (int startCache = startpixel - startpixel % 100; startCache < endpixel + 300;startCache += 100) { if (audioThumbCachePic.contains(startCache) && !audioThumbCachePic[startCache].isNull()) painter->drawPixmap((int)(roundRectPathUpper.united(roundRectPathLower).boundingRect().x() + startCache - cropLeft), (int)(path.boundingRect().y()), audioThumbCachePic[startCache]); } + } + // draw markers + QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); + QList < CommentedTime >::Iterator it = markers.begin(); + GenTime pos; + double framepos; + const int markerwidth = 4; + QBrush markerBrush; + markerBrush = QBrush(QColor(120, 120, 0, 100)); + QPen pen = painter->pen(); + pen.setColor(QColor(255, 255, 255, 200)); + pen.setStyle(Qt::DotLine); + painter->setPen(pen); + for (; it != markers.end(); ++it) { + pos = (*it).time() - cropStart(); + if (pos > GenTime()) { + if (pos > duration()) break; + framepos = scale * pos.frames(m_fps); + QLineF l(br.x() + framepos, br.y() + 5, br.x() + framepos, br.y() + br.height() - 5); + painter->drawLine(l); + if (KdenliveSettings::showmarkers()) { + const QRectF txtBounding = painter->boundingRect(br.x() + framepos + 1, br.y() + 10, br.width() - framepos - 2, br.height() - 10, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " "); + QPainterPath path; + path.addRoundedRect(txtBounding, 3, 3); + painter->fillPath(path, markerBrush); + painter->drawText(txtBounding, Qt::AlignCenter, (*it).comment()); + } + //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); + } } + pen.setColor(Qt::black); + pen.setStyle(Qt::SolidLine); + painter->setPen(pen); // draw start / end fades QBrush fades; @@ -295,116 +386,167 @@ void ClipItem::paint(QPainter *painter, if (m_startFade != 0) { QPainterPath fadeInPath; - fadeInPath.moveTo(br.x() - offset, br.y()); - fadeInPath.lineTo(br.x() - offset, br.y() + br.height()); + fadeInPath.moveTo(br.x() , br.y()); + fadeInPath.lineTo(br.x() , br.bottom()); fadeInPath.lineTo(br.x() + m_startFade * scale, br.y()); fadeInPath.closeSubpath(); - painter->fillPath(fadeInPath, fades); + painter->fillPath(fadeInPath/*.intersected(resultClipPath)*/, fades); if (isSelected()) { - QLineF l(br.x() + m_startFade * scale, br.y(), br.x(), br.y() + br.height()); + QLineF l(br.x() + m_startFade * scale, br.y(), br.x(), br.bottom()); painter->drawLine(l); } } if (m_endFade != 0) { QPainterPath fadeOutPath; - fadeOutPath.moveTo(br.x() + br.width(), br.y()); - fadeOutPath.lineTo(br.x() + br.width(), br.y() + br.height()); - fadeOutPath.lineTo(br.x() + br.width() - m_endFade * scale, br.y()); + fadeOutPath.moveTo(br.right(), br.y()); + fadeOutPath.lineTo(br.right(), br.bottom()); + fadeOutPath.lineTo(br.right() - m_endFade * scale, br.y()); fadeOutPath.closeSubpath(); - painter->fillPath(fadeOutPath, fades); + painter->fillPath(fadeOutPath/*.intersected(resultClipPath)*/, fades); if (isSelected()) { - QLineF l(br.x() + br.width() - m_endFade * scale, br.y(), br.x() + br.width(), br.y() + br.height()); + QLineF l(br.right() - m_endFade * scale, br.y(), br.x() + br.width(), br.bottom()); painter->drawLine(l); } } - QPen pen = painter->pen(); - pen.setColor(Qt::white); - //pen.setStyle(Qt::DashDotDotLine); //Qt::DotLine); - // Draw effects names - QString effects = effectNames().join(" / "); - if (!effects.isEmpty()) { - painter->setPen(pen); - QFont font = painter->font(); - QFont smallFont = font; - smallFont.setPointSize(8); - painter->setFont(smallFont); - QRectF txtBounding = painter->boundingRect(br, Qt::AlignLeft | Qt::AlignTop, " " + effects + " "); - painter->fillRect(txtBounding, QBrush(QColor(0, 0, 0, 150))); - painter->drawText(txtBounding, Qt::AlignCenter, effects); - pen.setColor(Qt::black); - painter->setPen(pen); - painter->setFont(font); - } - - // For testing puspose only: draw transitions count - { - painter->setPen(pen); - QFont font = painter->font(); - QFont smallFont = font; - smallFont.setPointSize(8); - painter->setFont(smallFont); - QString txt = " Transitions: " + QString::number(m_transitionsList.count()) + " "; - QRectF txtBoundin = painter->boundingRect(br, Qt::AlignRight | Qt::AlignTop, txt); - painter->fillRect(txtBoundin, QBrush(QColor(0, 0, 0, 150))); - painter->drawText(txtBoundin, Qt::AlignCenter, txt); - pen.setColor(Qt::black); - painter->setPen(pen); - painter->setFont(font); + if (!m_effectNames.isEmpty() && br.width() > 30) { + QRectF txtBounding = painter->boundingRect(br, Qt::AlignLeft | Qt::AlignTop, m_effectNames); + txtBounding.setRight(txtBounding.right() + 15); + painter->setPen(Qt::white); + QBrush markerBrush(Qt::SolidPattern); + if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { + qreal value = m_timeLine->currentValue(); + txtBounding.setWidth(txtBounding.width() * value); + markerBrush.setColor(QColor(50 + 200 * (1.0 - value), 50, 50, 100 + 50 * value)); + } else markerBrush.setColor(QColor(50, 50, 50, 150)); + QPainterPath path; + path.addRoundedRect(txtBounding, 4, 4); + painter->fillPath(path/*.intersected(resultClipPath)*/, markerBrush); + painter->drawText(txtBounding, Qt::AlignCenter, m_effectNames); + painter->setPen(Qt::black); } // Draw clip name QRectF txtBounding = painter->boundingRect(br, Qt::AlignHCenter | Qt::AlignTop, " " + m_clipName + " "); - painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150))); + //painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150))); + painter->setPen(QColor(0, 0, 0, 180)); + painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); + txtBounding.translate(QPointF(1, 1)); + painter->setPen(QColor(255, 255, 255, 255)); painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); - // draw frame around clip - pen.setColor(Qt::red); - pen.setWidth(2); - if (isSelected()) painter->setPen(pen); + if (isSelected()) { + pen.setColor(Qt::red); + //pen.setWidth(2); + } else { + pen.setColor(Qt::black); + //pen.setWidth(1); + } + + + // draw effect or transition keyframes + if (br.width() > 20) drawKeyFrames(painter, option->exposedRect); + + // draw clip border painter->setClipRect(option->exposedRect); - painter->drawPath(resultClipPath.intersected(clippath)); - - //painter->fillRect(startpixel,0,startpixel+endpixel,(int)br.height(), QBrush(QColor(255,255,255,150))); - //painter->fillRect(QRect(br.x(), br.y(), roundingX, roundingY), QBrush(QColor(Qt::green))); - - /*QRectF recta(rect().x(), rect().y(), scale,rect().height()); - painter->drawRect(recta); - painter->drawLine(rect().x() + 1, rect().y(), rect().x() + 1, rect().y() + rect().height()); - painter->drawLine(rect().x() + rect().width(), rect().y(), rect().x() + rect().width(), rect().y() + rect().height()); - painter->setPen(QPen(Qt::black, 1.0)); - painter->drawLine(rect().x(), rect().y(), rect().x() + rect().width(), rect().y()); - painter->drawLine(rect().x(), rect().y() + rect().height(), rect().x() + rect().width(), rect().y() + rect().height());*/ - - //QGraphicsRectItem::paint(painter, option, widget); - //QPen pen(Qt::green, 1.0 / size.x() + 0.5); - //painter->setPen(pen); - //painter->drawLine(rect().x(), rect().y(), rect().x() + rect().width(), rect().y()); - //kDebug()<<"ITEM REPAINT RECT: "<drawText(rect(), Qt::AlignCenter, m_name); - // painter->drawRect(boundingRect()); - //painter->drawRoundRect(-10, -10, 20, 20); - if (m_hover) { + painter->setPen(pen); + //painter->setClipRect(option->exposedRect); + painter->drawPath(resultClipPath); + + if (m_hover && br.width() > 30) { + painter->setBrush(QColor(180, 180, 50, 180)); //gradient); + + // draw transitions handles + QPainterPath transitionHandle; + const int handle_size = 4; + transitionHandle.moveTo(0, 0); + transitionHandle.lineTo(handle_size, handle_size); + transitionHandle.lineTo(handle_size * 2, 0); + transitionHandle.lineTo(handle_size * 3, handle_size); + transitionHandle.lineTo(handle_size * 2, handle_size * 2); + transitionHandle.lineTo(handle_size * 3, handle_size * 3); + transitionHandle.lineTo(0, handle_size * 3); + transitionHandle.closeSubpath(); + int pointy = (int)(br.y() + br.height() / 2); + int pointx1 = (int)(br.x() + 10); + int pointx2 = (int)(br.x() + br.width() - (10 + handle_size * 3)); +#if 0 painter->setPen(QPen(Qt::black)); - painter->setBrush(QBrush(Qt::yellow)); - painter->drawEllipse((int)(br.x() + 10), (int)(br.y() + br.height() / 2 - 5) , 10, 10); - painter->drawEllipse((int)(br.x() + br.width() - 20), (int)(br.y() + br.height() / 2 - 5), 10, 10); + painter->setBrush(QBrush(QColor(50, 50, 0))); +#else + /*QRadialGradient gradient(pointx1 + 5, pointy + 5 , 5, 2, 2); + gradient.setColorAt(0.2, Qt::white); + gradient.setColorAt(0.8, Qt::yellow); + gradient.setColorAt(1, Qt::black);*/ + +#endif + painter->translate(pointx1, pointy); + painter->drawPath(transitionHandle); //Ellipse(0, 0 , 10, 10); + painter->translate(-pointx1, -pointy); + + /* QRadialGradient gradient1(pointx2 + 5, pointy + 5 , 5, 2, 2); + gradient1.setColorAt(0.2, Qt::white); + gradient1.setColorAt(0.8, Qt::yellow); + gradient1.setColorAt(1, Qt::black); + painter->setBrush(gradient1);*/ + painter->translate(pointx2, pointy); + QMatrix m; + m.scale(-1.0, 1.0); + //painter->setMatrix(m); + painter->drawPath(transitionHandle); // Ellipse(0, 0, 10, 10); + //painter->setMatrix(m); + painter->translate(- pointx2, -pointy); } } OPERATIONTYPE ClipItem::operationMode(QPointF pos, double scale) { - if (abs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && abs((int)(pos.y() - rect().y())) < 6) return FADEIN; - else if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART; - else if (abs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && abs((int)(pos.y() - rect().y())) < 6) return FADEOUT; - else if (abs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND; - else if (abs((int)(pos.x() - (rect().x() + 10))) < 6 && abs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONSTART; - else if (abs((int)(pos.x() - (rect().x() + rect().width() - 20))) < 6 && abs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONEND; - + if (isSelected()) { + m_editedKeyframe = mouseOverKeyFrames(pos); + if (m_editedKeyframe != -1) return KEYFRAME; + } + if (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) { + if (m_startFade == 0) setToolTip(i18n("Add audio fade")); + else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds())); + return FADEIN; + } else if (qAbs((int)(pos.x() - rect().x())) < 6) { + setToolTip(i18n("Crop from start: %1s", cropStart().seconds())); + return RESIZESTART; + } else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) { + if (m_endFade == 0) setToolTip(i18n("Add audio fade")); + else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_endFade, m_fps).seconds())); + return FADEOUT; + } else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) { + setToolTip(i18n("Clip duration: %1s", duration().seconds())); + return RESIZEEND; + } else if (qAbs((int)(pos.x() - (rect().x() + 16))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) { + setToolTip(i18n("Add transition")); + return TRANSITIONSTART; + } else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - 21))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) { + setToolTip(i18n("Add transition")); + return TRANSITIONEND; + } + setToolTip(QString()); return MOVE; } +QList ClipItem::snapMarkers() const { + QList < GenTime > snaps; + QList < GenTime > markers = baseClip()->snapMarkers(); + GenTime pos; + double framepos; + + for (int i = 0; i < markers.size(); i++) { + pos = markers.at(i) - cropStart(); + if (pos > GenTime()) { + if (pos > duration()) break; + else snaps.append(pos + startPos()); + } + } + return snaps; +} + void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, int startpixel, int endpixel) { int channels = 2; @@ -485,6 +627,13 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, //} } +uint ClipItem::fadeIn() const { + return m_startFade; +} + +uint ClipItem::fadeOut() const { + return m_endFade; +} void ClipItem::setFadeIn(int pos, double scale) { @@ -492,8 +641,7 @@ void ClipItem::setFadeIn(int pos, double scale) { if (pos < 0) pos = 0; if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps) / 2); m_startFade = pos; - if (oldIn > pos) update(rect().x(), rect().y(), oldIn * scale, rect().height()); - else update(rect().x(), rect().y(), pos * scale, rect().height()); + update(rect().x(), rect().y(), qMax(oldIn, pos) * scale, rect().height()); } void ClipItem::setFadeOut(int pos, double scale) { @@ -501,12 +649,10 @@ void ClipItem::setFadeOut(int pos, double scale) { if (pos < 0) pos = 0; if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps) / 2); m_endFade = pos; - if (oldOut > pos) update(rect().x() + rect().width() - pos * scale, rect().y(), pos * scale, rect().height()); - else update(rect().x() + rect().width() - oldOut * scale, rect().y(), oldOut * scale, rect().height()); + update(rect().x() + rect().width() - qMax(oldOut, pos) * scale, rect().y(), pos * scale, rect().height()); } - // virtual void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) { /*m_resizeMode = operationMode(event->pos()); @@ -526,70 +672,34 @@ void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) { //virtual void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *) { m_hover = true; - update(); + QRectF r = boundingRect(); + qreal width = qMin(25.0, r.width()); + update(r.x(), r.y(), width, r.height()); + update(r.right() - width, r.y(), width, r.height()); } //virtual void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) { m_hover = false; - update(); + QRectF r = boundingRect(); + qreal width = qMin(25.0, r.width()); + update(r.x(), r.y(), width, r.height()); + update(r.right() - width, r.y(), width, r.height()); } void ClipItem::resizeStart(int posx, double scale) { - GenTime durationDiff = GenTime(posx, m_fps) - m_startPos; - if (durationDiff == GenTime()) return; - //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff; - if (m_cropStart + durationDiff < GenTime()) { - durationDiff = GenTime() - m_cropStart; - } else if (durationDiff >= m_cropDuration) { - durationDiff = m_cropDuration - GenTime(3, m_fps); - } - m_startPos += durationDiff; - m_cropStart += durationDiff; - m_cropDuration = m_cropDuration - durationDiff; - setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height()); - QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisionList.size(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == 70000) { - GenTime diff = ((ClipItem *)item)->endPos() + GenTime(1, m_fps) - m_startPos; - setRect((m_startPos + diff).frames(m_fps) * scale, rect().y(), (m_cropDuration - diff).frames(m_fps) * scale, rect().height()); - m_startPos += diff; - m_cropStart += diff; - m_cropDuration = m_cropDuration - diff; - break; - } - } - if (m_hasThumbs) startThumbTimer->start(100); + AbstractClipItem::resizeStart(posx, scale); + if (m_hasThumbs && KdenliveSettings::videothumbnails()) startThumbTimer->start(100); } void ClipItem::resizeEnd(int posx, double scale) { - GenTime durationDiff = GenTime(posx, m_fps) - endPos(); - if (durationDiff == GenTime()) return; - //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff; - if (m_cropDuration + durationDiff <= GenTime()) { - durationDiff = GenTime() - (m_cropDuration - GenTime(3, m_fps)); - } else if (m_cropStart + m_cropDuration + durationDiff >= m_maxDuration) { - durationDiff = m_maxDuration - m_cropDuration - m_cropStart; - } - m_cropDuration += durationDiff; - setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height()); - QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); - for (int i = 0; i < collisionList.size(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == 70000) { - GenTime diff = ((ClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos(); - m_cropDuration = diff; - setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height()); - break; - } - } - if (m_hasThumbs) endThumbTimer->start(100); + AbstractClipItem::resizeEnd(posx, scale); + if (m_hasThumbs && KdenliveSettings::videothumbnails()) endThumbTimer->start(100); } // virtual -void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) { -} +/*void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) { +}*/ int ClipItem::effectsCounter() { return m_effectsCounter++; @@ -604,6 +714,7 @@ QStringList ClipItem::effectNames() { } QDomElement ClipItem::effectAt(int ix) { + if (ix > m_effectList.count() - 1 || ix < 0) return QDomElement(); return m_effectList.at(ix); } @@ -611,28 +722,62 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) { kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); m_effectList.insert(ix, effect); m_effectList.removeAt(ix + 1); - update(boundingRect()); + m_effectNames = m_effectList.effectNames().join(" / "); + if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fadeout") update(boundingRect()); + else { + QRectF r = boundingRect(); + r.setHeight(20); + update(r); + } } -QMap ClipItem::addEffect(QDomElement effect) { +QMap ClipItem::addEffect(QDomElement effect, bool animate) { QMap effectParams; + bool needRepaint = false; + /*QDomDocument doc; + doc.appendChild(doc.importNode(effect, true)); + kDebug() << "/////// CLIP ADD EFFECT: "<< doc.toString();*/ m_effectList.append(effect); effectParams["tag"] = effect.attribute("tag"); + QString effectId = effect.attribute("id"); + if (effectId.isEmpty()) effectId = effect.attribute("tag"); + effectParams["id"] = effectId; effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix"); QString state = effect.attribute("disabled"); if (!state.isEmpty()) effectParams["disabled"] = state; QDomNodeList params = effect.elementsByTagName("parameter"); + int fade = 0; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { - effectParams[e.attribute("name")] = e.attribute("value"); - } - if (!e.attribute("factor").isEmpty()) { - effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble()); + if (e.attribute("factor").isEmpty()) { + effectParams[e.attribute("name")] = e.attribute("value"); + // check if it is a fade effect + if (effectId == "fadein") { + needRepaint = true; + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + } else if (effectId == "fadeout") { + needRepaint = true; + if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + } + } else { + effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble()); + } } } - flashClip(); - update(boundingRect()); + m_effectNames = m_effectList.effectNames().join(" / "); + if (fade > 0) m_startFade = fade; + else if (fade < 0) m_endFade = -fade; + if (needRepaint) update(boundingRect()); + if (animate) { + flashClip(); + } else if (!needRepaint) { + QRectF r = boundingRect(); + r.setHeight(20); + update(r); + } return effectParams; } @@ -640,12 +785,22 @@ QMap ClipItem::getEffectArgs(QDomElement effect) { QMap effectParams; effectParams["tag"] = effect.attribute("tag"); effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix"); + effectParams["id"] = effect.attribute("id"); QString state = effect.attribute("disabled"); if (!state.isEmpty()) effectParams["disabled"] = state; QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (e.attribute("name").contains(";")) { + kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag"); + if (e.attribute("type") == "keyframe") { + kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE"; + effectParams["keyframes"] = e.attribute("keyframes"); + effectParams["max"] = e.attribute("max"); + effectParams["min"] = e.attribute("min"); + effectParams["factor"] = e.attribute("factor"); + effectParams["starttag"] = e.attribute("starttag", "start"); + effectParams["endtag"] = e.attribute("endtag", "end"); + } else if (e.attribute("namedesc").contains(";")) { QString format = e.attribute("format"); QStringList separators = format.split("%d", QString::SkipEmptyParts); QStringList values = e.attribute("value").split(QRegExp("[,:;x]")); @@ -658,26 +813,33 @@ QMap ClipItem::getEffectArgs(QDomElement effect) { txtNeu << (int)(values[i+1].toDouble()); } effectParams["start"] = neu; - } else - if (!e.isNull()) { - effectParams[e.attribute("name")] = e.attribute("value"); - } - if (!e.attribute("factor").isEmpty()) { - effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble()); + } else if (!e.isNull()) { + if (!e.attribute("factor").isEmpty()) + effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("value")].toDouble() / e.attribute("factor").toDouble()); + else effectParams[e.attribute("name")] = e.attribute("value"); } } return effectParams; } void ClipItem::deleteEffect(QString index) { + bool needRepaint = false; for (int i = 0; i < m_effectList.size(); ++i) { if (m_effectList.at(i).attribute("kdenlive_ix") == index) { + if (m_effectList.at(i).attribute("id") == "fadein") { + m_startFade = 0; + needRepaint = true; + } else if (m_effectList.at(i).attribute("id") == "fadeout") { + m_endFade = 0; + needRepaint = true; + } m_effectList.removeAt(i); break; } } + m_effectNames = m_effectList.effectNames().join(" / "); + if (needRepaint) update(boundingRect()); flashClip(); - update(boundingRect()); } //virtual @@ -687,7 +849,7 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { doc.setContent(effects, true); QDomElement e = doc.documentElement(); CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; - if (view) view->slotAddEffect(e, m_startPos, m_track); + if (view) view->slotAddEffect(e, m_startPos, track()); } //virtual @@ -698,7 +860,13 @@ void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) { void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) { Q_UNUSED(event); } - +void ClipItem::addTransition(Transition* t) { + m_transitionsList.append(t); + CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + QDomDocument doc; + QDomElement e = doc.documentElement(); + //if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track()); +} // virtual /* void CustomTrackView::mousePressEvent ( QMouseEvent * event )