X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=21d24e3d80922a87c59105301d094949796380f6;hb=83a64649db3395ff9ee7230ef46f9b7ca6b1576f;hp=f9c4b5f30dcf9dd5e29d76c0c8c687d80274e87d;hpb=bd476be3206ca304135158b12b90a2a64af638c2;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index f9c4b5f3..21d24e3d 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -30,26 +30,28 @@ #include -#include - #include "clipitem.h" #include "customtrackview.h" #include "renderer.h" +#include "docclipbase.h" +#include "transition.h" #include "events.h" #include "kdenlivesettings.h" - -ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF & rect, GenTime duration, double fps) - : QGraphicsRectItem(rect), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_track(track), m_startPos(startpos), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_startFade(0), m_endFade(0), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_fps(fps), m_hover(false) { - //setToolTip(name); - // kDebug() << "******* CREATING NEW TML CLIP, DUR: " << duration; +#include "kthumb.h" + +ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double scale, double fps) + : AbstractClipItem(info, QRectF()), 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) { + 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); + kDebug() << "///// NEW CLIP RECT: " << rect; + m_fps = fps; 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_maxDuration = m_cropDuration; setAcceptDrops(true); audioThumbReady = clip->audioThumbCreated(); /* @@ -85,9 +87,10 @@ ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF QString colour = m_xml.attribute("colour"); colour = colour.replace(0, 2, "#"); setBrush(QColor(colour.left(7))); - } else if (m_clipType == IMAGE) { + } else if (m_clipType == IMAGE || m_clipType == TEXT) { m_maxDuration = GenTime(10000, m_fps); m_startPix = KThumb::getImage(KUrl(m_xml.attribute("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50); + m_endPix = m_startPix; } else if (m_clipType == AUDIO) { connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } @@ -99,6 +102,11 @@ ClipItem::~ClipItem() { if (endThumbTimer) delete endThumbTimer; } +void ClipItem::resetThumbs() { + slotFetchThumbs(); + audioThumbCachePic.clear(); +} + void ClipItem::slotFetchThumbs() { m_thumbsRequested += 2; emit getThumb((int)m_cropStart.frames(m_fps), (int)(m_cropStart + m_cropDuration).frames(m_fps)); @@ -128,7 +136,7 @@ void ClipItem::slotGotAudioData() { } int ClipItem::type() const { - return 70000; + return AVWIDGET; } DocClipBase *ClipItem::baseClip() { @@ -151,30 +159,6 @@ int ClipItem::clipProducer() { return m_producer; } -GenTime ClipItem::maxDuration() const { - return m_maxDuration; -} - -GenTime ClipItem::duration() const { - return m_cropDuration; -} - -GenTime ClipItem::startPos() const { - return m_startPos; -} - -GenTime ClipItem::cropStart() const { - return m_cropStart; -} - -GenTime ClipItem::endPos() const { - return m_startPos + m_cropDuration; -} - -double ClipItem::fps() const { - return m_fps; -} - void ClipItem::flashClip() { if (m_timeLine == 0) { m_timeLine = new QTimeLine(750, this); @@ -198,13 +182,8 @@ void ClipItem::paint(QPainter *painter, 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(); - } + QRect rectInView = visibleRect();//this is the rect that is visible by the user + if (rectInView.isNull()) return; QPainterPath clippath; @@ -220,65 +199,14 @@ void ClipItem::paint(QPainter *painter, //painter->setRenderHints(QPainter::Antialiasing); - QPainterPath roundRectPathUpper, roundRectPathLower; - double roundingY = 20; - double roundingX = 20; - double offset = 1; - 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; - } + QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br); - // draw transitions - QList transitionPath; - foreach(Transition transition, m_transitionsList) { - QPainterPath t; - //t.addRect(br_startx,br.y()+br.height()/2,br.x() + /*t->transitionDuration().frames(m_fps) *pixelForOneFrame*/5 ,br.y()+br.height()*2); - int twidth = br_startx + transition.transitionDuration().frames(m_fps) * scale; - t.moveTo(twidth , br_endy); - t.lineTo(twidth , br_halfy + roundingY); - - t.arcTo(twidth - roundingX , br_halfy , roundingX, roundingY, 0.0, 90.0); - t.lineTo(br_startx + roundingX , br_halfy); - t.arcTo(br_startx , br_halfy, roundingX , roundingY, 90.0, 90.0); - t.lineTo(br_startx , br_endy); - //t.closeSubpath(); - transitionPath.append(t); - } + painter->setClipRect(option->exposedRect); // 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); - foreach(QPainterPath p, transitionPath) { - resultClipPath = resultClipPath.united(p); - } + painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip); //painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red))); painter->fillRect(br.intersected(rectInView), paintColor); @@ -311,7 +239,7 @@ void ClipItem::paint(QPainter *painter, 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]); @@ -327,8 +255,8 @@ 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.y() + br.height()); fadeInPath.lineTo(br.x() + m_startFade * scale, br.y()); fadeInPath.closeSubpath(); painter->fillPath(fadeInPath, fades); @@ -392,16 +320,16 @@ void ClipItem::paint(QPainter *painter, 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); + } + painter->setPen(pen); painter->setClipRect(option->exposedRect); painter->drawPath(resultClipPath.intersected(clippath)); - foreach(QPainterPath p, transitionPath) { - - painter->fillPath(p, QBrush(QColor(255, 255, 0, 100))); - painter->drawPath(p); - } //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))); @@ -423,10 +351,28 @@ void ClipItem::paint(QPainter *painter, // painter->drawRect(boundingRect()); //painter->drawRoundRect(-10, -10, 20, 20); if (m_hover) { + int pointy = (int)(br.y() + br.height() / 2 - 5); + int pointx1 = (int)(br.x() + 10); + int pointx2 = (int)(br.x() + br.width() - 20); +#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); + painter->setBrush(gradient); +#endif + painter->drawEllipse(pointx1, pointy , 10, 10); + + 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->drawEllipse(pointx2, pointy, 10, 10); + } } @@ -438,6 +384,7 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos, double scale) { 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; + return MOVE; } @@ -521,13 +468,7 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, //} } -int ClipItem::fadeIn() const { - return m_startFade; -} -int ClipItem::fadeOut() const { - return m_endFade; -} void ClipItem::setFadeIn(int pos, double scale) { int oldIn = m_startFade; @@ -577,95 +518,13 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) { update(); } -void ClipItem::moveTo(int x, double scale, double offset, int newTrack) { - double origX = rect().x(); - double origY = rect().y(); - bool success = true; - if (x < 0) return; - setRect(x * scale, origY + offset, rect().width(), rect().height()); - QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); - if (collisionList.size() == 0) m_track = newTrack; - for (int i = 0; i < collisionList.size(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == 70000) { - if (offset == 0) { - QRectF other = ((QGraphicsRectItem *)item)->rect(); - if (x < m_startPos.frames(m_fps)) { - kDebug() << "COLLISION, MOVING TO------"; - m_startPos = ((ClipItem *)item)->endPos() + GenTime(1, m_fps); - origX = m_startPos.frames(m_fps) * scale; - } else { - kDebug() << "COLLISION, MOVING TO+++"; - m_startPos = ((ClipItem *)item)->startPos() - m_cropDuration; - origX = m_startPos.frames(m_fps) * scale; - } - } - setRect(origX, origY, rect().width(), rect().height()); - offset = 0; - origX = rect().x(); - success = false; - break; - } - } - if (success) { - m_track = newTrack; - m_startPos = GenTime(x, m_fps); - } - /* QList childrenList = QGraphicsItem::children(); - for (int i = 0; i < childrenList.size(); ++i) { - childrenList.at(i)->moveBy(rect().x() - origX , offset); - }*/ -} - 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; - } - } + AbstractClipItem::resizeStart(posx, scale); if (m_hasThumbs) 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; - } - } + AbstractClipItem::resizeEnd(posx, scale); if (m_hasThumbs) endThumbTimer->start(100); } @@ -673,14 +532,6 @@ void ClipItem::resizeEnd(int posx, double scale) { void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) { } -int ClipItem::track() const { - return m_track; -} - -void ClipItem::setTrack(int track) { - m_track = track; -} - int ClipItem::effectsCounter() { return m_effectsCounter++; } @@ -735,7 +586,7 @@ QMap ClipItem::getEffectArgs(QDomElement effect) { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (e.attribute("name").contains(";")) { + 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]")); @@ -770,11 +621,6 @@ void ClipItem::deleteEffect(QString index) { update(boundingRect()); } -void ClipItem::addTransition(Transition tr) { - m_transitionsList.append(tr); - update(); -} - //virtual void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); @@ -782,7 +628,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 @@ -793,7 +639,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 )