#include <QGraphicsItem>
#include <QDomDocument>
#include <QScrollBar>
+#include <QApplication>
+#include <QInputDialog>
#include <KDebug>
#include <KLocale>
#include <KUrl>
+#include <KIcon>
#include <KCursor>
#include "customtrackview.h"
#include "addtimelineclipcommand.h"
#include "addeffectcommand.h"
#include "editeffectcommand.h"
+#include "moveeffectcommand.h"
#include "addtransitioncommand.h"
#include "edittransitioncommand.h"
+#include "addmarkercommand.h"
+#include "razorclipcommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
#include "clipitem.h"
// const int duration = animate ? 1500 : 1;
CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent)
- : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_startPos(QPointF()), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()) {
+ : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
m_cursorLine->setZValue(1000);
}
+
+ KIcon razorIcon("edit-cut");
+ m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
}
void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
int CustomTrackView::getPreviousVideoTrack(int track) {
track = m_tracksList.count() - track - 1;
- int videoTracksCount = 0;
track --;
for (int i = track; i > -1; i--) {
if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1;
setDragMode(QGraphicsView::RubberBandDrag);
else*/
{
-
- if (m_dragItem) { //event->button() == Qt::LeftButton) {
+ if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) {
// a button was pressed, delete visual tips
- if (m_operationMode == MOVE) {
+ if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x());
//kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_tracksHeight - m_clickPoint.y() : 0))).y() / m_tracksHeight;
+ int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ?/* m_tracksHeight*/ - m_clickPoint.y() : 0))).y() / m_tracksHeight;
int currentTrack = m_dragItem->track();
- if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
+ if (moveTrack > 1000)moveTrack = 0;
+ else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
else if (moveTrack < 0) moveTrack = 0;
int offset = moveTrack - currentTrack;
break;
}
}
+ if (m_tool == RAZORTOOL) {
+ setCursor(m_razorCursor);
+ QGraphicsView::mouseMoveEvent(event);
+ return;
+ }
+
if (item && event->buttons() == Qt::NoButton) {
AbstractClipItem *clip = (AbstractClipItem*) item;
OPERATIONTYPE opMode = opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
// virtual
void CustomTrackView::mousePressEvent(QMouseEvent * event) {
activateMonitor();
- int pos = event->x();
+ m_clickEvent = event->pos();
if (event->modifiers() == Qt::ControlModifier) {
setDragMode(QGraphicsView::ScrollHandDrag);
QGraphicsView::mousePressEvent(event);
return;
} else {
bool collision = false;
+ m_dragItem = NULL;
QList<QGraphicsItem *> collisionList = items(event->pos());
- AbstractClipItem *clipItem = NULL, *transitionItem = NULL;
for (int i = 0; i < collisionList.size(); ++i) {
QGraphicsItem *item = collisionList.at(i);
if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
+ if (m_tool == RAZORTOOL) {
+ if (item->type() == TRANSITIONWIDGET) return;
+ AbstractClipItem *clip = (AbstractClipItem *) item;
+ ItemInfo info;
+ info.startPos = clip->startPos();
+ info.endPos = clip->endPos();
+ info.track = clip->track();
+ RazorClipCommand* command = new RazorClipCommand(this, info, GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()), true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+ return;
+ }
// select item
if (!item->isSelected()) {
-
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++)
+ itemList.at(i)->setSelected(false);
item->setSelected(true);
update();
}
m_dragItem = (AbstractClipItem *) item;
- if (item->type() == AVWIDGET) {
- clipItem = m_dragItem;
- } else if (item->type() == TRANSITIONWIDGET) {
- transitionItem = m_dragItem;
- }
+
m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top()));
+ m_dragItemInfo.startPos = m_dragItem->startPos();
+ m_dragItemInfo.endPos = m_dragItem->endPos();
+ m_dragItemInfo.track = m_dragItem->track();
+
m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
- if (m_operationMode == MOVE || m_operationMode == RESIZESTART)
- m_startPos = QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track());
- else if (m_operationMode == RESIZEEND)
- m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track());
- else if (m_operationMode == TRANSITIONSTART) {
- Transition *tr = new Transition(
- QRect((int)(m_dragItem->startPos().frames(m_document->fps()) *m_scale) , (int)(m_dragItem->rect().y() + m_dragItem->rect().height() / 2),
- (int)(GenTime(2.5).frames(m_document->fps()) *m_scale) , (int)(m_dragItem->rect().height())
- ),
- (ClipItem*)m_dragItem, "luma" , m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5), m_document->fps());
- tr->setTrack(m_dragItem->track());
- scene()->addItem(tr);
- //m_dragItem->addTransition(tra);
+ if (m_operationMode == TRANSITIONSTART) {
+ ItemInfo info;
+ info.startPos = m_dragItem->startPos();
+ info.endPos = info.startPos + GenTime(2.5);
+ info.track = m_dragItem->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+ }
+ if (m_operationMode == TRANSITIONEND) {
+ ItemInfo info;
+ info.endPos = m_dragItem->endPos();
+ info.startPos = info.endPos - GenTime(2.5);
+ info.track = m_dragItem->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
}
updateSnapPoints(m_dragItem);
- kDebug() << "//////// ITEM CLICKED: " << m_startPos;
collision = true;
break;
}
}
- emit clipItemSelected((ClipItem*) clipItem);
- emit transitionItemSelected((Transition*) transitionItem);
+ emit clipItemSelected((m_dragItem && m_dragItem->type() == AVWIDGET) ? (ClipItem*) m_dragItem : NULL);
+
if (!collision) {
kDebug() << "//////// NO ITEM FOUND ON CLICK";
m_dragItem = NULL;
} else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale));
} else if (event->button() == Qt::RightButton) {
m_operationMode = NONE;
- displayContextMenu(event->globalPos(), (ClipItem *) m_dragItem);
+ displayContextMenu(event->globalPos(), m_dragItem);
m_dragItem = NULL;
}
}
//QGraphicsView::mousePressEvent(event);
}
-void CustomTrackView::displayContextMenu(QPoint pos, ClipItem *clip) {
- m_timelineContextClipMenu->popup(pos);
+void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
+ if (clip == NULL) m_timelineContextMenu->popup(pos);
+ else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
+ else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
}
void CustomTrackView::activateMonitor() {
}
void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) {
- QList<QGraphicsItem *> itemList;
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
if (track == -1)
itemList = items();
else {
}
kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
- if (effectParams["disabled"] == "1") {
- QString index = effectParams["kdenlive_ix"];
+ if (effectParams.value("disabled") == "1") {
+ QString index = effectParams.value("kdenlive_ix");
m_document->renderer()->mltRemoveEffect(track, pos, index);
} else m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams);
}
m_document->setModified(true);
}
+void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) {
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ if (clip) {
+ m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ }
+ m_document->setModified(true);
+}
+
void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable) {
QDomElement oldEffect = effect.cloneNode().toElement();
effect.setAttribute("disabled", disable);
m_document->setModified(true);
}
+void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) {
+ MoveEffectCommand *command = new MoveEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), currentPos, newPos, true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+}
+
void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) {
EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true);
m_commandStack->push(command);
}
-void CustomTrackView::slotAddTransition(ClipItem* clip , QDomElement transition, GenTime startTime , int startTrack) {
- AddTransitionCommand* command = new AddTransitionCommand(this, startTrack, transition, startTime, true);
+void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) {
+ if (cut) {
+ // cut clip
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ int cutPos = (int) cutTime.frames(m_document->fps());
+ ItemInfo newPos;
+ newPos.startPos = cutTime;
+ newPos.endPos = info.endPos;
+ newPos.track = info.track;
+ ClipItem *dup = new ClipItem(item->baseClip(), newPos, item->cropStart(), m_scale, m_document->fps());
+ dup->setCropStart(dup->cropStart() + (cutTime - info.startPos));
+ item->resizeEnd(cutPos, m_scale);
+ scene()->addItem(dup);
+ m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime);
+ } else {
+ // uncut clip
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track);
+ delete dup;
+ item->resizeEnd((int) info.endPos.frames(m_document->fps()), m_scale);
+ m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, cutTime);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - info.track, info.startPos, item->cropStart(), item->cropStart() + info.endPos - info.startPos);
+ }
+}
+
+void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
+ AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true);
m_commandStack->push(command);
m_document->setModified(true);
}
-void CustomTrackView::addTransition(int startTrack, GenTime startPos , QDomElement e) {
-
- kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
- m_document->renderer()->mltAddTransition(e.attribute("tag"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
- GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()),
- GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()),
- e);
+void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
+ Transition *tr = new Transition(transitionInfo, endTrack, m_scale, m_document->fps(), params);
+ scene()->addItem(tr);
+ //kDebug() << "---- ADDING transition " << e.attribute("tag") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
m_document->setModified(true);
}
-void CustomTrackView::deleteTransition(int, GenTime, QDomElement e) {
- QMap < QString, QString> map;
- QDomNamedNodeMap attribs = e.attributes();
- m_document->renderer()->mltDeleteTransition(e.attribute("tag"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
- GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()),
- GenTime(e.attribute("end").toInt(), m_document->renderer()->fps()),
- e);
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
+ Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track);
+ m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
+ delete item;
m_document->setModified(true);
}
-void CustomTrackView::slotTransitionUpdated(QDomElement old, QDomElement newEffect) {
- EditTransitionCommand *command = new EditTransitionCommand(this, newEffect.attribute("a_track").toInt(), GenTime(newEffect.attribute("start").toInt(), m_document->renderer()->fps()) , old, newEffect , true);
+void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML() , true);
m_commandStack->push(command);
m_document->setModified(true);
}
void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) {
-
- m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), m_tracksList.count() - 1 - transition.attribute("transition_track").toInt(), m_tracksList.count() - transition.attribute("transition_track").toInt() ,
- GenTime(transition.attribute("start").toInt(), m_document->renderer()->fps()),
- GenTime(transition.attribute("end").toInt(), m_document->renderer()->fps()),
- transition);
+ Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track);
+ if (!item) {
+ kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
+ return;
+ }
+ m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_tracksList.count() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
repaint();
m_document->setModified(true);
}
void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) {
- int in = 0;
- GenTime out = clip->duration();
- //kdDebug()<<"- - - -CREATING CLIP, duration = "<<out<<", URL: "<<clip->fileURL();
- int trackTop = (int)(mapToScene(pos).y() / m_tracksHeight) * m_tracksHeight + 1;
- m_dropItem = new ClipItem(clip, (int)(mapToScene(pos).y() / m_tracksHeight), GenTime(), QRectF(mapToScene(pos).x() * m_scale, trackTop, out.frames(m_document->fps()) * m_scale, m_tracksHeight - 1), out, m_document->fps());
+ ItemInfo info;
+ info.startPos = GenTime((int)(mapToScene(pos).x() / m_scale), m_document->fps());
+ info.endPos = info.startPos + clip->duration();
+ info.track = (int)(pos.y() / m_tracksHeight);
+ //kDebug()<<"------------ ADDING CLIP ITEM----: "<<info.startPos.frames(25)<<", "<<info.endPos.frames(25)<<", "<<info.track;
+ m_dropItem = new ClipItem(clip, info, GenTime(), m_scale, m_document->fps());
scene()->addItem(m_dropItem);
}
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
- //kDebug()<<"+++++++++++++ DRAG MOVE, : "<<mapToScene(event->pos()).x()<<", SCAL: "<<m_scale;
+ kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale;
if (m_dropItem) {
- int track = (int)(event->pos().y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
+ int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track);
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
void CustomTrackView::dropEvent(QDropEvent * event) {
if (m_dropItem) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->track(), m_dropItem->startPos(), m_dropItem->rect(), m_dropItem->duration(), false, false);
+ ItemInfo info;
+ info.startPos = m_dropItem->startPos();
+ info.endPos = m_dropItem->endPos();
+ info.track = m_dropItem->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), info, false, false);
m_commandStack->push(command);
m_dropItem->baseClip()->addReference();
m_document->updateClip(m_dropItem->baseClip()->getId());
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->track(), item->startPos(), item->rect(), item->duration(), true, true);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true);
m_commandStack->push(command);
//delete item;
}
return (int)(m_cursorPos * m_scale);
}
+void CustomTrackView::moveCursorPos(int delta) {
+ emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale));
+ m_cursorPos += delta;
+ m_cursorLine->setPos(m_cursorPos * m_scale, 0);
+ m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps()));
+ //if (m_autoScroll && m_scale < 50) checkScrolling();
+}
+
void CustomTrackView::checkScrolling() {
QRect rectInView = viewport()->rect();
int delta = rectInView.width() / 3;
QGraphicsView::mouseReleaseEvent(event);
setDragMode(QGraphicsView::NoDrag);
if (m_dragItem == NULL) return;
- if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor);
- if (m_operationMode == MOVE) {// && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
+ ItemInfo info;
+ info.startPos = m_dragItem->startPos();
+ info.endPos = m_dragItem->endPos();
+ info.track = m_dragItem->track();
+
+ if (m_operationMode == MOVE) {
+ setCursor(Qt::OpenHandCursor);
// move clip
- if (m_dragItem->type() == AVWIDGET) {
- MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false);
+ if (m_dragItem->type() == AVWIDGET && m_dragItemInfo.startPos != info.startPos) {
+ MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
- m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_startPos.y()), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_startPos.x(), (int)(m_dragItem->startPos().frames(m_document->fps())));
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
}
- if (m_dragItem->type() == TRANSITIONWIDGET) {
- Transition* transition = (Transition*)m_dragItem;
- GenTime oldin = transition->transitionStartTime();
- GenTime oldout = transition->transitionEndTime();
- GenTime newin = m_dragItem->startPos();
- GenTime newout = newin + (oldout - oldin);
- transition->moveTransition(newin - oldin);
- MoveTransitionCommand *command = new MoveTransitionCommand(this, QPointF(oldin.frames(m_document->fps()), oldout.frames(m_document->fps())), QPointF(newin.frames(m_document->fps()), newout.frames(m_document->fps())), (int) m_startPos.y(), (int)(m_dragItem->track()), false);
+ if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
//kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
- m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_startPos.y()), (int)(m_startPos.y() - m_dragItem->track()), oldin, oldout, newin, newout);
+ Transition *transition = (Transition *) m_dragItem;
+ transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
} else if (m_operationMode == RESIZESTART) {
// resize start
- ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false);
+ if (m_dragItem->type() == AVWIDGET) {
+ m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ } else if (m_dragItem->type() == TRANSITIONWIDGET) {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ Transition *transition = (Transition *) m_dragItem;
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
- if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime((int)m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
- m_commandStack->push(command);
- m_document->renderer()->doRefresh();
+ //m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND) {
// resize end
- ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false);
+ if (m_dragItem->type() == AVWIDGET) {
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ m_commandStack->push(command);
+ } else if (m_dragItem->type() == TRANSITIONWIDGET) {
- if (m_dragItem->type() == AVWIDGET) m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
- m_commandStack->push(command);
- m_document->renderer()->doRefresh();
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ Transition *transition = (Transition *) m_dragItem;
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
+ //m_document->renderer()->doRefresh();
}
+ emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
m_document->setModified(true);
m_operationMode = NONE;
m_dragItem = NULL;
}
-void CustomTrackView::deleteClip(int track, GenTime startpos, const QRectF &rect) {
- ClipItem *item = getClipItemAt(startpos, track);
+void CustomTrackView::deleteClip(ItemInfo info) {
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to move at: " << rect.x();
+ kDebug() << "---------------- ERROR, CANNOT find clip to move at...";// << rect.x();
return;
}
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
delete item;
- m_document->renderer()->mltRemoveClip(m_tracksList.count() - track, startpos);
+ m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos);
m_document->renderer()->doRefresh();
}
void CustomTrackView::deleteSelectedClips() {
- QList<QGraphicsItem *> itemList = items();
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *) itemList.at(i);
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->track(), item->startPos(), item->rect(), item->duration(), true, true);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true);
+ m_commandStack->push(command);
+ } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *item = (Transition *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTransitionCommand *command = new AddTransitionCommand(this, info, item->transitionEndTrack(), QDomElement(), true, true);
m_commandStack->push(command);
}
}
}
-void CustomTrackView::addClip(QDomElement xml, int clipId, int track, GenTime startpos, const QRectF &rect, GenTime duration) {
- QRect r((int)(startpos.frames(m_document->fps()) * m_scale), m_tracksHeight * track, (int)(duration.frames(m_document->fps()) * m_scale), m_tracksHeight - 1);
+void CustomTrackView::cutSelectedClips() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ if (currentPos > info.startPos && currentPos < info.endPos) {
+ info.track = item->track();
+ RazorClipCommand *command = new RazorClipCommand(this, info, currentPos, true);
+ m_commandStack->push(command);
+ }
+ }
+ }
+}
+
+void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
- ClipItem *item = new ClipItem(baseclip, track, startpos, r, duration, m_document->fps());
+ int crop = xml.attribute("in").toInt();
+ ClipItem *item = new ClipItem(baseclip, info, GenTime(crop, m_document->fps()), m_scale, m_document->fps());
scene()->addItem(item);
baseclip->addReference();
m_document->updateClip(baseclip->getId());
- m_document->renderer()->mltInsertClip(m_tracksList.count() - track, startpos, xml);
+ m_document->renderer()->mltInsertClip(m_tracksList.count() - info.track, info.startPos, xml);
m_document->renderer()->doRefresh();
}
+void CustomTrackView::slotUpdateClip(int clipId) {
+ QList<QGraphicsItem *> list = scene()->items();
+ ClipItem *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == AVWIDGET) {
+ clip = static_cast <ClipItem *>(list.at(i));
+ if (clip->clipProducer() == clipId) {
+ clip->refreshClip();
+ m_document->renderer()->mltUpdateClip(m_tracksList.count() - clip->track(), clip->startPos(), clip->xml());
+ }
+ }
+ }
+}
+
ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
ClipItem *clip = NULL;
return getTransitionItemAt(framepos, track);
}
-void CustomTrackView::moveClip(const QPointF &startPos, const QPointF &endPos) {
- ClipItem *item = getClipItemAt((int)startPos.x() + 1, (int)startPos.y());
+void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
+ ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
+ kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
- kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y();
- item->moveTo((int)endPos.x(), m_scale, (int)((endPos.y() - startPos.y()) * m_tracksHeight), (int)endPos.y());
- m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - startPos.y()), (int)(m_tracksList.count() - endPos.y()), (int) startPos.x(), (int)endPos.x());
+ //kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y();
+ item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track);
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - start.track), (int)(m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()));
}
-void CustomTrackView::moveTransition(const QPointF &startPos, const QPointF &endPos, int oldtrack, int newtrack) {
- Transition *item = getTransitionItemAt((int)startPos.x() + 1, oldtrack);
+void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
+ Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find transition to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
+ kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
- kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
- item->moveTo((int)endPos.x(), m_scale, (newtrack - oldtrack) * m_tracksHeight, newtrack);
+ //kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
+
+ //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")";
+ if (end.endPos - end.startPos == start.endPos - start.startPos) {
+ // Transition was moved
+ item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (end.track - start.track) * m_tracksHeight, end.track);
+ } else if (end.endPos == start.endPos) {
+ // Transition start resize
+ item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
+ } else {
+ // Transition end resize;
+ item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
+ }
//item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
- m_document->renderer()->mltMoveTransition(item->transitionName(), m_tracksList.count() - oldtrack, oldtrack - newtrack, GenTime((int) startPos.x(), m_document->fps()), GenTime((int) startPos.y(), m_document->fps()), GenTime((int) endPos.x(), m_document->fps()), GenTime((int) endPos.y(), m_document->fps()));
+ item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
+ m_document->renderer()->mltMoveTransition(item->transitionTag(), m_tracksList.count() - start.track, m_tracksList.count() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
}
-void CustomTrackView::resizeClip(const QPointF &startPos, const QPointF &endPos, bool resizeClipStart) {
+void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
int offset;
+ bool resizeClipStart = true;
+ if (start.startPos == end.startPos) resizeClipStart = false;
if (resizeClipStart) offset = 1;
else offset = -1;
- ClipItem *item = getClipItemAt((int)(startPos.x() + offset), (int) startPos.y());
+ ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to resize at: " << startPos;
+ kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
}
- qreal diff = endPos.x() - startPos.x();
if (resizeClipStart) {
- m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), GenTime((int)endPos.x(), m_document->fps()), item->startPos(), item->cropStart() + GenTime((int)diff, m_document->fps()), item->cropStart() + GenTime((int)diff, m_document->fps()) + item->endPos() - GenTime((int)endPos.x(), m_document->fps()));
- item->resizeStart((int)endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), end.startPos, item->startPos(), item->cropStart() + end.startPos - start.startPos, item->cropStart() + end.startPos - start.startPos + item->endPos() - end.startPos);
+ item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
} else {
- m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + GenTime((int)endPos.x(), m_document->fps()) - item->startPos());
- item->resizeEnd((int)endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos());
+ item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale);
}
m_document->renderer()->doRefresh();
}
GenTime end = item->endPos();
m_snapPoints.append(start);
m_snapPoints.append(end);
+ QList < GenTime > markers = item->snapMarkers();
+ for (int i = 0; i < markers.size(); ++i) {
+ GenTime t = markers.at(i);
+ m_snapPoints.append(t);
+ if (t > offset) m_snapPoints.append(t - offset);
+ }
if (offset != GenTime()) {
if (start > offset) m_snapPoints.append(start - offset);
if (end > offset) m_snapPoints.append(end - offset);
}
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *transition = static_cast <Transition*>(itemList.at(i));
- GenTime start = transition->transitionStartTime();
- GenTime end = transition->transitionEndTime();
+ GenTime start = transition->startPos();
+ GenTime end = transition->endPos();
m_snapPoints.append(start);
m_snapPoints.append(end);
if (offset != GenTime()) {
// kDebug() << "SNAP POINT: " << m_snapPoints.at(i).frames(25);
}
+void CustomTrackView::slotSeekToPreviousSnap() {
+ updateSnapPoints(NULL);
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ GenTime res = GenTime();
+ for (int i = 0; i < m_snapPoints.size(); ++i) {
+ if (m_snapPoints.at(i) >= pos) {
+ if (i == 0) i = 1;
+ res = m_snapPoints.at(i - 1);
+ break;
+ }
+ }
+ setCursorPos((int) res.frames(m_document->fps()));
+}
+
+void CustomTrackView::slotSeekToNextSnap() {
+ updateSnapPoints(NULL);
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ GenTime res = GenTime(m_projectDuration, m_document->fps());
+ for (int i = 0; i < m_snapPoints.size(); ++i) {
+ if (m_snapPoints.at(i) > pos) {
+ res = m_snapPoints.at(i);
+ break;
+ }
+ }
+ setCursorPos((int) res.frames(m_document->fps()));
+}
+
+void CustomTrackView::slotAddClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT ADD MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ QString comment = QInputDialog::getText(this, i18n("Add Marker"), i18n("Enter text for marker on clip <b>%1</b>", clip->clipName()), QLineEdit::Normal, i18n("marker"));
+ if (comment.isEmpty()) return;
+ AddMarkerCommand *command = new AddMarkerCommand(this, QString(), comment, id, position, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotDeleteClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ QString comment = clip->baseClip()->markerComment(position);
+ if (comment.isEmpty()) return;
+ AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotEditClipMarker() {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ if (itemList.count() != 1) {
+ kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
+ return;
+ }
+ AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
+ if (item->type() != AVWIDGET) return;
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ if (item->startPos() > pos || item->endPos() < pos) return;
+ ClipItem *clip = (ClipItem *) item;
+ int id = clip->baseClip()->getId();
+ GenTime position = pos - item->startPos() + item->cropStart();
+ QString oldcomment = clip->baseClip()->markerComment(position);
+ if (oldcomment.isEmpty()) return;
+ QString comment = QInputDialog::getText(this, i18n("Add Marker"), i18n("Enter text for marker on clip <b>%1</b>", clip->clipName()), QLineEdit::Normal, oldcomment);
+ if (comment.isEmpty()) return;
+ AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, comment, id, position, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString comment) {
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
+ else base->deleteSnapMarker(pos);
+ m_document->setModified(true);
+ viewport()->update();
+}
+
+void CustomTrackView::setTool(PROJECTTOOL tool) {
+ m_tool = tool;
+}
void CustomTrackView::setScale(double scaleFactor) {
//scale(scaleFactor, scaleFactor);
double pos = cursorPos() / m_scale;
m_scale = scaleFactor;
+ int vert = verticalScrollBar()->value();
kDebug() << " HHHHHHHH SCALING: " << m_scale;
QList<QGraphicsItem *> itemList = items();
updateCursorPos();
centerOn(QPointF(cursorPos(), m_tracksHeight));
setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
+ verticalScrollBar()->setValue(vert);
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) {
projects / kdenlive / blobdiff