#include <KCursor>
#include "customtrackview.h"
+#include "docclipbase.h"
#include "clipitem.h"
#include "definitions.h"
#include "moveclipcommand.h"
+#include "movetransitioncommand.h"
#include "resizeclipcommand.h"
#include "addtimelineclipcommand.h"
#include "addeffectcommand.h"
#include "editeffectcommand.h"
+#include "addtransitioncommand.h"
+#include "edittransitioncommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
+#include "clipitem.h"
+#include "customtrackview.h"
+#include "clipmanager.h"
+#include "renderer.h"
+//TODO:
+// disable animation if user asked it in KDE's global settings
+// http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
+// needs something like below (taken from dolphin)
+// #include <kglobalsettings.h>
+// 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_tracksCount(0), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_startPos(QPointF()), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(0), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()) {
+ : 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()) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
QColor border = QColor(255, 255, 255, 100);
m_tipPen.setColor(border);
m_tipPen.setWidth(3);
-
setContentsMargins(0, 0, 0, 0);
if (projectscene) {
- m_cursorLine = projectscene->addLine(0, 0, 0, 50);
+ m_cursorLine = projectscene->addLine(0, 0, 0, m_tracksHeight);
m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
m_cursorLine->setZValue(1000);
}
}
+void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
+ m_timelineContextMenu = timeline;
+ m_timelineContextClipMenu = clip;
+ m_timelineContextTransitionMenu = transition;
+}
+
void CustomTrackView::checkAutoScroll() {
m_autoScroll = KdenliveSettings::autoscroll();
}
+QList <TrackInfo> CustomTrackView::tracksList() const {
+ return m_tracksList;
+}
+
+void CustomTrackView::checkTrackHeight() {
+ if (m_tracksHeight == KdenliveSettings::trackheight()) return;
+ m_tracksHeight = KdenliveSettings::trackheight();
+ emit trackHeightChanged();
+ QList<QGraphicsItem *> itemList = items();
+ ClipItem *item;
+ Transition *transitionitem;
+ 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->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);
+ }
+ }
+ 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());
+ update();
+}
+
// virtual
void CustomTrackView::resizeEvent(QResizeEvent * event) {
QGraphicsView::resizeEvent(event);
}
}
+int CustomTrackView::getPreviousVideoTrack(int track) {
+ track = m_tracksList.count() - track - 1;
+ int videoTracksCount = 0;
+ track --;
+ for (int i = track; i > -1; i--) {
+ if (m_tracksList.at(i).type == VIDEOTRACK) return i + 1;
+ }
+ return 0;
+}
// virtual
void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
int pos = event->x();
- emit mousePosition(mapToScene(event->pos()).x() / m_scale);
+ emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale));
/*if (event->modifiers() == Qt::ControlModifier)
setDragMode(QGraphicsView::ScrollHandDrag);
else if (event->modifiers() == Qt::ShiftModifier)
if (m_dragItem) { //event->button() == Qt::LeftButton) {
// a button was pressed, delete visual tips
if (m_operationMode == MOVE) {
- double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint);
- //kDebug()<<"/////// MOVE CLIP, EVENT Y: "<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- int moveTrack = (int) mapToScene(event->pos()).y() / 50;
+ double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x());
+ //kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
+ int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_tracksHeight - m_clickPoint.y() : 0))).y() / m_tracksHeight;
int currentTrack = m_dragItem->track();
- if (moveTrack > m_tracksCount - 1) moveTrack = m_tracksCount - 1;
+ if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
else if (moveTrack < 0) moveTrack = 0;
int offset = moveTrack - currentTrack;
- if (offset != 0) offset = 50 * offset;
- m_dragItem->moveTo(snappedPos / m_scale, m_scale, offset, moveTrack);
+ if (offset != 0) offset = m_tracksHeight * offset;
+ m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack);
} else if (m_operationMode == RESIZESTART) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeStart(snappedPos / m_scale, m_scale);
+ m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale);
} else if (m_operationMode == RESIZEEND) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x());
- m_dragItem->resizeEnd(snappedPos / m_scale, m_scale);
+ m_dragItem->resizeEnd((int)(snappedPos / m_scale), m_scale);
} else if (m_operationMode == FADEIN) {
- int pos = mapToScene(event->pos()).x() / m_scale;
- m_dragItem->setFadeIn(pos - m_dragItem->startPos().frames(m_document->fps()), m_scale);
+ int pos = (int)(mapToScene(event->pos()).x() / m_scale);
+ m_dragItem->setFadeIn((int)(pos - m_dragItem->startPos().frames(m_document->fps())), m_scale);
} else if (m_operationMode == FADEOUT) {
- int pos = mapToScene(event->pos()).x() / m_scale;
- m_dragItem->setFadeOut(m_dragItem->endPos().frames(m_document->fps()) - pos, m_scale);
+ int pos = (int)(mapToScene(event->pos()).x() / m_scale);
+ m_dragItem->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
}
if (m_animation) delete m_animation;
}
QList<QGraphicsItem *> itemList = items(event->pos());
- int i = 0;
- QGraphicsItem *item = NULL;
+ QGraphicsRectItem *item = NULL;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000) {
- item = itemList.at(i);
+ if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
+ item = (QGraphicsRectItem*) itemList.at(i);
break;
}
}
if (item && event->buttons() == Qt::NoButton) {
- ClipItem *clip = (ClipItem*) item;
+ AbstractClipItem *clip = (AbstractClipItem*) item;
+ OPERATIONTYPE opMode = opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
double size = 8;
- OPERATIONTYPE opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
+
if (opMode == m_moveOpMode) {
QGraphicsView::mouseMoveEvent(event);
return;
if (opMode == MOVE) {
setCursor(Qt::OpenHandCursor);
} else if (opMode == RESIZESTART) {
- setCursor(KCursor("left_side", Qt::SizeHorCursor));
+ setCursor(KCursor("left_side", Qt::SizeHorCursor));
kDebug() << "******** RESIZE CLIP START; WIDTH: " << size;
if (m_visualTip == NULL) {
QPolygon polygon;
- polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
- polygon << QPoint(clip->rect().x() + size * 2, clip->rect().y() + clip->rect().height() / 2);
- polygon << QPoint(clip->rect().x(), clip->rect().y() + clip->rect().height() / 2 + size * 2);
- polygon << QPoint(clip->rect().x(), 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((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));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
m_animationTimer->start();
}
} else if (opMode == RESIZEEND) {
- setCursor(KCursor("right_side", Qt::SizeHorCursor));
+ setCursor(KCursor("right_side", Qt::SizeHorCursor));
if (m_visualTip == NULL) {
QPolygon polygon;
- polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 - size * 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width() - size * 2, clip->rect().y() + clip->rect().height() / 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width(), clip->rect().y() + clip->rect().height() / 2 + size * 2);
- polygon << QPoint(clip->rect().x() + clip->rect().width(), 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((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));
m_visualTip = new QGraphicsPolygonItem(polygon);
((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
} else {
m_moveOpMode = NONE;
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
- setCursorPos((int) mapToScene(event->pos().x(), 0).x() / m_scale);
+ setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
}
if (m_visualTip) {
if (m_animation) delete m_animation;
// virtual
void CustomTrackView::mousePressEvent(QMouseEvent * event) {
+ activateMonitor();
int pos = event->x();
if (event->modifiers() == Qt::ControlModifier) {
setDragMode(QGraphicsView::ScrollHandDrag);
QList<QGraphicsItem *> collisionList = items(event->pos());
for (int i = 0; i < collisionList.size(); ++i) {
QGraphicsItem *item = collisionList.at(i);
- if (item->type() == 70000) {
+ if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
// select item
if (!item->isSelected()) {
QList<QGraphicsItem *> itemList = items();
item->setSelected(true);
update();
}
- m_dragItem = (ClipItem *) item;
- emit clipItemSelected(m_dragItem);
- m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale;
+
+ m_dragItem = (AbstractClipItem *) item;
+
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top()));
+ m_dragItemInfo.startPos = m_dragItem->startPos();
+ m_dragItemInfo.endPos = m_dragItem->endPos();
+ m_dragItemInfo.track = m_dragItem->track();
+
m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
- if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
- if (m_operationMode == MOVE || m_operationMode == RESIZESTART)
- m_startPos = QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track());
- else if (m_operationMode == RESIZEEND)
- m_startPos = QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track());
- else if (m_operationMode == TRANSITIONSTART) {
- Transition tra(m_dragItem, LUMA_TRANSITION, m_dragItem->startPos(), m_dragItem->startPos() + GenTime(2.5));
- m_dragItem->addTransition(tra);
+ if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
+ if (m_operationMode == TRANSITIONSTART) {
+ ItemInfo info;
+ info.startPos = m_dragItem->startPos();
+ info.endPos = info.startPos + GenTime(2.5);
+ info.track = m_dragItem->track();
+ int transitiontrack = getPreviousVideoTrack(info.track);
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, QMap<QString, QString>());
+ }
+ if (m_operationMode == TRANSITIONEND) {
+ ItemInfo info;
+ info.endPos = m_dragItem->endPos();
+ info.startPos = info.endPos - GenTime(2.5);
+ info.track = m_dragItem->track();
+ int transitiontrack = info.track - 1;
+ slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack, QMap<QString, QString>());
}
- kDebug() << "//////// ITEM CLICKED: " << m_startPos;
+ updateSnapPoints(m_dragItem);
collision = true;
break;
}
}
+ if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+ else emit transitionItemSelected((Transition*) m_dragItem);
if (!collision) {
kDebug() << "//////// NO ITEM FOUND ON CLICK";
m_dragItem = NULL;
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++)
itemList.at(i)->setSelected(false);
- emit clipItemSelected(NULL);
- setCursorPos((int) mapToScene(event->x(), 0).x() / m_scale);
+ //emit clipItemSelected(NULL);
+ if (event->button() == Qt::RightButton) {
+ displayContextMenu(event->globalPos());
+ } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale));
+ } else if (event->button() == Qt::RightButton) {
+ m_operationMode = NONE;
+ displayContextMenu(event->globalPos(), (ClipItem *) m_dragItem);
+ m_dragItem = NULL;
}
}
- updateSnapPoints(m_dragItem);
//kDebug()<<pos;
//QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::displayContextMenu(QPoint pos, ClipItem *clip) {
+ m_timelineContextClipMenu->popup(pos);
+}
+
+void CustomTrackView::activateMonitor() {
+ emit activateDocumentMonitor();
+}
+
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
kDebug() << "/////////////// DRAG ENTERED, TEXT: " << event->mimeData()->data("kdenlive/producerslist");
}
void CustomTrackView::slotRefreshEffects(ClipItem *clip) {
- int track = m_tracksCount - clip->track();
+ int track = m_tracksList.count() - clip->track();
GenTime pos = clip->startPos();
m_document->renderer()->mltRemoveEffect(track, pos, "-1", false);
for (int i = 0; i < clip->effectsCount(); i++) {
}
void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->addEffect(effect);
m_document->renderer()->mltAddEffect(track, pos, effectParams);
void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) {
QString index = effect.attribute("kdenlive_ix");
m_document->renderer()->mltRemoveEffect(track, pos, index);
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
clip->deleteEffect(index);
emit clipItemSelected(clip);
if (track == -1)
itemList = items();
else {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track);
if (clip) itemList.append(clip);
else kDebug() << "------ wrning, clip eff not found";
}
kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track;
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 && (itemList.at(i)->isSelected() || track != -1)) {
+ if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
ClipItem *item = (ClipItem *)itemList.at(i);
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
if (effect.attribute("kdenlive_ix").toInt() == 0)
effect.setAttribute("kdenlive_ix", QString::number(item->effectsCounter()));
- AddEffectCommand *command = new AddEffectCommand(this, m_tracksCount - item->track(), item->startPos(), effect, true);
+ AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), effect, true);
m_commandStack->push(command);
}
}
+ m_document->setModified(true);
}
void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) {
- AddEffectCommand *command = new AddEffectCommand(this, m_tracksCount - clip->track(), clip->startPos(), effect, false);
+ AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), effect, false);
m_commandStack->push(command);
+ m_document->setModified(true);
}
void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect) {
- ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
if (effectParams["disabled"] == "1") {
QString index = effectParams["kdenlive_ix"];
m_document->renderer()->mltRemoveEffect(track, pos, index);
- } else m_document->renderer()->mltEditEffect(m_tracksCount - clip->track(), clip->startPos(), effectParams);
+ } else m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams);
}
+ m_document->setModified(true);
}
void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable) {
QDomElement oldEffect = effect.cloneNode().toElement();
effect.setAttribute("disabled", disable);
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksCount - clip->track(), clip->startPos(), oldEffect, effect, true);
+ EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, true);
m_commandStack->push(command);
+ m_document->setModified(true);
}
void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) {
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksCount - clip->track(), clip->startPos(), oldeffect, effect, true);
+ EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true);
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QMap <QString, QString> desc, QDomElement transition) {
+ AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, desc, transition, true);
+ m_commandStack->push(command);
+ m_document->setModified(true);
+}
+
+void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QMap <QString, QString> desc, QDomElement params) {
+ Transition *tr = new Transition(transitionInfo, endTrack, m_scale, m_document->fps(), desc, 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, params);
+ m_document->setModified(true);
+}
+
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QMap <QString, QString> desc, QDomElement params) {
+ Transition *item = getTransitionItemAt((int)transitionInfo.startPos.frames(m_document->fps()) + 1, transitionInfo.track);
+ QMap < QString, QString> map;
+ m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, params);
+ delete item;
+ m_document->setModified(true);
+}
+
+void CustomTrackView::slotTransitionUpdated(QDomElement old, QDomElement newEffect) {
+ /*EditTransitionCommand *command = new EditTransitionCommand(this, newEffect.attribute("a_track").toInt(), GenTime(newEffect.attribute("start").toInt(), m_document->renderer()->fps()) , old, newEffect , true);
m_commandStack->push(command);
+ m_document->setModified(true);*/
}
+void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition) {
+
+ m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), m_tracksList.count() - 1 - transition.attribute("transition_track").toInt(), m_tracksList.count() - transition.attribute("transition_track").toInt() ,
+ GenTime(transition.attribute("start").toInt(), m_document->renderer()->fps()),
+ GenTime(transition.attribute("end").toInt(), m_document->renderer()->fps()),
+ transition);
+ repaint();
+ m_document->setModified(true);
+}
void CustomTrackView::addItem(DocClipBase *clip, QPoint pos) {
- int in = 0;
- GenTime out = clip->duration();
- //kdDebug()<<"- - - -CREATING CLIP, duration = "<<out<<", URL: "<<clip->fileURL();
- int trackTop = ((int) mapToScene(pos).y() / 50) * 50 + 1;
- m_dropItem = new ClipItem(clip, ((int) mapToScene(pos).y() / 50), GenTime(), QRectF(mapToScene(pos).x() * m_scale, trackTop, out.frames(m_document->fps()) * m_scale, 49), out, m_document->fps());
+ ItemInfo info;
+ info.startPos = GenTime((int)(mapToScene(pos).x() / m_scale), m_document->fps());
+ info.endPos = info.startPos + clip->duration();
+ info.track = (int)(pos.y() / m_tracksHeight);
+ //kDebug()<<"------------ ADDING CLIP ITEM----: "<<info.startPos.frames(25)<<", "<<info.endPos.frames(25)<<", "<<info.track;
+ m_dropItem = new ClipItem(clip, info, m_scale, m_document->fps());
scene()->addItem(m_dropItem);
}
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
- //kDebug()<<"+++++++++++++ DRAG MOVE, : "<<mapToScene(event->pos()).x()<<", SCAL: "<<m_scale;
+ kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale;
if (m_dropItem) {
- int track = (int) mapToScene(event->pos()).y() / 50; //) * (m_scale * 50) + m_scale;
- m_dropItem->moveTo(mapToScene(event->pos()).x() / m_scale, m_scale, (track - m_dropItem->track()) * 50, track);
+ int track = (int)(event->pos().y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
+ m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track);
event->setDropAction(Qt::MoveAction);
if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
event->acceptProposedAction();
void CustomTrackView::dropEvent(QDropEvent * event) {
if (m_dropItem) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->track(), m_dropItem->startPos(), m_dropItem->rect(), m_dropItem->duration(), false, false);
+ ItemInfo info;
+ info.startPos = m_dropItem->startPos();
+ info.endPos = m_dropItem->endPos();
+ info.track = m_dropItem->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), info, false, false);
m_commandStack->push(command);
m_dropItem->baseClip()->addReference();
m_document->updateClip(m_dropItem->baseClip()->getId());
- // kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<<m_tracksCount<<", DROP: "<<m_dropItem->track();
- m_document->renderer()->mltInsertClip(m_tracksCount - m_dropItem->track(), m_dropItem->startPos(), m_dropItem->xml());
+ // kDebug()<<"IIIIIIIIIIIIIIIIIIIIIIII TRAX CNT: "<<m_tracksList.count()<<", DROP: "<<m_dropItem->track();
+ m_document->renderer()->mltInsertClip(m_tracksList.count() - m_dropItem->track(), m_dropItem->startPos(), m_dropItem->xml());
+ m_document->setModified(true);
} else QGraphicsView::dropEvent(event);
m_dropItem = NULL;
}
}
void CustomTrackView::setDuration(int duration) {
- kDebug() << "///////////// PRO DUR: " << duration << ", height: " << 50 * m_tracksCount;
+ kDebug() << "///////////// PRO DUR: " << duration << ", SCALE. " << (m_projectDuration + 500) * m_scale << ", height: " << 50 * m_tracksList.count();
m_projectDuration = duration;
- scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height()); //50 * m_tracksCount);
+ setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
}
+int CustomTrackView::duration() const {
+ return m_projectDuration;
+}
-void CustomTrackView::addTrack() {
- m_tracksCount++;
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), 50 * m_tracksCount);
- //setSceneRect(0, 0, sceneRect().width(), 50 * m_tracksCount);
- //verticalScrollBar()->setMaximum(50 * m_tracksCount);
+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());
//setFixedHeight(50 * m_tracksCount);
}
void CustomTrackView::removeTrack() {
- m_tracksCount--;
- m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), 50 * m_tracksCount);
+ // 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::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);
+}
+
+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);
}
void CustomTrackView::deleteClip(int clipId) {
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000) {
+ if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->track(), item->startPos(), item->rect(), item->duration(), true, true);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true);
m_commandStack->push(command);
//delete item;
}
}
void CustomTrackView::setCursorPos(int pos, bool seek) {
- emit cursorMoved(m_cursorPos * m_scale, pos * m_scale);
+ emit cursorMoved((int)(m_cursorPos * m_scale), (int)(pos * m_scale));
m_cursorPos = pos;
m_cursorLine->setPos(pos * m_scale, 0);
if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps()));
}
int CustomTrackView::cursorPos() {
- return m_cursorPos * m_scale;
+ return (int)(m_cursorPos * m_scale);
}
void CustomTrackView::checkScrolling() {
int delta = rectInView.width() / 3;
int max = rectInView.right() + horizontalScrollBar()->value() - delta;
//kDebug() << "CURSOR POS: "<<m_cursorPos<< "Scale: "<<m_scale;
- if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 1 + m_scale);
+ if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
QGraphicsView::mouseReleaseEvent(event);
setDragMode(QGraphicsView::NoDrag);
if (m_dragItem == NULL) return;
+ ItemInfo info;
+ info.startPos = m_dragItem->startPos();
+ info.endPos = m_dragItem->endPos();
+ info.track = m_dragItem->track();
+
if (m_operationMode == MOVE) setCursor(Qt::OpenHandCursor);
- if (m_operationMode == MOVE && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
+ if (m_operationMode == MOVE) {// && m_startPos.x() != m_dragItem->startPos().frames(m_document->fps())) {
// move clip
- MoveClipCommand *command = new MoveClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), false);
- m_commandStack->push(command);
- m_document->renderer()->mltMoveClip(m_tracksCount - m_startPos.y(), m_tracksCount - m_dragItem->track(), m_startPos.x(), m_dragItem->startPos().frames(m_document->fps()));
+ if (m_dragItem->type() == AVWIDGET) {
+ MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
+ }
+ if (m_dragItem->type() == TRANSITIONWIDGET) {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
+ Transition *transition = (Transition *) m_dragItem;
+ m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_dragItemInfo.track - m_dragItem->track()), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
+
} else if (m_operationMode == RESIZESTART) {
// resize start
- ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->startPos().frames(m_document->fps()), m_dragItem->track()), true, false);
+ if (m_dragItem->type() == AVWIDGET) {
+ m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ } else if (m_dragItem->type() == TRANSITIONWIDGET) {
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ Transition *transition = (Transition *) m_dragItem;
+ m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
- m_document->renderer()->mltResizeClipStart(m_tracksCount - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), GenTime(m_startPos.x(), m_document->fps()), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
- m_commandStack->push(command);
m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND) {
// resize end
- ResizeClipCommand *command = new ResizeClipCommand(this, m_startPos, QPointF(m_dragItem->endPos().frames(m_document->fps()), m_dragItem->track()), false, false);
+ if (m_dragItem->type() == AVWIDGET) {
+ ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
+ m_commandStack->push(command);
+ } else if (m_dragItem->type() == TRANSITIONWIDGET) {
- m_document->renderer()->mltResizeClipEnd(m_tracksCount - m_dragItem->track(), m_dragItem->startPos(), m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
- m_commandStack->push(command);
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
+ m_commandStack->push(command);
+ Transition *transition = (Transition *) m_dragItem;
+ m_document->renderer()->mltMoveTransition(transition->transitionName(), (int)(m_tracksList.count() - m_dragItemInfo.track), 0, m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
+ }
m_document->renderer()->doRefresh();
}
+ m_document->setModified(true);
m_operationMode = NONE;
m_dragItem = NULL;
}
-void CustomTrackView::deleteClip(int track, GenTime startpos, const QRectF &rect) {
- ClipItem *item = getClipItemAt(startpos, track);
+void CustomTrackView::deleteClip(ItemInfo info) {
+ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to move at: " << rect.x();
+ kDebug() << "---------------- ERROR, CANNOT find clip to move at...";// << rect.x();
return;
}
item->baseClip()->removeReference();
m_document->updateClip(item->baseClip()->getId());
delete item;
- m_document->renderer()->mltRemoveClip(m_tracksCount - track, startpos);
+ m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos);
m_document->renderer()->doRefresh();
}
-void CustomTrackView::addClip(QDomElement xml, int clipId, int track, GenTime startpos, const QRectF &rect, GenTime duration) {
- QRect r(startpos.frames(m_document->fps()) * m_scale, 50 * track, duration.frames(m_document->fps()) * m_scale, 49);
+void CustomTrackView::deleteSelectedClips() {
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET && itemList.at(i)->isSelected()) {
+ ClipItem *item = (ClipItem *) itemList.at(i);
+ ItemInfo info;
+ info.startPos = item->startPos();
+ info.endPos = item->endPos();
+ info.track = item->track();
+ AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true);
+ m_commandStack->push(command);
+ }
+ }
+}
+
+void CustomTrackView::addClip(QDomElement xml, int clipId, ItemInfo info) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
- ClipItem *item = new ClipItem(baseclip, track, startpos, r, duration, m_document->fps());
+ ClipItem *item = new ClipItem(baseclip, info, m_scale, m_document->fps());
scene()->addItem(item);
baseclip->addReference();
m_document->updateClip(baseclip->getId());
- m_document->renderer()->mltInsertClip(m_tracksCount - track, startpos, xml);
+ m_document->renderer()->mltInsertClip(m_tracksList.count() - info.track, info.startPos, xml);
m_document->renderer()->doRefresh();
}
ClipItem *CustomTrackView::getClipItemAt(int pos, int track) {
- return (ClipItem *) scene()->itemAt(pos * m_scale, track * 50 + 25);
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ ClipItem *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == AVWIDGET) {
+ clip = static_cast <ClipItem *>(list.at(i));
+ break;
+ }
+ }
+ return clip;
}
ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) {
- return (ClipItem *) scene()->itemAt(pos.frames(m_document->fps()) * m_scale, track * 50 + 25);
+ int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ return getClipItemAt(framepos, track);
+}
+
+Transition *CustomTrackView::getTransitionItemAt(int pos, int track) {
+ QList<QGraphicsItem *> list = scene()->items(QPointF(pos * m_scale, track * m_tracksHeight + m_tracksHeight / 2));
+ Transition *clip = NULL;
+ for (int i = 0; i < list.size(); ++i) {
+ if (list.at(i)->type() == TRANSITIONWIDGET) {
+ clip = static_cast <Transition *>(list.at(i));
+ break;
+ }
+ }
+ return clip;
+}
+
+Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) {
+ int framepos = (int)(pos.frames(m_document->fps()) * m_scale);
+ return getTransitionItemAt(framepos, track);
+}
+
+void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
+ ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
+ if (!item) {
+ kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
+ return;
+ }
+ //kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << startPos.y() << " TO " << endPos.y();
+ item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track);
+ m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - start.track), (int)(m_tracksList.count() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()));
}
-void CustomTrackView::moveClip(const QPointF &startPos, const QPointF &endPos) {
- ClipItem *item = getClipItemAt(startPos.x() + 1, startPos.y());
+void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
+ Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to move at: " << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * 50 + 25;
+ kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
- kDebug() << "---------------- Move CLIP FROM: " << startPos.x() << ", END:" << endPos.x();
- item->moveTo(endPos.x(), m_scale, (endPos.y() - startPos.y()) * 50, endPos.y());
- m_document->renderer()->mltMoveClip(m_tracksCount - startPos.y(), m_tracksCount - endPos.y(), startPos.x(), endPos.x());
+ //kDebug() << "---------------- Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
+
+ //kDebug()<<"/// RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")";
+ if (end.endPos - end.startPos == start.endPos - start.startPos) {
+ // Transition was moved
+ item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (end.track - start.track) * m_tracksHeight, end.track);
+ } else if (end.endPos == start.endPos) {
+ // Transition start resize
+ item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
+ } else {
+ // Transition end resize;
+ item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
+ }
+ //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
+ m_document->renderer()->mltMoveTransition(item->transitionName(), m_tracksList.count() - start.track, start.track - end.track, start.startPos, start.endPos, end.startPos, end.endPos);
}
-void CustomTrackView::resizeClip(const QPointF &startPos, const QPointF &endPos, bool resizeClipStart) {
+void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
int offset;
+ bool resizeClipStart = true;
+ if (start.startPos == end.startPos) resizeClipStart = false;
if (resizeClipStart) offset = 1;
else offset = -1;
- ClipItem *item = getClipItemAt(startPos.x() + offset, startPos.y());
+ ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to resize at: " << startPos;
+ kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
}
- qreal diff = endPos.x() - startPos.x();
if (resizeClipStart) {
- m_document->renderer()->mltResizeClipStart(m_tracksCount - item->track(), item->endPos(), GenTime(endPos.x(), m_document->fps()), item->startPos(), item->cropStart() + GenTime(diff, m_document->fps()), item->cropStart() + GenTime(diff, m_document->fps()) + item->endPos() - GenTime(endPos.x(), m_document->fps()));
- item->resizeStart(endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipStart(m_tracksList.count() - item->track(), item->endPos(), end.startPos, item->startPos(), item->cropStart() + end.startPos - start.startPos, item->cropStart() + end.startPos - start.startPos + item->endPos() - end.startPos);
+ item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
} else {
- m_document->renderer()->mltResizeClipEnd(m_tracksCount - item->track(), item->startPos(), item->cropStart(), item->cropStart() + GenTime(endPos.x(), m_document->fps()) - item->startPos());
- item->resizeEnd(endPos.x(), m_scale);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos());
+ item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale);
}
m_document->renderer()->doRefresh();
}
double CustomTrackView::getSnapPointForPos(double pos) {
for (int i = 0; i < m_snapPoints.size(); ++i) {
- if (abs(pos - m_snapPoints.at(i).frames(m_document->fps()) * m_scale) < 10) {
+ 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;
}
return pos;
}
-void CustomTrackView::updateSnapPoints(ClipItem *selected) {
+void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
m_snapPoints.clear();
GenTime offset;
if (selected) offset = selected->duration();
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000 && itemList.at(i) != selected) {
- ClipItem *item = (ClipItem *)itemList.at(i);
+ if (itemList.at(i)->type() == AVWIDGET && itemList.at(i) != selected) {
+ ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
GenTime start = item->startPos();
GenTime end = item->endPos();
m_snapPoints.append(start);
if (start > offset) m_snapPoints.append(start - offset);
if (end > offset) m_snapPoints.append(end - offset);
}
+ } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *transition = static_cast <Transition*>(itemList.at(i));
+ GenTime start = transition->startPos();
+ GenTime end = transition->endPos();
+ m_snapPoints.append(start);
+ m_snapPoints.append(end);
+ if (offset != GenTime()) {
+ if (start > offset) m_snapPoints.append(start - offset);
+ if (end > offset) m_snapPoints.append(end - offset);
+ }
}
}
qSort(m_snapPoints);
QList<QGraphicsItem *> itemList = items();
for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == 70000) {
- ClipItem *clip = (ClipItem *)itemList.at(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());
}
}
updateCursorPos();
- centerOn(QPointF(cursorPos(), 50));
- scene()->setSceneRect(0, 0, (m_projectDuration + 500) * m_scale, scene()->sceneRect().height());
+ centerOn(QPointF(cursorPos(), m_tracksHeight));
+ setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) {
QColor base = palette().button().color();
painter->setClipRect(rect);
painter->drawLine(rectInView.left(), 0, rectInView.right(), 0);
- for (uint i = 0; i < m_tracksCount;i++) {
- painter->drawLine(rectInView.left(), 50 * (i + 1), rectInView.right(), 50 * (i + 1));
- painter->drawText(QRectF(10, 50 * i, 100, 50 * i + 49), Qt::AlignLeft, i18n(" Track ") + QString::number(i + 1));
+ uint max = m_tracksList.count();
+ 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));
}
- int lowerLimit = 50 * m_tracksCount + 1;
+ int lowerLimit = m_tracksHeight * m_tracksList.count() + 1;
if (height() > lowerLimit)
painter->fillRect(QRectF(rectInView.left(), lowerLimit, rectInView.width(), height() - lowerLimit), QBrush(base));
}
projects / kdenlive / blobdiff