X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcustomtrackview.cpp;h=429ce27297751df61c296a5711d5485ad2772a05;hb=5bac38471d4c90a8a520d6ec32b90913b6f0dbcb;hp=5dfc7344ee9ca5e5f9f7a3d68bb9cb75245a668f;hpb=d5b4fe2e78d8b2645cdc2ac007c1006a151875c0;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 5dfc7344..429ce272 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -67,7 +67,6 @@ #include #include #include -#include #include #include @@ -124,7 +123,8 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen m_menuPosition(), m_blockRefresh(false), m_selectionGroup(NULL), - m_selectedTrack(0) + m_selectedTrack(0), + m_controlModifier(false) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack = NULL; @@ -134,8 +134,9 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen setLineWidth(0); //setCacheMode(QGraphicsView::CacheBackground); //setViewportUpdateMode(QGraphicsView::FullViewportUpdate); + setAutoFillBackground(false); setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); - + m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())); pixmapCache = new KPixmapCache("kdenlive-thumbs"); KdenliveSettings::setTrackheight(m_tracksHeight); m_animationTimer = new QTimeLine(800); @@ -279,7 +280,7 @@ void CustomTrackView::checkTrackHeight() } } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); @@ -394,7 +395,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } } else if (m_operationMode == RESIZESTART && move) { m_document->renderer()->pause(); - if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) parent->resizeStart((int)(snappedPos) - m_dragItemInfo.startPos.frames(m_document->fps())); @@ -403,7 +404,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } } else if (m_operationMode == RESIZEEND && move) { m_document->renderer()->pause(); - if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) parent->resizeEnd((int)(snappedPos) - m_dragItemInfo.endPos.frames(m_document->fps())); @@ -938,6 +939,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); + m_controlModifier = (event->modifiers() == Qt::ControlModifier); // Update snap points if (m_selectionGroup == NULL) { @@ -1791,7 +1793,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE return; } QDomElement effect = insertedEffect.cloneNode().toElement(); - kDebug() << "// update effect ix: " << effect.attribute("kdenlive_ix"); + //kDebug() << "// update effect ix: " << effect.attribute("kdenlive_ix")<<", TRACK: "<renderer()->mltEditEffect(m_document->tracksCount() - track, pos, effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); m_document->setTrackEffect(m_document->tracksCount() - track - 1, ix, effect); - emit updateTrackEffectState(track - 1); + emit updateTrackEffectState(track); setDocumentModified(); return; @@ -1990,6 +1992,10 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo slotRefreshEffects(item); if (dup->checkKeyFrames()) slotRefreshEffects(dup); + + updatePanZoom(item); + updatePanZoom(dup, cutTime - item->startPos()); + item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); @@ -2031,6 +2037,9 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + + updatePanZoom(item); + setDocumentModified(); } else { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -2200,7 +2209,8 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr return; } bool force = false; - if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true; + if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) + force = true; 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, force); //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<setTransitionParameters(transition); @@ -2561,7 +2571,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); emit tracksChanged(); @@ -2634,7 +2645,7 @@ void CustomTrackView::removeTrack(int ix) l.setP2(QPointF(l.x2(), maxHeight)); m_guides.at(i)->setLine(l); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); @@ -3349,7 +3360,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { // resize start - if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) { QUndoCommand *resizeCommand = new QUndoCommand(); @@ -3373,7 +3384,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end - if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + if (!m_controlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { AbstractGroupItem *parent = static_cast (m_dragItem->parentItem()); if (parent) { QUndoCommand *resizeCommand = new QUndoCommand(); @@ -4394,6 +4405,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol TODO: cleanup the effect update process */ ClipItem *clip = static_cast < ClipItem * >(item); + updatePositionEffects(clip, oldInfo); // check keyframes @@ -4409,13 +4421,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol } } - /*int panZoomPos = clip->hasEffect("affine", "pan_zoom"); - if (panZoomPos != -1) { - doc.appendChild(doc.importNode(clip->effectAt(panZoomPos), true)); - indexes.append(panZoomPos); - }*/ - - if (clip->checkEffectsKeyframesPos(oldInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true, m_document->width(), m_document->height())) { + if (clip->checkEffectsKeyframesPos(oldInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) { // Keyframes were modified, updateClip QDomNodeList effs = doc.elementsByTagName("effect"); // Hack: @@ -4494,7 +4500,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI if (item->type() == AVWIDGET) { ItemInfo resizeinfo = info; resizeinfo.track = m_document->tracksCount() - resizeinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos); + bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.cropDuration); if (success) { // Check if there is an automatic transition on that clip (lower track) Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track); @@ -4518,8 +4524,11 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } - // check keyframes ClipItem *clip = static_cast < ClipItem * >(item); + + updatePositionEffects(clip, oldInfo); + + // check keyframes QDomDocument doc; QDomElement root = doc.createElement("list"); doc.appendChild(root); @@ -4532,7 +4541,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } } - if (clip->checkEffectsKeyframesPos((oldInfo.cropStart + oldInfo.endPos - oldInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false, m_document->width(), m_document->height())) { + if (clip->checkEffectsKeyframesPos((oldInfo.cropStart + oldInfo.endPos - oldInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) { // Keyframes were modified, updateClip QDomNodeList effs = doc.elementsByTagName("effect"); // Hack: @@ -4550,8 +4559,6 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } else { new ResizeClipCommand(this, oldInfo, info, false, false, command); } - - updatePositionEffects(clip, oldInfo); } else { KdenliveSettings::setSnaptopoints(false); item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps())); @@ -4676,23 +4683,7 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info) } } - effectPos = item->hasEffect("affine", "pan_zoom"); - if (effectPos != -1) { - QDomElement oldeffect = item->effectAt(effectPos); - int start = item->cropStart().frames(m_document->fps()); - int max = start + item->cropDuration().frames(m_document->fps()); - if (start < 0) { - max -= start; - start = 0; - } - oldeffect.setAttribute("in", start); - oldeffect.setAttribute("out", max); - - if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(oldeffect))) - emit displayMessage(i18n("Problem editing effect"), ErrorMessage); - // if effect is displayed, update the effect edit widget with new clip duration - if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos); - } + updatePanZoom(item); } double CustomTrackView::getSnapPointForPos(double pos) @@ -4765,6 +4756,11 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList zone(); + snaps.append(GenTime(z.x(), m_document->fps())); + snaps.append(GenTime(z.y(), m_document->fps())); + qSort(snaps); m_scene->setSnapList(snaps); //for (int i = 0; i < m_snapPoints.size(); ++i) @@ -5007,13 +5003,12 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) newmatrix = newmatrix.scale(scaleFactor, verticalScale); m_scene->setScale(scaleFactor, verticalScale); removeTipAnimation(); - double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); bool adjust = false; if (verticalScale != matrix().m22()) adjust = true; setMatrix(newmatrix); if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight); + m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { QLineF l = m_guides.at(i)->line(); l.setP2(QPointF(l.x2(), newHeight)); @@ -5029,6 +5024,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } + double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y(); centerOn(QPointF(cursorPos(), verticalPos)); } @@ -5042,35 +5038,27 @@ void CustomTrackView::slotRefreshGuides() void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect) { - //kDebug() << "// DRAW BG: " << rect.width(); painter->setClipRect(rect); - KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window); QPen pen1 = painter->pen(); - pen1.setColor(scheme.shade(KColorScheme::DarkShade)); + pen1.setColor(palette().dark().color()); painter->setPen(pen1); double min = rect.left(); double max = rect.right(); painter->drawLine(QPointF(min, 0), QPointF(max, 0)); int maxTrack = m_document->tracksCount(); - QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color(); + QColor lockedColor = palette().button().color(); QColor audioColor = palette().alternateBase().color(); - QColor base = scheme.background(KColorScheme::NormalBackground).color(); for (int i = 0; i < maxTrack; i++) { TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1); if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) { const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1); if (i == m_selectedTrack) - painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color()); + painter->fillRect(track, m_activeTrackBrush.brush(this)); else painter->fillRect(track, info.isLocked ? lockedColor : audioColor); } painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1))); } - int lowerLimit = m_tracksHeight * maxTrack + 1; - if (height() > lowerLimit) { - const QRectF bg(min, lowerLimit, max - min, height() - lowerLimit); - painter->fillRect(bg, base); - } } bool CustomTrackView::findString(const QString &text) @@ -6263,12 +6251,14 @@ void CustomTrackView::clearSelection() void CustomTrackView::updatePalette() { + m_activeTrackBrush = KStatefulBrush(KColorScheme::View, KColorScheme::ActiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())); if (m_cursorLine) { QPen pen1 = QPen(); pen1.setWidth(1); pen1.setColor(palette().text().color()); m_cursorLine->setPen(pen1); } + emit tracksChanged(); } void CustomTrackView::removeTipAnimation() @@ -6402,8 +6392,8 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement effect) QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); double factor = e.attribute("factor", "1").toDouble(); for (int j = 0; j < values.count(); j++) { - QString pos = values.at(j).section(":", 0, 0); - double val = values.at(j).section(":", 1, 1).toDouble() / factor; + QString pos = values.at(j).section(':', 0, 0); + double val = values.at(j).section(':', 1, 1).toDouble() / factor; values[j] = pos + "=" + QString::number(val); } // kDebug() << "/ / / /SENDING KEYFR:" << values; @@ -6446,4 +6436,20 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement effect) } } return parameters; -} \ No newline at end of file +} + +void CustomTrackView::updatePanZoom(ClipItem* item, GenTime cutPos) +{ + QList effects = item->updatePanZoom(m_document->width(), m_document->height(), cutPos.frames(m_document->fps())); + for (int i = 0; i < effects.count(); ++i) { + if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), getEffectArgs(item->effectAt(effects.at(i))))) + emit displayMessage(i18n("Problem editing effect"), ErrorMessage); + + // if effect is displayed, update the effect edit widget with new clip duration + /*if (item->isSelected() && effects.at(i) == item->selectedEffectIndex()) + emit clipItemSelected(item, effects.at(i));*/ + } + // update always, otherwise there might problems when resizing groups + if (effects.count() > 0) + emit clipItemSelected(item, item->selectedEffectIndex()); +}