#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;
- m_fps = fps;
- m_startPos = startpos;
- m_track = track;
- m_xml = clip->toXML();
+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) {
+ 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);
+
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();
/*
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)));
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()));
}
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));
}
QDomElement ClipItem::xml() const {
- return m_xml;
+ return m_clip->toXML();
}
int ClipItem::clipType() {
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;
+ //m_opacity = value;
update();
}
QWidget *widget) {
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);
//painter->setRenderHints(QPainter::Antialiasing);
QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br);
-
painter->setClipRect(option->exposedRect);
// build path around clip
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);
+
+
// draw start / end fades
QBrush fades;
}
}
- 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()) {
+ 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, 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
if (isSelected()) {
pen.setColor(Qt::red);
- pen.setWidth(2);
+ //pen.setWidth(2);
} else {
pen.setColor(Qt::black);
- pen.setWidth(1);
+ //pen.setWidth(1);
}
painter->setPen(pen);
painter->setClipRect(option->exposedRect);
// painter->drawRect(boundingRect());
//painter->drawRoundRect(-10, -10, 20, 20);
if (m_hover) {
+ 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);*/
+ QMatrix m;
+ m.scale(-1.0, 1.0);
+ painter->setMatrix(m);
+ painter->translate(-pointx2 - handle_size * 3, pointy);
+ painter->drawPath(transitionHandle); // Ellipse(0, 0, 10, 10);
+ 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 (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEIN;
+ else if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+ else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEOUT;
+ else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
+ else if (qAbs((int)(pos.x() - (rect().x() + 16))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) 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) return TRANSITIONEND;
return MOVE;
}
+QList <GenTime> ClipItem::snapMarkers() {
+ 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;
//}
}
+uint ClipItem::fadeIn() const {
+ return m_startFade;
+}
+
+uint ClipItem::fadeOut() const {
+ return m_endFade;
+}
void ClipItem::setFadeIn(int pos, double scale) {
}
-
// virtual
void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) {
/*m_resizeMode = operationMode(event->pos());
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);
+ m_effectNames = m_effectList.effectNames().join(" / ");
update(boundingRect());
}
-QMap <QString, QString> ClipItem::addEffect(QDomElement effect) {
+QMap <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
QMap <QString, QString> effectParams;
+ /*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") {
+ 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") {
+ 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();
+ m_effectNames = m_effectList.effectNames().join(" / ");
+ if (fade > 0) m_startFade = fade;
+ else if (fade < 0) m_endFade = -fade;
+ if (animate) {
+ flashClip();
+ }
update(boundingRect());
return effectParams;
}
QMap <QString, QString> 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");
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("name")].toDouble() / e.attribute("factor").toDouble());
+ else effectParams[e.attribute("name")] = e.attribute("value");
}
}
return effectParams;
void ClipItem::deleteEffect(QString index) {
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;
+ else if (m_effectList.at(i).attribute("id") == "fadeout") m_endFade = 0;
m_effectList.removeAt(i);
break;
}
}
+ m_effectNames = m_effectList.effectNames().join(" / ");
flashClip();
update(boundingRect());
}
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