#include <KDebug>
-#include <mlt++/Mlt.h>
-
#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, 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;
+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_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_cropDuration = m_maxDuration;
setAcceptDrops(true);
audioThumbReady = clip->audioThumbCreated();
/*
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;
//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);
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]);
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);
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));
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]"));
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
CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
QDomDocument doc;
QDomElement e = doc.documentElement();
- if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track());
+ //if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track());
}
// virtual
/*
projects / kdenlive / blobdiff