#include <KCursor>
#include "customtrackview.h"
+#include "customtrackscene.h"
#include "docclipbase.h"
#include "clipitem.h"
#include "definitions.h"
#include "mainwindow.h"
#include "ui_keyframedialog_ui.h"
#include "clipdurationdialog.h"
-
+#include "abstractgroupitem.h"
+#include "insertspacecommand.h"
+#include "spacerdialog.h"
+#include "addtrackcommand.h"
+#include "changetrackcommand.h"
+#include "movegroupcommand.h"
+#include "ui_addtrack_ui.h"
//TODO:
// disable animation if user asked it in KDE's global settings
// const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects;
// 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_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), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()) {
+CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent)
+ : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
m_tipPen.setColor(border);
m_tipPen.setWidth(3);
setContentsMargins(0, 0, 0, 0);
- if (projectscene) {
- m_cursorLine = projectscene->addLine(0, 0, 0, m_tracksHeight);
- m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable);
- m_cursorLine->setZValue(1000);
- }
+ const int maxWidth = m_tracksHeight * m_document->tracksCount();
+ setSceneRect(0, 0, sceneRect().width(), maxWidth);
+ verticalScrollBar()->setMaximum(maxWidth);
+ m_cursorLine = projectscene->addLine(0, 0, 0, maxWidth);
+ m_cursorLine->setZValue(1000);
KIcon razorIcon("edit-cut");
m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
+
+ KIcon spacerIcon("kdenlive-spacer-tool");
+ m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22));
verticalScrollBar()->setTracking(true);
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
+ connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling()));
+ m_scrollTimer.setInterval(100);
+ m_scrollTimer.setSingleShot(true);
}
CustomTrackView::~CustomTrackView() {
qDeleteAll(m_guides);
}
+void CustomTrackView::setDocumentModified() {
+ m_document->setModified(true);
+}
void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
m_timelineContextMenu = timeline;
m_autoScroll = KdenliveSettings::autoscroll();
}
-QList <TrackInfo> CustomTrackView::tracksList() const {
- return m_tracksList;
-}
+/*sQList <TrackInfo> CustomTrackView::tracksList() const {
+ return m_scene->m_tracksList;
+}*/
void CustomTrackView::checkTrackHeight() {
if (m_tracksHeight == KdenliveSettings::trackheight()) return;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
item = (ClipItem*) itemList.at(i);
- item->setRect(item->rect().x(), item->track() * m_tracksHeight, item->rect().width(), m_tracksHeight - 1);
+ item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1);
+ item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1);
item->resetThumbs();
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
transitionitem = (Transition*) itemList.at(i);
- transitionitem->setRect(transitionitem->rect().x(), transitionitem->track() * m_tracksHeight + m_tracksHeight / 2, transitionitem->rect().width(), m_tracksHeight - 1);
+ transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1);
+ transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2);
}
}
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
for (int i = 0; i < m_guides.count(); i++) {
QLineF l = m_guides.at(i)->line();
- l.setP2(QPointF(l.x2(), m_tracksHeight * m_tracksList.count()));
+ l.setP2(QPointF(l.x2(), m_tracksHeight * m_document->tracksCount()));
m_guides.at(i)->setLine(l);
}
- setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count());
- verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count());
+ setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
+ verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
update();
}
}
// virtual
+/** Zoom or move viewport on mousewheel
+ *
+ * If mousewheel+Ctrl, zooms in/out on the timeline.
+ *
+ * With Ctrl, moves viewport towards end of timeline if down/back,
+ * opposite on up/forward.
+ *
+ * See also http://www.kdenlive.org/mantis/view.php?id=265 */
void CustomTrackView::wheelEvent(QWheelEvent * e) {
if (e->modifiers() == Qt::ControlModifier) {
if (e->delta() > 0) emit zoomIn();
else emit zoomOut();
} else {
- if (e->delta() > 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
+ if (e->delta() <= 0) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + horizontalScrollBar()->singleStep());
else horizontalScrollBar()->setValue(horizontalScrollBar()->value() - horizontalScrollBar()->singleStep());
}
}
int CustomTrackView::getPreviousVideoTrack(int track) {
- track = m_tracksList.count() - track - 1;
+ track = m_document->tracksCount() - track - 1;
track --;
for (int i = track; i > -1; i--) {
- if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1;
+ if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1;
}
return 0;
}
+
+void CustomTrackView::slotCheckMouseScrolling() {
+ if (m_scrollOffset == 0) {
+ m_scrollTimer.stop();
+ return;
+ }
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() + m_scrollOffset);
+ m_scrollTimer.start();
+}
+
+void CustomTrackView::slotCheckPositionScrolling() {
+ // If mouse is at a border of the view, scroll
+ if (m_moveOpMode != SEEK) return;
+ int pos = cursorPos();
+ if (mapFromScene(pos, 0).x() < 7) {
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2);
+ setCursorPos(mapToScene(QPoint()).x() - 1);
+ QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
+
+ } else if (viewport()->width() - 5 < mapFromScene(pos + 1, 0).x()) {
+ horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 2);
+ setCursorPos(mapToScene(viewport()->width(), 0).x() + 1);
+ QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
+ }
+}
+
+
// virtual
void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
int pos = event->x();
- emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale));
+ int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
+ emit mousePosition(mappedXPos);
if (event->buttons() & Qt::MidButton) return;
- if (event->buttons() != Qt::NoButton) {
- if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) {
- // a button was pressed, delete visual tips
- 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_dragItem->boundingRect().height() / 2 : 0))).y() / m_tracksHeight;
- int currentTrack = m_dragItem->track();
-
- 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;
- if (m_selectedClipList.count() == 1) m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset * m_tracksHeight, moveTrack);
- else {
- int moveOffset = (int)(snappedPos / m_scale) - m_dragItem->startPos().frames(m_document->fps());
- if (canBeMoved(m_selectedClipList, GenTime(moveOffset, m_document->fps()), offset)) {
- for (int i = 0; i < m_selectedClipList.count(); i++) {
- AbstractClipItem *item = m_selectedClipList.at(i);
- item->moveTo(item->startPos().frames(m_document->fps()) + moveOffset, m_scale, offset * m_tracksHeight, item->track() + offset, false);
- }
- }
- }
+ if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) {
+ QGraphicsView::mouseMoveEvent(event);
+ m_moveOpMode = NONE;
+ return;
+ }
- } else if (m_operationMode == RESIZESTART) {
- double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale);
- } else if (m_operationMode == RESIZEEND) {
- double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale);
- } else if (m_operationMode == FADEIN) {
- int pos = (int)(mapToScene(event->pos()).x() / m_scale);
- ((ClipItem*) m_dragItem)->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale);
- } else if (m_operationMode == FADEOUT) {
- int pos = (int)(mapToScene(event->pos()).x() / m_scale);
- ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
- } else if (m_operationMode == KEYFRAME) {
- GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ if (event->buttons() != Qt::NoButton) {
+ bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance();
+ if (m_dragItem && m_tool == SELECTTOOL) {
+ if (m_operationMode == MOVE && move) {
+ QGraphicsView::mouseMoveEvent(event);
+ // If mouse is at a border of the view, scroll
+ if (pos < 5) {
+ m_scrollOffset = -30;
+ m_scrollTimer.start();
+ } else if (viewport()->width() - pos < 10) {
+ m_scrollOffset = 30;
+ m_scrollTimer.start();
+ } else if (m_scrollTimer.isActive()) m_scrollTimer.stop();
+
+ } else if (m_operationMode == RESIZESTART && move) {
+ double snappedPos = getSnapPointForPos(mappedXPos);
+ m_dragItem->resizeStart((int)(snappedPos));
+ } else if (m_operationMode == RESIZEEND && move) {
+ double snappedPos = getSnapPointForPos(mappedXPos);
+ m_dragItem->resizeEnd((int)(snappedPos));
+ } else if (m_operationMode == FADEIN && move) {
+ ((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
+ } else if (m_operationMode == FADEOUT && move) {
+ ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - mappedXPos));
+ } else if (m_operationMode == KEYFRAME && move) {
+ GenTime keyFramePos = GenTime(mappedXPos, m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
double pos = mapToScene(event->pos()).toPoint().y();
- QRectF br = m_dragItem->rect();
+ QRectF br = m_dragItem->sceneBoundingRect();
double maxh = 100.0 / br.height();
pos = (br.bottom() - pos) * maxh;
m_dragItem->updateKeyFramePos(keyFramePos, pos);
m_animation = NULL;
if (m_visualTip) delete m_visualTip;
m_visualTip = NULL;
- QGraphicsView::mouseMoveEvent(event);
return;
} else if (m_operationMode == MOVEGUIDE) {
if (m_animation) delete m_animation;
m_visualTip = NULL;
QGraphicsView::mouseMoveEvent(event);
return;
+ } else if (m_operationMode == SPACER && move) {
+ // spacer tool
+ int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
+ m_selectionGroup->setPos(mappedXPos + (m_spacerStart - mappedClick) , m_selectionGroup->pos().y());
}
}
setCursor(m_razorCursor);
//QGraphicsView::mouseMoveEvent(event);
//return;
+ } else if (m_tool == SPACERTOOL) {
+ setCursor(m_spacerCursor);
+ return;
}
QList<QGraphicsItem *> itemList = items(event->pos());
}
if (item && event->buttons() == Qt::NoButton) {
- AbstractClipItem *clip = (AbstractClipItem*) item;
+ AbstractClipItem *clip = static_cast <AbstractClipItem*>(item);
if (m_tool == RAZORTOOL) {
// razor tool over a clip, display current frame in monitor
- if (item->type() == AVWIDGET) {
- emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
+ if (!m_blockRefresh && item->type() == AVWIDGET) {
+ //TODO: solve crash when showing frame when moving razor over clip
+ //emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
}
- QGraphicsView::mouseMoveEvent(event);
+ event->accept();
return;
}
- opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
- double size = 8;
+ opMode = clip->operationMode(mapToScene(event->pos()));
+ double size = 5;
if (opMode == m_moveOpMode) {
QGraphicsView::mouseMoveEvent(event);
return;
} else if (opMode == RESIZESTART) {
setCursor(KCursor("left_side", Qt::SizeHorCursor));
if (m_visualTip == NULL) {
+ QRectF rect = clip->sceneBoundingRect();
QPolygon polygon;
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
- polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint(0, rect.height() / 2 - size * 2);
+ polygon << QPoint(size * 2, (int)(rect.height() / 2));
+ polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
+ polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setPos(rect.x(), rect.y());
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, 1);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+ //m_animation->setPosAt(.5, QPointF(rect.x() - rect.x() * scale, 0));
scale = 1.0;
m_animation->setScaleAt(1, scale, 1);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+ //m_animation->setPosAt(1, QPointF(rect.x() - rect.x() * scale, 0));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
} else if (opMode == RESIZEEND) {
setCursor(KCursor("right_side", Qt::SizeHorCursor));
if (m_visualTip == NULL) {
+ QRectF rect = clip->sceneBoundingRect();
QPolygon polygon;
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
+ polygon << QPoint(- size * 2, (int)(rect.height() / 2));
+ polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
+ polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
-
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
+ m_visualTip->setPos(rect.right(), rect.y());
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, 1);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0));
scale = 1.0;
m_animation->setScaleAt(1, scale, 1);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
} else if (opMode == FADEIN) {
if (m_visualTip == NULL) {
ClipItem *item = (ClipItem *) clip;
- m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
+ QRectF rect = clip->sceneBoundingRect();
+ m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setPos(rect.x() + item->fadeIn(), rect.y());
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
} else if (opMode == FADEOUT) {
if (m_visualTip == NULL) {
ClipItem *item = (ClipItem *) clip;
- m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
+ QRectF rect = clip->sceneBoundingRect();
+ m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setPos(rect.right() - item->fadeOut(), rect.y());
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
m_visualTip->setZValue(100);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
scene()->addItem(m_visualTip);
m_animationTimer->start();
}
setCursor(Qt::PointingHandCursor);
} else if (opMode == TRANSITIONSTART) {
- if (m_visualTip == NULL) {
+ /*if (m_visualTip == NULL) {
+ QRectF rect = clip->sceneBoundingRect();
m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
+ m_visualTip->setPos(rect.x() + 10, rect.y() + rect.height() / 2 + 12);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
scene()->addItem(m_visualTip);
m_animationTimer->start();
- }
+ }*/
setCursor(Qt::PointingHandCursor);
} else if (opMode == TRANSITIONEND) {
- if (m_visualTip == NULL) {
+ /*if (m_visualTip == NULL) {
+ QRectF rect = clip->sceneBoundingRect();
m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
m_animation = new QGraphicsItemAnimation;
m_animation->setItem(m_visualTip);
m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
+ m_visualTip->setPos(rect.x() + rect.width() - 10 , rect.y() + rect.height() / 2 + 12);
double scale = 2.0;
m_animation->setScaleAt(.5, scale, scale);
scale = 1.0;
m_animation->setScaleAt(1, scale, scale);
scene()->addItem(m_visualTip);
m_animationTimer->start();
- }
+ }*/
setCursor(Qt::PointingHandCursor);
} else if (opMode == KEYFRAME) {
setCursor(Qt::PointingHandCursor);
}
} // no clip under mouse
else if (m_tool == RAZORTOOL) {
- QGraphicsView::mouseMoveEvent(event);
+ event->accept();
return;
} else if (opMode == MOVEGUIDE) {
m_moveOpMode = opMode;
setCursor(Qt::SplitHCursor);
} else {
- m_moveOpMode = NONE;
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
- setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
- }
+ m_moveOpMode = SEEK;
+ setCursorPos(mappedXPos);
+ slotCheckPositionScrolling();
+ } else m_moveOpMode = NONE;
if (m_visualTip) {
if (m_animation) delete m_animation;
m_animationTimer->stop();
// virtual
void CustomTrackView::mousePressEvent(QMouseEvent * event) {
m_menuPosition = QPoint();
- activateMonitor();
+ m_blockRefresh = true;
+ bool collision = false;
+
+ if (m_tool != RAZORTOOL) activateMonitor();
+ else if (m_document->renderer()->playSpeed() != 0.0) {
+ m_document->renderer()->pause();
+ return;
+ }
m_clickEvent = event->pos();
- QList<QGraphicsItem *> collisionList = items(event->pos());
+
+ // special cases (middle click button or ctrl / shift click
if (event->button() == Qt::MidButton) {
m_document->renderer()->switchPlay();
+ m_blockRefresh = false;
+ m_operationMode = NONE;
return;
}
- if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) {
+
+ // check item under mouse
+ QList<QGraphicsItem *> collisionList = items(event->pos());
+
+ if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) {
setDragMode(QGraphicsView::ScrollHandDrag);
QGraphicsView::mousePressEvent(event);
+ m_blockRefresh = false;
+ m_operationMode = NONE;
return;
- } else if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) {
+ }
+
+ if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) {
setDragMode(QGraphicsView::RubberBandDrag);
QGraphicsView::mousePressEvent(event);
+ m_blockRefresh = false;
+ m_operationMode = RUBBERSELECTION;
return;
- } else {
- bool collision = false;
- if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
- // a guide item was pressed
- collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true);
- m_dragItem = NULL;
- m_dragGuide = (Guide *) collisionList.at(0);
- collision = true;
- m_operationMode = MOVEGUIDE;
- // deselect all clips so that only the guide will move
- QList<QGraphicsItem *> clips = scene()->selectedItems();
- for (int i = 0; i < clips.count(); ++i)
- clips.at(i)->setSelected(false);
- updateSnapPoints(NULL);
- QGraphicsView::mousePressEvent(event);
- } else for (int i = 0; i < collisionList.count(); ++i) {
- QGraphicsItem *item = collisionList.at(i);
- if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
- if (m_tool == RAZORTOOL) {
- if (item->type() == TRANSITIONWIDGET) {
- emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage);
- 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()) {
-
- if (event->modifiers() != Qt::ControlModifier) {
- QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
- itemList.at(i)->setSelected(false);
- itemList.at(i)->update();
- }
- }
- item->setSelected(true);
- item->update();
- }
+ }
- m_dragItem = (AbstractClipItem *) item;
+ if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
+ // a guide item was pressed
+ collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true);
+ m_dragItem = NULL;
+ m_dragGuide = (Guide *) collisionList.at(0);
+ collision = true;
+ m_operationMode = MOVEGUIDE;
+ // deselect all clips so that only the guide will move
+ m_scene->clearSelection();
+ resetSelectionGroup();
+ updateSnapPoints(NULL);
+ QGraphicsView::mousePressEvent(event);
+ return;
+ }
- 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();
+ // Find first clip or transition under mouse
+ int i = 0;
+ m_dragItem = NULL;
+ while (i < collisionList.count()) {
+ if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) {
+ m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(i));
+ m_dragItemInfo = m_dragItem->info();
+ break;
+ }
+ i++;
+ }
- m_selectedClipList.clear();
- QList<QGraphicsItem *> selected = scene()->selectedItems();
- for (int i = 0; i < selected.count(); i++) {
- if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET)
- m_selectedClipList.append(static_cast <AbstractClipItem *>(selected.at(i)));
- }
+ // context menu requested
+ if (event->button() == Qt::RightButton) {
+ if (m_dragItem) {
+ if (!m_dragItem->isSelected()) {
+ resetSelectionGroup(false);
+ m_scene->clearSelection();
+ m_dragItem->setSelected(true);
+ }
+ }
+ m_operationMode = NONE;
+ displayContextMenu(event->globalPos(), m_dragItem);
+ m_menuPosition = m_clickEvent;
+ m_dragItem = NULL;
+ event->accept();
+ return;
+ }
- m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
- if (m_operationMode == KEYFRAME) {
- m_dragItem->updateSelectedKeyFrame();
- return;
- } else if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
- else if (m_operationMode == TRANSITIONSTART) {
- ItemInfo info;
- info.startPos = m_dragItem->startPos();
- info.track = m_dragItem->track();
- int transitiontrack = getPreviousVideoTrack(info.track);
- ClipItem *transitionClip = NULL;
- if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
- if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
- info.endPos = transitionClip->endPos();
- } else info.endPos = info.startPos + GenTime(2.5);
-
- slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
- } else if (m_operationMode == TRANSITIONEND) {
- ItemInfo info;
- info.endPos = m_dragItem->endPos();
- info.track = m_dragItem->track();
- int transitiontrack = getPreviousVideoTrack(info.track);
- ClipItem *transitionClip = NULL;
- if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
- if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
- info.startPos = transitionClip->startPos();
- } else info.startPos = info.endPos - GenTime(2.5);
- slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
- }
- updateSnapPoints(m_dragItem);
- collision = true;
- break;
+ // No item under click
+ if (m_dragItem == NULL || m_tool == SPACERTOOL) {
+ resetSelectionGroup();
+ setCursor(Qt::ArrowCursor);
+ m_scene->clearSelection();
+ event->accept();
+ emit clipItemSelected(NULL);
+ if (m_tool == SPACERTOOL) {
+ QList<QGraphicsItem *> selection;
+ if (event->modifiers() == Qt::ControlModifier) {
+ // Ctrl + click, select all items on track after click position
+ int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
+ selection = items(m_clickEvent.x(), track * m_tracksHeight + 1, sceneRect().width() - m_clickEvent.x(), m_tracksHeight - 2);
+ } else {
+ // Select all items on all tracks after click position
+ selection = items(event->pos().x(), 1, sceneRect().width() - event->pos().x(), sceneRect().height());
+ }
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ m_spacerStart = -1;
+ int itemStart;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(selection.at(i));
+ itemStart = item->startPos().frames(m_document->fps());
+ if (m_spacerStart == -1 || itemStart < m_spacerStart)
+ m_spacerStart = itemStart;
}
}
- if (!collision) {
- kDebug() << "//////// NO ITEM FOUND ON CLICK";
- m_dragItem = NULL;
- setCursor(Qt::ArrowCursor);
- QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++)
- itemList.at(i)->setSelected(false);
- //emit clipItemSelected(NULL);
- if (event->button() == Qt::RightButton) {
- displayContextMenu(event->globalPos());
- m_menuPosition = event->pos();
- } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale));
- } else if (event->button() == Qt::RightButton) {
- m_operationMode = NONE;
- displayContextMenu(event->globalPos(), m_dragItem);
+ QPointF top = m_selectionGroup->boundingRect().topLeft();
+ m_selectionGroup->setPos(top);
+ m_selectionGroup->translate(-top.x(), -top.y() + 1);
+ m_operationMode = SPACER;
+ } else setCursorPos((int)(mapToScene(event->x(), 0).x()));
+ return;
+ }
+
+ // Razor tool
+ if (m_tool == RAZORTOOL) {
+ if (m_dragItem->type() == TRANSITIONWIDGET) {
+ emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage);
+ event->accept();
m_dragItem = NULL;
+ return;
}
- if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
- else emit clipItemSelected(NULL);
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
+ RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+ m_dragItem = NULL;
+ event->accept();
+ return;
}
+ updateSnapPoints(m_dragItem);
+ if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+ else emit clipItemSelected(NULL);
+
+ if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) {
+ // If clicked item is selected, allow move
+ event->accept();
+ if (m_selectionGroup) m_selectionGroup->setSelected(true);
+ if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
+ } else {
+ resetSelectionGroup();
+ if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
+ m_dragItem->setSelected(!m_dragItem->isSelected());
+ groupSelectedItems();
+ }
+
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
+ /*
+ if (!item->isSelected()) {
+
+ if (event->modifiers() != Qt::ControlModifier) {
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++) {
+ itemList.at(i)->setSelected(false);
+ itemList.at(i)->update();
+ }
+ }
+ item->setSelected(true);
+ item->update();
+ }
+
+
+
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->pos().y()));
+ m_dragItemInfo.startPos = m_dragItem->startPos();
+ m_dragItemInfo.endPos = m_dragItem->endPos();
+ m_dragItemInfo.track = m_dragItem->track();
+
+ m_selectedClipList.clear();
+ QList<QGraphicsItem *> selected = scene()->selectedItems();
+ for (int i = 0; i < selected.count(); i++) {
+ if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET)
+ m_selectedClipList.append(static_cast <AbstractClipItem *>(selected.at(i)));
+ }
+ */
+ m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
+
+ if (m_operationMode == KEYFRAME) {
+ m_dragItem->updateSelectedKeyFrame();
+ m_blockRefresh = false;
+ return;
+ } else if (m_operationMode == MOVE) {
+ setCursor(Qt::ClosedHandCursor);
+ } else if (m_operationMode == TRANSITIONSTART) {
+ ItemInfo info;
+ info.startPos = m_dragItem->startPos();
+ info.track = m_dragItem->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ ClipItem *transitionClip = NULL;
+ if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
+ if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
+ info.endPos = transitionClip->endPos();
+ } else info.endPos = info.startPos + GenTime(65, m_document->fps());
+ if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps());
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+ } else if (m_operationMode == TRANSITIONEND) {
+ ItemInfo info;
+ info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps());
+ info.track = m_dragItem->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ ClipItem *transitionClip = NULL;
+ if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
+ if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
+ info.startPos = transitionClip->startPos();
+ } else info.startPos = info.endPos - GenTime(65, m_document->fps());
+ if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps());
+ QDomElement transition = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement();
+ EffectsList::setParameter(transition, "reverse", "1");
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, transition);
+ }
+
+ m_blockRefresh = false;
//kDebug()<<pos;
//QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::resetSelectionGroup(bool selectItems) {
+ if (m_selectionGroup) {
+ // delete selection group
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setSelected(selectItems);
+ }
+ scene()->destroyItemGroup(m_selectionGroup);
+ m_selectionGroup = NULL;
+ }
+}
+
+void CustomTrackView::groupSelectedItems() {
+ if (m_selectionGroup) kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
+ QList<QGraphicsItem *> selection = m_scene->selectedItems();
+ if (selection.count() > 1) {
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+
+ if (m_selectionGroup) {
+ QPointF top = m_selectionGroup->boundingRect().topLeft();
+ m_selectionGroup->setPos(top);
+ m_selectionGroup->translate(-top.x(), -top.y() + 1);
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
+ }
+ } else resetSelectionGroup();
+}
+
void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) {
+ kDebug() << "++++++++++++ DBL CLK";
if (m_dragItem && m_dragItem->hasKeyFrames()) {
if (m_moveOpMode == KEYFRAME) {
// user double clicked on a keyframe, open edit dialog
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
} else {
// add keyframe
- GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
ClipItem * item = (ClipItem *) m_dragItem;
QString previous = item->keyframes(item->selectedEffectIndex());
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
} else if (m_dragItem) {
ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
if (clip) {
clip->setKeyframes(index, keyframes);
- updateEffect(m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index);
} else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);
}
}
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
- if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
- kDebug() << "/////////////// DRAG ENTERED, TEXT: " << event->mimeData()->data("kdenlive/producerslist");
+ if (event->mimeData()->hasFormat("kdenlive/clip")) {
+ resetSelectionGroup();
+
+ QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ QPoint pos = QPoint();
+ DocClipBase *clip = m_document->getBaseClip(list.at(0));
+ if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+ ItemInfo info;
+ info.startPos = GenTime(pos.x(), m_document->fps());
+ info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
+ info.endPos = info.startPos + GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
+ info.track = (int)(pos.y() / m_tracksHeight);
+ ClipItem *item = new ClipItem(clip, info, m_document->fps());
+ m_selectionGroup->addToGroup(item);
+ //TODO: check if we do not overlap another clip when first dropping in timeline
+ // if (insertPossible(m_selectionGroup, event->pos()))
+ scene()->addItem(m_selectionGroup);
+ event->acceptProposedAction();
+ } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";");
- //TODO: drop of several clips
+ m_scene->clearSelection();
+ resetSelectionGroup(false);
+
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ QPoint pos = QPoint();
for (int i = 0; i < ids.size(); ++i) {
+ DocClipBase *clip = m_document->getBaseClip(ids.at(i));
+ if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+ ItemInfo info;
+ info.startPos = GenTime(pos.x(), m_document->fps());
+ info.endPos = info.startPos + clip->duration();
+ info.track = (int)(pos.y() / m_tracksHeight);
+ ClipItem *item = new ClipItem(clip, info, m_document->fps());
+ pos.setX(pos.x() + clip->duration().frames(m_document->fps()));
+ m_selectionGroup->addToGroup(item);
}
- DocClipBase *clip = m_document->getBaseClip(ids.at(0).toInt());
- if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(0).toInt();
- addItem(clip, event->pos());
+ //TODO: check if we do not overlap another clip when first dropping in timeline
+ //if (insertPossible(m_selectionGroup, event->pos()))
+ scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} else QGraphicsView::dragEnterEvent(event);
}
+
+bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const {
+ QPolygonF path;
+ QList<QGraphicsItem *> children = group->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(children.at(i));
+ ItemInfo info = clip->info();
+ kDebug() << " / / INSERT : " << pos.x();
+ QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+ kDebug() << " / / INSERT RECT: " << shape;
+ path = path.united(QPolygonF(shape));
+ }
+ }
+
+ QList<QGraphicsItem*> collindingItems = scene()->items(path, Qt::IntersectsItemShape);
+ if (collindingItems.isEmpty()) return true;
+ else {
+ for (int i = 0; i < collindingItems.count(); i++) {
+ QGraphicsItem *collision = collindingItems.at(i);
+ if (collision->type() == AVWIDGET) {
+ // Collision
+ kDebug() << "// COLLISIION DETECTED";
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
+
void CustomTrackView::slotRefreshEffects(ClipItem *clip) {
- int track = m_tracksList.count() - clip->track();
+ int track = m_document->tracksCount() - clip->track();
GenTime pos = clip->startPos();
if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false)) {
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
}
void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) {
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
- QMap <QString, QString> effectParams = clip->addEffect(effect);
+ QHash <QString, QString> effectParams = clip->addEffect(effect);
if (!m_document->renderer()->mltAddEffect(track, pos, effectParams))
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
emit clipItemSelected(clip);
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
clip->deleteEffect(index);
emit clipItemSelected(clip);
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
item->initEffect(effect);
- AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), effect, true);
+ AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true);
m_commandStack->push(command);
}
}
}
void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) {
- AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), effect, false);
+ AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false);
m_commandStack->push(command);
m_document->setModified(true);
}
-void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix) {
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
+void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) {
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
- QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
+ QHash <QString, QString> effectParams = clip->getEffectArgs(effect);
+ // check if we are trying to reset a keyframe effect
+ if (effectParams.contains("keyframes") && effectParams.value("keyframes").isEmpty()) {
+ clip->initEffect(effect);
+ clip->setEffectAt(ix, effect);
+ effectParams = clip->getEffectArgs(effect);
+ }
if (effectParams.value("disabled") == "1") {
if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) {
kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
} else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
- } else if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams))
+ } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+
+ clip->setEffectAt(ix, effect);
if (ix == clip->selectedEffectIndex()) {
- clip->setSelectedEffect(clip->selectedEffectIndex());
+ clip->setSelectedEffect(ix);
+ if (!triggeredByUser) emit clipItemSelected(clip, ix);
+ }
+ if (effect.attribute("tag") == "volume") {
+ // A fade effect was modified, update the clip
+ if (effect.attribute("id") == "fadein") {
+ int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+ clip->setFadeIn(pos);
+ }
+ if (effect.attribute("id") == "fadeout") {
+ int pos = effectParams.value("out").toInt() - effectParams.value("in").toInt();
+ clip->setFadeOut(pos);
+ }
+
}
}
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);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
if (clip) {
m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement();
+ QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement();
+ clip->setEffectAt(oldPos - 1, act);
+ clip->setEffectAt(newPos - 1, before);
+ emit clipItemSelected(clip, newPos - 1);
}
m_document->setModified(true);
}
QDomElement effect = clip->effectAt(effectPos);
QDomElement oldEffect = effect.cloneNode().toElement();
effect.setAttribute("disabled", disable);
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
+ EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
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);
+ MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true);
m_commandStack->push(command);
m_document->setModified(true);
}
void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) {
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true);
+ EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true);
m_commandStack->push(command);
}
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);
- if (!item) {
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+ if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) {
emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage);
+ kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+ m_blockRefresh = false;
return;
}
+ kDebug() << "///////// CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+
+ m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
int cutPos = (int) cutTime.frames(m_document->fps());
ItemInfo newPos;
newPos.startPos = cutTime;
newPos.endPos = info.endPos;
newPos.cropStart = item->cropStart() + (cutTime - info.startPos);
newPos.track = info.track;
- item->resizeEnd(cutPos, m_scale);
- ClipItem *dup = new ClipItem(item->baseClip(), newPos, m_scale, m_document->fps());
- dup->setEffectList(item->effectList());
+ ClipItem *dup = item->clone(newPos);
+ kDebug() << "// REsizing item to: " << cutPos;
+ item->resizeEnd(cutPos, false);
scene()->addItem(dup);
- m_document->renderer()->mltCutClip(m_tracksList.count() - info.track, cutTime);
+ if (item->checkKeyFrames()) slotRefreshEffects(item);
+ if (dup->checkKeyFrames()) slotRefreshEffects(dup);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
+ kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+ kDebug() << "// CUTTING CLIP dONE";
} 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);
- if (!item || !dup) {
+ ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()) + 1, info.track);
+ if (!item || !dup || item == dup) {
emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage);
+ m_blockRefresh = false;
return;
}
+ if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, cutTime) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(cutTime.frames(m_document->fps())), info.track), ErrorMessage);
+ return;
+ }
+
+ kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")";
+ kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")";
+ kDebug() << "// UNCUTTING CLIPS, INFO (" << info.startPos.frames(25) << "x" << info.endPos.frames(25) << ") , CUT: " << cutTime.frames(25);;
+ //deleteClip(dup->info());
+
+
+ if (dup->isSelected()) emit clipItemSelected(NULL);
+ dup->baseClip()->removeReference();
+ m_document->updateClip(dup->baseClip()->getId());
+ scene()->removeItem(dup);
delete dup;
- item->baseClip()->removeReference();
- m_document->updateClip(item->baseClip()->getId());
- 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);
+
+ ItemInfo clipinfo = item->info();
+ clipinfo.track = m_document->tracksCount() - clipinfo.track;
+ bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
+ if (success) {
+ item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+ } else
+ emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+
}
+ QTimer::singleShot(3000, this, SLOT(slotEnableRefresh()));
}
+void CustomTrackView::slotEnableRefresh() {
+ m_blockRefresh = false;
+}
void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) {
QList<QGraphicsItem *> itemList = scene()->selectedItems();
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *item = (ClipItem *) itemList.at(i);
+ if (itemList.count() == 1) {
+ if (itemList.at(0)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *) itemList.at(0);
ItemInfo info;
- info.startPos = item->startPos();
- info.endPos = info.startPos + GenTime(2.5);
info.track = item->track();
- int transitiontrack = getPreviousVideoTrack(info.track);
+ ClipItem *transitionClip = NULL;
+ const int transitiontrack = getPreviousVideoTrack(info.track);
+ GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
+ if (pos < item->startPos() + item->duration() / 2) {
+ // add transition to clip start
+ info.startPos = item->startPos();
+ if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
+ if (transitionClip && transitionClip->endPos() < item->endPos()) {
+ info.endPos = transitionClip->endPos();
+ } else info.endPos = info.startPos + GenTime(65, m_document->fps());
+ } else {
+ // add transition to clip end
+ info.endPos = item->endPos();
+ if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
+ if (transitionClip && transitionClip->startPos() > item->startPos()) {
+ info.startPos = transitionClip->startPos();
+ } else info.startPos = info.endPos - GenTime(65, m_document->fps());
+ if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1");
+ }
slotAddTransition(item, info, transitiontrack, transition);
}
- }
+ } else 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 = info.startPos + GenTime(65, m_document->fps());
+ info.track = item->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ slotAddTransition(item, info, transitiontrack, transition);
+ }
+ }
}
void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
}
void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
- Transition *tr = new Transition(transitionInfo, endTrack, m_scale, m_document->fps(), params);
+ Transition *tr = new Transition(transitionInfo, endTrack, 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());
+ //kDebug() << "---- ADDING transition " << params.attribute("value");
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
m_document->setModified(true);
}
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());
+ Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()), transitionInfo.track);
+ if (!item) {
+ emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
+ return;
+ }
+ m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
+ if (m_dragItem == item) m_dragItem = NULL;
delete item;
emit transitionItemSelected(NULL);
m_document->setModified(true);
}
void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) {
- EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML() , true);
+ 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) {
- Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()) + 1, track);
+void CustomTrackView::slotTransitionTrackUpdated(Transition *tr, int track) {
+ QDomElement old = tr->toXML().cloneNode().toElement();
+ if (track == 0) {
+ track = getPreviousVideoTrack(tr->track());
+ tr->setForcedTrack(false, track);
+ } else {
+ tr->setForcedTrack(true, m_document->tracksCount() + 1 - track);
+ }
+ 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, bool updateTransitionWidget) {
+ Transition *item = getTransitionItemAt((int)pos.frames(m_document->fps()), 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);
+ m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
item->setTransitionParameters(transition);
+ if (updateTransitionWidget) emit transitionItemSelected(item, true);
m_document->setModified(true);
}
-void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) {
- 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, m_scale, m_document->fps());
- scene()->addItem(m_dropItem);
-}
-
-
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
- if (m_dropItem) {
- 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);
+ const int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight);
+ const int pos = mapToScene(event->pos()).x();
+ //kDebug() << "// DRAG MOVE TO TRACK: " << track;
+ if (m_selectionGroup) {
+ m_selectionGroup->setPos(pos, event->pos().y());
event->setDropAction(Qt::MoveAction);
- if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
+ if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
event->acceptProposedAction();
}
} else {
}
void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) {
- if (m_dropItem) {
- delete m_dropItem;
- m_dropItem = NULL;
+ if (m_selectionGroup) {
+ QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+ qDeleteAll(items);
+ scene()->destroyItemGroup(m_selectionGroup);
+ m_selectionGroup = NULL;
} else QGraphicsView::dragLeaveEvent(event);
}
void CustomTrackView::dropEvent(QDropEvent * event) {
- if (m_dropItem) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->info(), m_dropItem->effectList(), false, false);
- m_commandStack->push(command);
- m_dropItem->baseClip()->addReference();
- m_document->updateClip(m_dropItem->baseClip()->getId());
- ItemInfo info;
- info = m_dropItem->info();
- info.track = m_tracksList.count() - m_dropItem->track();
- //kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<<m_tracksList.count()<<", DROP: "<<m_dropItem->track();
- m_document->renderer()->mltInsertClip(info, m_dropItem->xml(), m_dropItem->baseClip()->producer());
- //if (m_dropItem->baseClip()->isTransparent()) m_document->renderer()->mltAddClipTransparency(info, getPreviousVideoTrack(m_dropItem->track()), m_dropItem->baseClip()->getId());
- m_dropItem = NULL;
+ if (m_selectionGroup) {
+ QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+ resetSelectionGroup();
+ m_scene->clearSelection();
+ for (int i = 0; i < items.count(); i++) {
+ ClipItem *item = static_cast <ClipItem *>(items.at(i));
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
+ m_commandStack->push(command);
+ item->baseClip()->addReference();
+ m_document->updateClip(item->baseClip()->getId());
+ ItemInfo info;
+ info = item->info();
+ if (item->baseClip()->isTransparent()) {
+ // add transparency transition
+ int endTrack = getPreviousVideoTrack(info.track);
+ Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+ scene()->addItem(tr);
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ }
+ info.track = m_document->tracksCount() - item->track();
+ m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
+ item->setSelected(true);
+ }
m_document->setModified(true);
} else QGraphicsView::dropEvent(event);
- m_dropItem = NULL;
+ setFocus();
}
// list of accepted mime types for drop
qstrList.append("text/plain");
qstrList.append("kdenlive/producerslist");
+ qstrList.append("kdenlive/clip");
return qstrList;
}
}
void CustomTrackView::setDuration(int duration) {
- kDebug() << "///////////// PRO DUR: " << duration << ", SCALE. " << (m_projectDuration + 500) * m_scale << ", height: " << 50 * m_tracksList.count();
+ if (duration > sceneRect().width())
+ setSceneRect(0, 0, (duration + 100), sceneRect().height());
m_projectDuration = duration;
- setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
}
int CustomTrackView::duration() const {
return m_projectDuration;
}
-void CustomTrackView::addTrack(TrackInfo type) {
- m_tracksList << type;
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
- setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count());
- verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count());
+void CustomTrackView::addTrack(TrackInfo type, int ix) {
+ if (ix == -1) m_document->insertTrack(ix, type);
+ else {
+ m_document->insertTrack(m_document->tracksCount() - ix, type);
+ // insert track in MLT playlist
+ m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VIDEOTRACK);
+
+ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ resetSelectionGroup();
+
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ // Move graphic items
+ m_selectionGroup->translate(0, m_tracksHeight);
+
+ // adjust track number
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ item->updateItem();
+ ItemInfo clipinfo = item->info();
+ if (item->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(item);
+ // We add a move clip command so that we get the correct producer for new track number
+ if (clip->clipType() == AV || clip->clipType() == AUDIO) {
+ m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track));
+ kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track;
+ }
+ } else if (item->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(item);
+ int track = tr->transitionEndTrack();
+ if (track >= ix) {
+ tr->updateTransitionEndTrack(getPreviousVideoTrack(clipinfo.track));
+ }
+ }
+ }
+ resetSelectionGroup(false);
+
+ }
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
+ setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
+ verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
+ viewport()->update();
//setFixedHeight(50 * m_tracksCount);
}
-void CustomTrackView::removeTrack() {
- // TODO: implement track deletion
- //m_tracksCount--;
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
+void CustomTrackView::removeTrack(int ix) {
+ // Delete track in MLT playlist
+ m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix);
+ m_document->deleteTrack(m_document->tracksCount() - ix - 1);
+
+ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+
+ resetSelectionGroup();
+
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ // Move graphic items
+ qreal ydiff = 0 - (int) m_tracksHeight;
+ m_selectionGroup->translate(0, ydiff);
+
+ // adjust track number
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
+ for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(children.at(i));
+ clip->updateItem();
+ ItemInfo clipinfo = clip->info();
+ kDebug() << "// CLIP TRK IS: " << clipinfo.track;
+ // We add a move clip command so that we get the correct producer for new track number
+ if (clip->clipType() == AV || clip->clipType() == AUDIO)
+ m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track));
+ } else if (children.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast <Transition *>(children.at(i));
+ tr->updateItem();
+ int track = tr->transitionEndTrack();
+ if (track >= ix) {
+ ItemInfo clipinfo = tr->info();
+ tr->updateTransitionEndTrack(getPreviousVideoTrack(clipinfo.track));
+ }
+ }
+ }
+ resetSelectionGroup(false);
+
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
+ setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
+ verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
+ viewport()->update();
+}
+
+void CustomTrackView::changeTrack(int ix, TrackInfo type) {
+ int tracknumber = m_document->tracksCount() - ix;
+ m_document->setTrackType(tracknumber - 1, type);
+ m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
+ QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
+ viewport()->update();
}
void CustomTrackView::slotSwitchTrackAudio(int ix) {
- int tracknumber = m_tracksList.count() - ix;
- kDebug() << "///// MUTING TRK: " << ix << "; PL NUM: " << tracknumber;
- m_tracksList[tracknumber - 1].isMute = !m_tracksList.at(tracknumber - 1).isMute;
- m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind);
+ /*for (int i = 0; i < m_document->tracksCount(); i++)
+ kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/
+
+ int tracknumber = m_document->tracksCount() - ix;
+
+ m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute);
+ kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind;
+ m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
+ m_document->setModified(true);
}
void CustomTrackView::slotSwitchTrackVideo(int ix) {
- int tracknumber = m_tracksList.count() - ix;
- m_tracksList[tracknumber - 1].isBlind = !m_tracksList.at(tracknumber - 1).isBlind;
- m_document->renderer()->mltChangeTrackState(tracknumber, m_tracksList.at(tracknumber - 1).isMute, m_tracksList.at(tracknumber - 1).isBlind);
+ int tracknumber = m_document->tracksCount() - ix;
+ m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind);
+ m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
+ m_document->setModified(true);
}
-void CustomTrackView::deleteClip(int clipId) {
+void CustomTrackView::slotRemoveSpace() {
+ GenTime pos;
+ int track = 0;
+ if (m_menuPosition.isNull()) {
+ pos = GenTime(cursorPos(), m_document->fps());
+ bool ok;
+ track = QInputDialog::getInteger(this, i18n("Remove Space"), i18n("Track"), 0, 0, m_document->tracksCount() - 1, 1, &ok);
+ if (!ok) return;
+ } else {
+ pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
+ track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
+ }
+ ClipItem *item = getClipItemAt(pos, track);
+ if (item) {
+ emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
+ return;
+ }
+ int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track);
+ //kDebug() << "// GOT LENGT; " << length;
+ if (length <= 0) {
+ emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
+ return;
+ }
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, GenTime(-length, m_document->fps()), true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotInsertSpace() {
+ GenTime pos;
+ int track = 0;
+ if (m_menuPosition.isNull()) {
+ pos = GenTime(cursorPos(), m_document->fps());
+ } else {
+ pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
+ track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
+ }
+ SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this);
+ if (d.exec() != QDialog::Accepted) return;
+ GenTime spaceDuration = d.selectedDuration();
+ track = d.selectedTrack();
+ ClipItem *item = getClipItemAt(pos, track);
+ if (item) pos = item->startPos();
+
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, spaceDuration, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration) {
+ int diff = duration.frames(m_document->fps());
+ QList<QGraphicsItem *> itemList;
+ if (track == -1) itemList = scene()->items(pos.frames(m_document->fps()) , 1, sceneRect().width() - pos.frames(m_document->fps()), sceneRect().height());
+ else itemList = scene()->items(pos.frames(m_document->fps()) , track * m_tracksHeight + 1, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight - 2);
+ resetSelectionGroup();
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
+ m_selectionGroup->addToGroup(itemList.at(i));
+ itemList.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+
+ m_selectionGroup->translate(diff, 0);
+ resetSelectionGroup(false);
+ if (track != -1) track = m_document->tracksCount() - track;
+ m_document->renderer()->mltInsertSpace(pos, track, duration);
+}
+
+void CustomTrackView::deleteClip(const QString &clipId) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
}
void CustomTrackView::setCursorPos(int pos, bool seek) {
- emit cursorMoved((int)(m_cursorPos * m_scale), (int)(pos * m_scale));
+ emit cursorMoved((int)(m_cursorPos), (int)(pos));
m_cursorPos = pos;
- m_cursorLine->setPos(pos * m_scale, 0);
+ m_cursorLine->setPos(pos, 0);
if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps()));
- else if (m_autoScroll && m_scale < 50) checkScrolling();
+ else if (m_autoScroll) checkScrolling();
}
void CustomTrackView::updateCursorPos() {
- m_cursorLine->setPos(m_cursorPos * m_scale, 0);
+ m_cursorLine->setPos(m_cursorPos, 0);
}
int CustomTrackView::cursorPos() {
- return (int)(m_cursorPos * m_scale);
+ return (int)(m_cursorPos);
}
void CustomTrackView::moveCursorPos(int delta) {
if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos;
- emit cursorMoved((int)(m_cursorPos * m_scale), (int)((m_cursorPos + delta) * m_scale));
+ emit cursorMoved((int)(m_cursorPos), (int)((m_cursorPos + delta)));
m_cursorPos += delta;
- m_cursorLine->setPos(m_cursorPos * m_scale, 0);
+ m_cursorLine->setPos(m_cursorPos, 0);
m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps()));
//if (m_autoScroll && m_scale < 50) checkScrolling();
}
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
+ kDebug() << "// MOUSE RELEASED, MODE: " << m_moveOpMode;
+ if (m_moveOpMode == SEEK) m_moveOpMode = NONE;
+ QGraphicsView::mouseReleaseEvent(event);
+ if (m_scrollTimer.isActive()) m_scrollTimer.stop();
if (event->button() == Qt::MidButton) {
return;
}
- QGraphicsView::mouseReleaseEvent(event);
setDragMode(QGraphicsView::NoDrag);
if (m_operationMode == MOVEGUIDE) {
setCursor(Qt::ArrowCursor);
m_operationMode = NONE;
m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, false);
- EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps()), m_dragGuide->label(), false);
+ EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(m_dragGuide->pos().x(), m_document->fps()), m_dragGuide->label(), false);
m_commandStack->push(command);
- m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps()));
+ m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps()));
m_dragGuide = NULL;
m_dragItem = NULL;
return;
+ } else if (m_operationMode == SPACER) {
+ int endClick = (int)(mapToScene(event->pos()).x() + 0.5);
+ int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
+ int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
+ if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) {
+ // We are moving all tracks
+ track = -1;
+ }
+ ClipItem *item = getClipItemAt(mappedClick, track);
+ if (item) mappedClick = item->startPos().frames(m_document->fps());
+ int diff = m_selectionGroup->pos().x() - m_spacerStart;//endClick - mappedClick;
+ kDebug() << "// MOVING SPACER DIFF:" << diff;
+ if (diff < 0) mappedClick += diff;
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()), false);
+ m_commandStack->push(command);
+ if (track != -1) track = m_document->tracksCount() - track;
+ m_document->renderer()->mltInsertSpace(GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()));
+ resetSelectionGroup(false);
+ m_operationMode = NONE;
+ } else if (m_operationMode == RUBBERSELECTION) {
+ resetSelectionGroup();
+ groupSelectedItems();
+ m_operationMode = NONE;
}
- if (m_dragItem == NULL) {
+
+ if (m_dragItem == NULL && m_selectionGroup == NULL) {
emit transitionItemSelected(NULL);
return;
}
ItemInfo info;
- info.startPos = m_dragItem->startPos();
- info.endPos = m_dragItem->endPos();
- info.track = m_dragItem->track();
+ if (m_dragItem) info = m_dragItem->info();
if (m_operationMode == MOVE) {
setCursor(Qt::OpenHandCursor);
- if (m_selectedClipList.count() == 1) {
+ if (m_selectionGroup == NULL) {
// we are moving one clip, easy
if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
- bool success = 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())));
+ ClipItem *item = static_cast <ClipItem *>(m_dragItem);
+ bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track));
if (success) {
- MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
+ MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false, false);
m_commandStack->push(command);
+ if (item->baseClip()->isTransparent()) {
+ // Also move automatic transition
+ Transition *tr = getTransitionItemAt((int) m_dragItemInfo.startPos.frames(m_document->fps()), m_dragItemInfo.track);
+ if (tr && tr->isAutomatic()) {
+ tr->updateTransitionEndTrack(getPreviousVideoTrack(info.track));
+ m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - m_dragItemInfo.track, m_document->tracksCount() - info.track, tr->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ tr->setPos((int) info.startPos.frames(m_document->fps()), (int)(info.track * m_tracksHeight + 1));
+ }
+ }
} else {
// undo last move and emit error message
MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true);
m_commandStack->push(command);
- emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(m_dragItemInfo.startPos.seconds(), 'g', 2)), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage);
}
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
m_commandStack->push(command);
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);
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
} else {
// Moving several clips. We need to delete them and readd them to new position,
// or they might overlap each other during the move
- GenTime timeOffset = info.startPos - m_dragItemInfo.startPos;
- int trackOffset = info.track - m_dragItemInfo.track;
+ QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+
+ QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
+ QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
+
+ GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
+ const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track;
if (timeOffset != GenTime() || trackOffset != 0) {
QUndoCommand *moveClips = new QUndoCommand();
- moveClips->setText("Move clips");
+ moveClips->setText(i18n("Move group"));
// remove items in MLT playlist
- for (int i = 0; i < m_selectedClipList.count(); i++) {
- AbstractClipItem *item = m_selectedClipList.at(i);
+ for (int i = 0; i < items.count(); i++) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
- info.startPos = info.startPos - timeOffset;
- info.endPos = info.endPos - timeOffset;
- info.track = info.track - trackOffset;
if (item->type() == AVWIDGET) {
- ClipItem *clip = static_cast <ClipItem*>(item);
- new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips);
- m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos);
+ if (m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) {
+ // error, clip cannot be removed from playlist
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage);
+ } else {
+ clipsToMove.append(info);
+ }
} else {
+ transitionsToMove.append(info);
Transition *tr = static_cast <Transition*>(item);
- new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips);
- m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
+ m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
- for (int i = 0; i < m_selectedClipList.count(); i++) {
+ for (int i = 0; i < items.count(); i++) {
// re-add items in correct place
- AbstractClipItem *item = m_selectedClipList.at(i);
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
+ item->updateItem();
+ ItemInfo info = item->info();
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
- new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), item->info(), clip->effectList(), false, false, moveClips);
- ItemInfo info = item->info();
- info.track = m_tracksList.count() - item->track();
- m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer());
+ info.track = m_document->tracksCount() - info.track;
+ m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
} else {
Transition *tr = static_cast <Transition*>(item);
- ItemInfo transitionInfo = tr->info();
- new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, false, moveClips);
- m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
+ int newTrack = tr->transitionEndTrack();
+ if (!tr->forcedTrack()) {
+ newTrack += trackOffset;
+ if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track);
+ }
+ tr->updateTransitionEndTrack(newTrack);
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
+
+ new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips);
m_commandStack->push(moveClips);
+
+ QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
+ //QPointF oldpos = m_selectionGroup->scenePos();
+ //kDebug()<<"SELECTION GRP POS: "<<m_selectionGroup->scenePos()<<", TOP: "<<top;
+ m_selectionGroup->setPos(top);
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
}
}
} else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
// resize start
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());
- updateClipFade((ClipItem *) m_dragItem);
- ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
+ ItemInfo resizeinfo = m_dragItemInfo;
+ resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
+ bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos);
+ if (success) {
+ updateClipFade(static_cast <ClipItem *>(m_dragItem));
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ } else {
+ m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+ }
} 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);
+ Transition *transition = static_cast <Transition *>(m_dragItem);
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
//m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
// resize end
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);
+ ItemInfo resizeinfo = info;
+ resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
+ bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos);
+ if (success) {
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ updateClipFade(static_cast <ClipItem *>(m_dragItem), true);
+ } else {
+ m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+ }
} 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);
+ Transition *transition = static_cast <Transition *>(m_dragItem);
+ m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
//m_document->renderer()->doRefresh();
} else if (m_operationMode == FADEIN) {
// resize fade in effect
ClipItem * item = (ClipItem *) m_dragItem;
- QStringList clipeffects = item->effectNames();
- if (clipeffects.contains(i18n("Fade in"))) {
- int ix = clipeffects.indexOf(i18n("Fade in"));
+ int ix = item->hasEffect("volume", "fadein");
+ if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
slotDeleteEffect(item, oldeffect);
} else {
end += start;
- QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect, ix);
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
}
} else if (item->fadeIn() != 0) {
- QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
- int start = item->cropStart().frames(m_document->fps());
- int end = item->fadeIn() + start;
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
+ QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadein").cloneNode().toElement();
+ EffectsList::setParameter(effect, "out", QString::number(item->fadeIn()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
} else if (m_operationMode == FADEOUT) {
// resize fade in effect
ClipItem * item = (ClipItem *) m_dragItem;
- QStringList clipeffects = item->effectNames();
- if (clipeffects.contains(i18n("Fade out"))) {
- int ix = clipeffects.indexOf(i18n("Fade out"));
+ int ix = item->hasEffect("volume", "fadeout");
+ if (ix != -1) {
QDomElement oldeffect = item->effectAt(ix);
int end = (item->duration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
slotDeleteEffect(item, oldeffect);
} else {
start = end - start;
- QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect, ix);
+ QDomElement effect = oldeffect.cloneNode().toElement();
+ EffectsList::setParameter(oldeffect, "in", QString::number(start));
+ EffectsList::setParameter(oldeffect, "out", QString::number(end));
+ slotUpdateClipEffect(item, effect, oldeffect, ix);
+ emit clipItemSelected(item, ix);
}
} else if (item->fadeOut() != 0) {
- QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
- int end = (item->duration() + item->cropStart()).frames(m_document->fps());
- int start = end - item->fadeOut();
- EffectsList::setParameter(effect, "in", QString::number(start));
- EffectsList::setParameter(effect, "out", QString::number(end));
+ QDomElement effect = MainWindow::audioEffects.getEffectByTag("volume", "fadeout").cloneNode().toElement();
+ EffectsList::setParameter(effect, "out", QString::number(item->fadeOut()));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
} else if (m_operationMode == KEYFRAME) {
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
- emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
+ emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? static_cast <Transition *>(m_dragItem) : NULL);
m_document->setModified(true);
m_operationMode = NONE;
}
void CustomTrackView::deleteClip(ItemInfo info) {
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
- if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to delete at...";// << rect.x();
+
+ if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage);
return;
}
if (item->isSelected()) emit clipItemSelected(NULL);
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
+
+ if (item->baseClip()->isTransparent()) {
+ // also remove automatic transition
+ Transition *tr = getTransitionItemAt((int) info.startPos.frames(m_document->fps()), info.track);
+ if (tr && tr->isAutomatic()) {
+ m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ scene()->removeItem(tr);
+ delete tr;
+ }
+ }
+ scene()->removeItem(item);
+ if (m_dragItem == item) m_dragItem = NULL;
delete item;
- m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos);
m_document->renderer()->doRefresh();
}
return;
}
QUndoCommand *deleteSelected = new QUndoCommand();
- deleteSelected->setText("Delete selected items");
+ deleteSelected->setText(i18n("Delete selected items"));
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
ItemInfo info = item->info();
- int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), 100, 1, 300);
+ int percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300);
double speed = (double) percent / 100.0;
- new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
+ if (item->speed() != speed)
+ new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
}
}
m_commandStack->push(changeSelected);
}
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, double speed, int id) {
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
- info.track = m_tracksList.count() - item->track();
- int newLength = m_document->renderer()->mltChangeClipSpeed(info, speed, baseclip->producer());
- GenTime maxDuration(newLength, m_document->fps());
- item->setMaxDuration(maxDuration);
+ info.track = m_document->tracksCount() - item->track();
+ int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
+ //kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
item->setSpeed(speed);
- if (maxDuration < item->duration()) {
- info = item->info();
- ItemInfo endInfo = info;
- endInfo.endPos = info.startPos + maxDuration;
- ResizeClipCommand *command = new ResizeClipCommand(this, info, endInfo, true);
- m_commandStack->push(command);
- }
+ item->updateRectGeometry();
+ if (item->cropDuration().frames(m_document->fps()) > endPos)
+ item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
+ m_document->setModified(true);
}
void CustomTrackView::cutSelectedClips() {
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);
+ ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+ if (currentPos > item->startPos() && currentPos < item->endPos()) {
+ RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true);
m_commandStack->push(command);
}
}
}
}
-void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info, EffectsList effects) {
+void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
- ClipItem *item = new ClipItem(baseclip, info, m_scale, m_document->fps());
+ if (baseclip == NULL) {
+ emit displayMessage(i18n("No clip copied"), ErrorMessage);
+ return;
+ }
+ ClipItem *item = new ClipItem(baseclip, info, m_document->fps());
item->setEffectList(effects);
scene()->addItem(item);
+ if (item->baseClip()->isTransparent()) {
+ // add transparency transition
+ int endTrack = getPreviousVideoTrack(info.track);
+ Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "alphatransparency"), true);
+ scene()->addItem(tr);
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ }
+
baseclip->addReference();
m_document->updateClip(baseclip->getId());
- info.track = m_tracksList.count() - info.track;
- m_document->renderer()->mltInsertClip(info, xml, baseclip->producer());
+ info.track = m_document->tracksCount() - info.track;
+ m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track));
for (int i = 0; i < item->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
}
m_document->renderer()->doRefresh();
}
-void CustomTrackView::slotUpdateClip(int clipId) {
+void CustomTrackView::slotUpdateClip(const QString &clipId) {
QList<QGraphicsItem *> list = scene()->items();
ClipItem *clip = NULL;
for (int i = 0; i < list.size(); ++i) {
if (clip->clipProducer() == clipId) {
clip->refreshClip();
ItemInfo info = clip->info();
- info.track = m_tracksList.count() - clip->track();
+ info.track = m_document->tracksCount() - clip->track();
m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
}
}
}
ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2));
ClipItem *clip = NULL;
for (int i = 0; i < list.size(); ++i) {
if (list.at(i)->type() == AVWIDGET) {
}
ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) {
- int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ int framepos = (int)(pos.frames(m_document->fps()));
return getClipItemAt(framepos, track);
}
Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, (track + 1) * m_tracksHeight));
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight));
Transition *clip = NULL;
for (int i = 0; i < list.size(); ++i) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
}
Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
- int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ int framepos = (int)(pos.frames(m_document->fps()));
return getTransitionItemAt(framepos, track);
}
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
+ if (m_selectionGroup) resetSelectionGroup(false);
ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
- emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", QString::number(start.startPos.seconds(), 'g', 2), start.track), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
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();
- bool success = 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()));
+ bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track));
if (success) {
- item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track);
+ item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+ m_scene->clearSelection();
+ item->setSelected(true);
+ if (item->baseClip()->isTransparent()) {
+ // Also move automatic transition
+ Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track);
+ if (tr && tr->isAutomatic()) {
+ tr->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
+ m_document->renderer()->mltMoveTransition(tr->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, tr->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+ tr->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+ }
+ }
} else {
// undo last move and emit error message
- emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(end.startPos.seconds(), 'g', 2)), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
+ }
+}
+
+void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove) {
+ // Group Items
+ kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;
+ resetSelectionGroup();
+ m_scene->clearSelection();
+ for (int i = 0; i < startClip.count(); i++) {
+ if (reverseMove) {
+ startClip[i].startPos = startClip.at(i).startPos - offset;
+ startClip[i].track = startClip.at(i).track - trackOffset;
+ }
+ ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
+ if (clip) {
+ clip->setSelected(true);
+ m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
+ }
+ }
+ for (int i = 0; i < startTransition.count(); i++) {
+ if (reverseMove) {
+ startTransition[i].startPos = startTransition.at(i).startPos - offset;
+ startTransition[i].track = startTransition.at(i).track - trackOffset;
+ }
+ Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track);
+ if (tr) {
+ tr->setSelected(true);
+ m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
+ }
}
+ groupSelectedItems();
+ if (m_selectionGroup) {
+ QPointF pos = m_selectionGroup->pos();
+ qreal posx = pos.x() + offset.frames(m_document->fps());
+ qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight;
+ m_selectionGroup->setPos(posx, posy);
+
+ QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
+ m_selectionGroup->setPos(top);
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
+
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ // re-add items in correct place
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ item->updateItem();
+ ItemInfo info = item->info();
+ if (item->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem*>(item);
+ info.track = m_document->tracksCount() - info.track;
+ m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
+ } else {
+ Transition *tr = static_cast <Transition*>(item);
+ int newTrack = tr->transitionEndTrack();
+ kDebug() << "/// TRANSITION CURR TRK: " << newTrack;
+ if (!tr->forcedTrack()) {
+ newTrack += trackOffset;
+ if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track);
+ }
+ tr->updateTransitionEndTrack(newTrack);
+ kDebug() << "/// TRANSITION UPDATED TRK: " << newTrack;
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
+ }
+ }
+ }
+
}
void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
- Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
+ Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()), start.track);
if (!item) {
- emit displayMessage(i18n("Cannot move transition at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
+ emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
//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);
+ item->setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1);
} else if (end.endPos == start.endPos) {
// Transition start resize
- item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
+ item->resizeStart((int) end.startPos.frames(m_document->fps()));
} else {
// Transition end resize;
- item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
+ item->resizeEnd((int) end.endPos.frames(m_document->fps()));
}
//item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), 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);
+ m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
}
void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
else offset = -1;*/
ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
if (!item) {
- emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
}
if (resizeClipStart) {
- 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);
- updateClipFade(item);
+ ItemInfo clipinfo = item->info();
+ clipinfo.track = m_document->tracksCount() - clipinfo.track;
+ bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos());
+ if (success) {
+ item->resizeStart((int) end.startPos.frames(m_document->fps()));
+ updateClipFade(item);
+ } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
} else {
- m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.endPos - item->startPos());
- item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
- updateClipFade(item, true);
+ ItemInfo clipinfo = item->info();
+ clipinfo.track = m_document->tracksCount() - clipinfo.track;
+ bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
+ if (success) {
+ item->resizeEnd((int) end.endPos.frames(m_document->fps()));
+ updateClipFade(item, true);
+ } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
m_document->renderer()->doRefresh();
}
int end = item->fadeIn();
if (end != 0) {
// there is a fade in effect
- QStringList clipeffects = item->effectNames();
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+ int effectPos = item->hasEffect("volume", "fadein");
+ if (effectPos == -1) return;
+ QDomElement oldeffect = item->effectAt(effectPos);
int start = item->cropStart().frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeIn(max);
+ end = item->fadeIn();
+ }
end += start;
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
- QMap <QString, QString> effectParams = item->getEffectArgs(oldeffect);
- if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams))
+ QHash <QString, QString> effectParams = item->getEffectArgs(oldeffect);
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
} else {
int start = item->fadeOut();
if (start != 0) {
// there is a fade in effect
- QStringList clipeffects = item->effectNames();
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+ int effectPos = item->hasEffect("volume", "fadeout");
+ if (effectPos == -1) return;
+ QDomElement oldeffect = item->effectAt(effectPos);
int end = (item->duration() - item->cropStart()).frames(m_document->fps());
+ int max = item->cropDuration().frames(m_document->fps());
+ if (end > max) {
+ item->setFadeOut(max);
+ start = item->fadeOut();
+ }
start = end - start;
EffectsList::setParameter(oldeffect, "in", QString::number(start));
EffectsList::setParameter(oldeffect, "out", QString::number(end));
- QMap <QString, QString> effectParams = item->getEffectArgs(oldeffect);
- if (m_document->renderer()->mltEditEffect(m_tracksList.count() - item->track(), item->startPos(), effectParams))
+ QHash <QString, QString> effectParams = item->getEffectArgs(oldeffect);
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ // if fade effect is displayed, update the effect edit widget with new clip duration
+ if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
}
}
}
double CustomTrackView::getSnapPointForPos(double pos) {
- for (int i = 0; i < m_snapPoints.size(); ++i) {
- if (abs((int)(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale)) < 10) {
- //kDebug()<<" FOUND SNAP POINT AT: "<<m_snapPoints.at(i)<<", current pos: "<<pos / m_scale;
- return m_snapPoints.at(i).frames(m_document->fps()) * m_scale + 0.5;
- }
- if (m_snapPoints.at(i).frames(m_document->fps() * m_scale) > pos) break;
- }
- return pos;
+ return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints());
}
void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
- m_snapPoints.clear();
- if (!KdenliveSettings::snaptopoints()) return;
+ QList <GenTime> snaps;
GenTime offset;
if (selected) offset = selected->duration();
QList<QGraphicsItem *> itemList = items();
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
GenTime start = item->startPos();
GenTime end = item->endPos();
- m_snapPoints.append(start);
- m_snapPoints.append(end);
+ snaps.append(start);
+ snaps.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);
+ snaps.append(t);
+ if (t > offset) snaps.append(t - offset);
}
if (offset != GenTime()) {
- if (start > offset) m_snapPoints.append(start - offset);
- if (end > offset) m_snapPoints.append(end - offset);
+ if (start > offset) snaps.append(start - offset);
+ if (end > offset) snaps.append(end - offset);
}
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *transition = static_cast <Transition*>(itemList.at(i));
GenTime start = transition->startPos();
GenTime end = transition->endPos();
- m_snapPoints.append(start);
- m_snapPoints.append(end);
+ snaps.append(start);
+ snaps.append(end);
if (offset != GenTime()) {
- if (start > offset) m_snapPoints.append(start - offset);
- if (end > offset) m_snapPoints.append(end - offset);
+ if (start > offset) snaps.append(start - offset);
+ if (end > offset) snaps.append(end - offset);
}
}
}
// add cursor position
GenTime pos = GenTime(m_cursorPos, m_document->fps());
- m_snapPoints.append(pos);
- if (offset != GenTime()) m_snapPoints.append(pos - offset);
+ snaps.append(pos);
+ if (offset != GenTime()) snaps.append(pos - offset);
// add guides
for (int i = 0; i < m_guides.count(); i++) {
- m_snapPoints.append(m_guides.at(i)->position());
- if (offset != GenTime()) m_snapPoints.append(m_guides.at(i)->position() - offset);
+ snaps.append(m_guides.at(i)->position());
+ if (offset != GenTime()) snaps.append(m_guides.at(i)->position() - offset);
}
- qSort(m_snapPoints);
+ qSort(snaps);
+ m_scene->setSnapList(snaps);
//for (int i = 0; i < m_snapPoints.size(); ++i)
// 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;
- }
- }
+ GenTime res = m_scene->previousSnapPoint(GenTime(m_cursorPos, m_document->fps()));
setCursorPos((int) res.frames(m_document->fps()));
checkScrolling();
}
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;
- }
- }
+ GenTime res = m_scene->nextSnapPoint(GenTime(m_cursorPos, m_document->fps()));
setCursorPos((int) res.frames(m_document->fps()));
checkScrolling();
}
void CustomTrackView::clipStart() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *item = (ClipItem *) itemList.at(i);
- setCursorPos((int) item->startPos().frames(m_document->fps()));
- checkScrolling();
- break;
- }
+ ClipItem *item = getMainActiveClip();
+ if (item != NULL) {
+ setCursorPos((int) item->startPos().frames(m_document->fps()));
+ checkScrolling();
}
}
void CustomTrackView::clipEnd() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET) {
- ClipItem *item = (ClipItem *) itemList.at(i);
- setCursorPos((int) item->endPos().frames(m_document->fps()));
- checkScrolling();
- break;
- }
- }
-}
-
-void CustomTrackView::slotAddClipMarker() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- if (itemList.count() != 1) {
- emit displayMessage(i18n("Cannot add marker if more than one clip is selected"), ErrorMessage);
- 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();
- CommentedTime marker(position, i18n("Marker"));
- MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this);
- if (d.exec() == QDialog::Accepted) {
- slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
+ ClipItem *item = getMainActiveClip();
+ if (item != NULL) {
+ setCursorPos((int) item->endPos().frames(m_document->fps()));
+ checkScrolling();
}
}
-void CustomTrackView::slotAddClipMarker(int id, GenTime t, QString c) {
+void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) {
QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t);
AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true);
m_commandStack->push(command);
}
-void CustomTrackView::slotDeleteClipMarker() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- if (itemList.count() != 1) {
- emit displayMessage(i18n("Cannot delete marker if more than one clip is selected"), ErrorMessage);
- kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
- return;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip selected"), ErrorMessage);
- return;
- }
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- if (item->startPos() > pos || item->endPos() < pos) {
- emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage);
- 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()) {
- emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage);
- return;
- }
+void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) {
AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
m_commandStack->push(command);
}
-void CustomTrackView::slotDeleteAllClipMarkers() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- if (itemList.count() != 1) {
- emit displayMessage(i18n("Cannot delete marker if more than one clip is selected"), ErrorMessage);
- kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
- return;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip selected"), ErrorMessage);
- return;
- }
-
- ClipItem *clip = static_cast <ClipItem *>(item);
- QList <CommentedTime> markers = clip->baseClip()->commentedSnapMarkers();
+void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) {
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ QList <CommentedTime> markers = base->commentedSnapMarkers();
if (markers.isEmpty()) {
emit displayMessage(i18n("Clip has no markers"), ErrorMessage);
return;
}
- int id = clip->baseClip()->getId();
QUndoCommand *deleteMarkers = new QUndoCommand();
deleteMarkers->setText("Delete clip markers");
m_commandStack->push(deleteMarkers);
}
-void CustomTrackView::slotEditClipMarker() {
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
- if (itemList.count() != 1) {
- emit displayMessage(i18n("Cannot edit marker if more than one clip is selected"), ErrorMessage);
- kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
- return;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip at cursor time"), ErrorMessage);
- return;
- }
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- if (item->startPos() > pos || item->endPos() < pos) {
- emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage);
- 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()) {
- emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage);
- return;
- }
-
- CommentedTime marker(position, oldcomment);
- MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), this);
- if (d.exec() == QDialog::Accepted) {
- if (d.newMarker().time() == position) {
- // marker position was not changed, only text
- AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, d.newMarker().comment(), id, position, true);
- m_commandStack->push(command);
- } else {
- // marker text and position were changed, remove previous marker and add new one
- AddMarkerCommand *command1 = new AddMarkerCommand(this, oldcomment, QString(), id, position, true);
- AddMarkerCommand *command2 = new AddMarkerCommand(this, QString(), d.newMarker().comment(), id, d.newMarker().time(), true);
- m_commandStack->push(command1);
- m_commandStack->push(command2);
- }
- }
-}
-
-void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString comment) {
+void CustomTrackView::addMarker(const QString &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);
viewport()->update();
}
-
+bool sortGuidesList(const Guide *g1 , const Guide *g2) {
+ return (*g1).position() < (*g2).position();
+}
void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) {
if (oldPos > GenTime() && pos > GenTime()) {
}
if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage);
}
+ qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
m_document->syncGuides(m_guides);
}
bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) {
for (int i = 0; i < m_guides.count(); i++) {
if (m_guides.at(i)->position() == pos) {
- emit displayMessage(i18n("A guide already exists at that position"), ErrorMessage);
+ emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage);
return false;
}
}
- Guide *g = new Guide(this, pos, comment, m_scale, m_document->fps(), m_tracksHeight * m_tracksList.count());
+ Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_document->tracksCount());
scene()->addItem(g);
m_guides.append(g);
+ qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
m_document->syncGuides(m_guides);
return true;
}
void CustomTrackView::slotAddGuide() {
CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide"));
- MarkerDialog d(NULL, marker, m_document->timecode(), this);
+ MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this);
if (d.exec() != QDialog::Accepted) return;
if (addGuide(d.newMarker().time(), d.newMarker().comment())) {
EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), d.newMarker().time(), d.newMarker().comment(), false);
}
void CustomTrackView::slotEditGuide(CommentedTime guide) {
- MarkerDialog d(NULL, guide, m_document->timecode(), this);
+ MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
if (d.exec() == QDialog::Accepted) {
EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true);
m_commandStack->push(command);
}
void CustomTrackView::setScale(double scaleFactor) {
- //scale(scaleFactor, scaleFactor);
+ QMatrix matrix;
+ matrix = matrix.scale(scaleFactor, 1);
+ m_scene->setScale(scaleFactor);
+ //scale(scaleFactor, 1);
m_animationTimer->stop();
if (m_visualTip) {
delete m_visualTip;
delete m_animation;
m_animation = NULL;
}
- double pos = cursorPos() / m_scale;
+ /*double pos = cursorPos() / m_scale;
m_scale = scaleFactor;
+ m_scene->setScale(m_scale);
int vert = verticalScrollBar()->value();
kDebug() << " HHHHHHHH SCALING: " << m_scale;
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
- clip->setRect(clip->startPos().frames(m_document->fps()) * m_scale, clip->rect().y(), clip->duration().frames(m_document->fps()) * m_scale, clip->rect().height());
+ clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height());
+ clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y());
}
}
}
setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
- updateCursorPos();
+ updateCursorPos();*/
+ setMatrix(matrix);
centerOn(QPointF(cursorPos(), m_tracksHeight));
- verticalScrollBar()->setValue(vert);
+ //verticalScrollBar()->setValue(vert);*/
}
void CustomTrackView::slotRefreshGuides() {
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) {
- QRect rectInView = viewport()->rect();
- rectInView.moveTo(horizontalScrollBar()->value(), verticalScrollBar()->value());
-
QColor base = palette().button().color();
- painter->setClipRect(rect);
- painter->drawLine(rectInView.left(), 0, rectInView.right(), 0);
- uint max = m_tracksList.count();
+ QRectF r = rect;
+ r.setWidth(r.width() + 1);
+ painter->setClipRect(r);
+ painter->drawLine(r.left(), 0, r.right(), 0);
+ uint max = m_document->tracksCount();
for (uint i = 0; i < max;i++) {
- if (m_tracksList.at(max - i - 1).type == AUDIOTRACK) painter->fillRect(rectInView.left(), m_tracksHeight * i + 1, rectInView.right() - rectInView.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
- painter->drawLine(rectInView.left(), m_tracksHeight * (i + 1), rectInView.right(), m_tracksHeight * (i + 1));
- //painter->drawText(QRectF(10, 50 * i, 100, 50 * i + 49), Qt::AlignLeft, i18n(" Track ") + QString::number(i + 1));
+ /*if (max - i - 1 == m_selectedTrack) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(211, 205, 147)));
+ else*/
+ if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
+ painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1));
}
- int lowerLimit = m_tracksHeight * m_tracksList.count() + 1;
+ int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
if (height() > lowerLimit)
- painter->fillRect(QRectF(rectInView.left(), lowerLimit, rectInView.width(), height() - lowerLimit), QBrush(base));
+ painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base));
}
bool CustomTrackView::findString(const QString &text) {
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *dup = static_cast <ClipItem *>(itemList.at(i));
- m_copiedItems.append(dup->clone(m_scale));
+ m_copiedItems.append(dup->clone(dup->info()));
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *dup = static_cast <Transition *>(itemList.at(i));
- m_copiedItems.append(dup->clone(m_scale));
+ m_copiedItems.append(dup->clone());
}
}
}
bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const {
- QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1));
+ QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1));
QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
for (int i = 0; i < collisions.count(); i++) {
if (collisions.at(i)->type() == type) return false;
// No clip should go below 0
return false;
}
- QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1));
+ QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1));
movePath.addRect(rect);
}
QList<QGraphicsItem *> collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect);
QPoint position;
if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos());
else position = m_menuPosition;
- GenTime pos = GenTime((int)(mapToScene(position).x() / m_scale), m_document->fps());
+ GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps());
int track = (int)(position.y() / m_tracksHeight);
ItemInfo first = m_copiedItems.at(0)->info();
if (clips.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast < ClipItem *>(clips.at(i));
for (int i = 0; i < clip->effectsCount(); i++) {
- new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), clip->effectAt(i), true, paste);
+ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), clip->effectAt(i), true, paste);
}
}
}
}
-/*
-void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect )
-{
- //kDebug()<<"///// DRAWING FB: "<<rect.x()<<", width: "<<rect.width();
- painter->fillRect(rect, QColor(50, rand() % 250,50,100));
- painter->drawLine(m_cursorPos, rect.y(), m_cursorPos, rect.y() + rect.height());
+ClipItem *CustomTrackView::getClipUnderCursor() const {
+ QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount()));
+ QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
+ for (int i = 0; i < collisions.count(); i++) {
+ if (collisions.at(i)->type() == AVWIDGET) {
+ return static_cast < ClipItem *>(collisions.at(i));
+ }
+ }
+ return NULL;
+}
+
+ClipItem *CustomTrackView::getMainActiveClip() const {
+ QList<QGraphicsItem *> clips = scene()->selectedItems();
+ if (clips.isEmpty()) {
+ return getClipUnderCursor();
+ } else {
+ ClipItem *item = NULL;
+ for (int i = 0; i < clips.count(); ++i) {
+ if (clips.at(i)->type() == AVWIDGET)
+ item = static_cast < ClipItem *>(clips.at(i));
+ if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break;
+ }
+ if (item) return item;
+ }
+ return NULL;
}
-*/
+
+ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const {
+ QList<QGraphicsItem *> clips = scene()->selectedItems();
+ if (clips.isEmpty()) {
+ return getClipUnderCursor();
+ } else {
+ ClipItem *item;
+ // remove all items in the list that are not clips
+ for (int i = 0; i < clips.count();) {
+ if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i);
+ else i++;
+ }
+ if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0));
+ for (int i = 0; i < clips.count(); ++i) {
+ if (clips.at(i)->type() == AVWIDGET)
+ item = static_cast < ClipItem *>(clips.at(i));
+ if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item;
+ }
+ }
+ return NULL;
+}
+
+void CustomTrackView::setInPoint() {
+ ClipItem *clip = getActiveClipUnderCursor(true);
+ if (clip == NULL) {
+ emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+ return;
+ }
+ ItemInfo startInfo = clip->info();
+ ItemInfo endInfo = clip->info();
+ endInfo.startPos = GenTime(m_cursorPos, m_document->fps());
+ ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::setOutPoint() {
+ ClipItem *clip = getActiveClipUnderCursor(true);
+ if (clip == NULL) {
+ emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+ return;
+ }
+ ItemInfo startInfo = clip->info();
+ ItemInfo endInfo = clip->info();
+ endInfo.endPos = GenTime(m_cursorPos, m_document->fps());
+ ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotUpdateAllThumbs() {
+ QList<QGraphicsItem *> itemList = items();
+ //if (itemList.isEmpty()) return;
+ ClipItem *item;
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ item = static_cast <ClipItem *>(itemList.at(i));
+ item->refreshClip();
+ qApp->processEvents();
+ }
+ }
+}
+
+void CustomTrackView::slotInsertTrack(int ix) {
+ kDebug() << "// INSERTING TRK: " << ix;
+ QDialog d(parentWidget());
+ Ui::AddTrack_UI view;
+ view.setupUi(&d);
+ view.track_nb->setMaximum(m_document->tracksCount() - 1);
+ view.track_nb->setValue(ix);
+ d.setWindowTitle(i18n("Insert Track"));
+
+ if (d.exec() == QDialog::Accepted) {
+ if (view.before_select->currentIndex() == 1) {
+ ix++;
+ }
+ TrackInfo info;
+ if (view.video_track->isChecked()) {
+ info.type = VIDEOTRACK;
+ info.isMute = false;
+ info.isBlind = false;
+ } else {
+ info.type = AUDIOTRACK;
+ info.isMute = false;
+ info.isBlind = true;
+ }
+ AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
+ m_commandStack->push(addTrack);
+ m_document->setModified(true);
+ }
+}
+
+void CustomTrackView::slotDeleteTrack(int ix) {
+ bool ok;
+ ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok);
+ if (ok) {
+ TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
+ deleteTimelineTrack(ix, info);
+ m_document->setModified(true);
+ /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true);
+ m_commandStack->push(command);*/
+ }
+}
+
+void CustomTrackView::slotChangeTrack(int ix) {
+ QDialog d(parentWidget());
+ Ui::AddTrack_UI view;
+ view.setupUi(&d);
+ view.label->setText(i18n("Change track"));
+ view.before_select->setHidden(true);
+ view.track_nb->setMaximum(m_document->tracksCount() - 1);
+ view.track_nb->setValue(ix);
+ d.setWindowTitle(i18n("Change Track Type"));
+
+ if (d.exec() == QDialog::Accepted) {
+ TrackInfo info;
+ if (view.video_track->isChecked()) {
+ info.type = VIDEOTRACK;
+ info.isMute = false;
+ info.isBlind = false;
+ } else {
+ info.type = AUDIOTRACK;
+ info.isMute = false;
+ info.isBlind = true;
+ }
+ changeTimelineTrack(ix, info);
+ m_document->setModified(true);
+ }
+}
+
+
+void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) {
+ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+ QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1);
+ QList<QGraphicsItem *> selection = m_scene->items(r);
+ QUndoCommand *deleteTrack = new QUndoCommand();
+ deleteTrack->setText("Delete track");
+
+ // Delete all clips in selected track
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ ClipItem *item = static_cast <ClipItem *>(selection.at(i));
+ new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, true, deleteTrack);
+ m_scene->removeItem(item);
+ delete item;
+ item = NULL;
+ } else if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *item = static_cast <Transition *>(selection.at(i));
+ new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, false, deleteTrack);
+ m_scene->removeItem(item);
+ delete item;
+ item = NULL;
+ }
+ }
+
+ new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack);
+ m_commandStack->push(deleteTrack);
+}
+
+void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) {
+ TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix);
+ ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true);
+ m_commandStack->push(changeTrack);
+}
+
#include "customtrackview.moc"
projects / kdenlive / blobdiff