Merge branch 'master' into feature/pkey

[kdenlive] / src / geometrywidget.cpp

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 0dbd932c947a9e9fd6a3ac6d3ed460ef6b2f952a..fcbb90a660ccf8f50e9b913182c17428601adfe5 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -26,6 +26,7 @@
 #include "monitorscene.h"
 #include "monitoreditwidget.h"
 #include "onmonitoritems/onmonitorrectitem.h"
+#include "onmonitoritems/onmonitorpathitem.h"
 #include "kdenlivesettings.h"
 #include "dragvalue.h"
 
@@ -46,6 +47,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     m_outPoint(1),
     m_isEffect(isEffect),
     m_rect(NULL),
+    m_geomPath(NULL),
     m_previous(NULL),
     m_geometry(NULL),
     m_showScene(true),
@@ -123,7 +125,10 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     connect(fitToHeight, SIGNAL(triggered()), this, SLOT(slotFitToHeight()));
     menu->addAction(fitToHeight);
     menu->addSeparator();
-
+    QAction *importKeyframes = new QAction(i18n("Import keyframes from clip"), this);
+    connect(importKeyframes, SIGNAL(triggered()), this, SIGNAL(importClipKeyframes()));
+    menu->addAction(importKeyframes);
+    menu->addSeparator();
     QAction *alignleft = new QAction(KIcon("kdenlive-align-left"), i18n("Align left"), this);
     connect(alignleft, SIGNAL(triggered()), this, SLOT(slotMoveLeft()));
     menu->addAction(alignleft);
@@ -242,7 +247,9 @@ GeometryWidget::~GeometryWidget()
     delete m_spinHeight;
     delete m_opacity;
     m_scene->removeItem(m_rect);
+    m_scene->removeItem(m_geomPath);
     if (m_rect) delete m_rect;
+    if (m_geomPath) delete m_geomPath;
     if (m_previous) delete m_previous;
     delete m_geometry;
     m_extraGeometryNames.clear();
@@ -312,14 +319,25 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
     }
 
     Mlt::GeometryItem item;
-
     m_geometry->fetch(&item, 0);
-    delete m_rect;
+    if (m_rect) {
+       m_scene->removeItem(m_rect);
+       delete m_rect;
+    }
+    if (m_geomPath) {
+       m_scene->removeItem(m_geomPath);
+       delete m_geomPath;
+    }
     m_rect = new OnMonitorRectItem(QRectF(0, 0, item.w(), item.h()), m_monitor->render->dar());
     m_rect->setPos(item.x(), item.y());
     m_rect->setZValue(0);
     m_scene->addItem(m_rect);
     connect(m_rect, SIGNAL(changed()), this, SLOT(slotUpdateGeometry()));
+    m_geomPath = new OnMonitorPathItem(m_monitor->render->dar());
+    connect(m_geomPath, SIGNAL(changed()), this, SLOT(slotUpdatePath()));
+    m_geomPath->setPen(QPen(Qt::red));
+    m_scene->addItem(m_geomPath);
+    m_geomPath->setPoints(m_geometry);
     m_scene->centerView();
     slotPositionChanged(0, false);
 }
@@ -524,6 +542,25 @@ void GeometryWidget::slotAddDeleteKeyframe()
         slotDeleteKeyframe();
 }
 
+void GeometryWidget::slotUpdatePath()
+{
+    if (!m_geomPath) return;
+    QList <QPointF> points = m_geomPath->points();
+    Mlt::GeometryItem item;
+    int pos = 0;
+    int ix = 0;
+    while (ix < points.count() && !m_geometry->next_key(&item, pos)) {
+       QPointF center = points.at(ix);
+       QSizeF size(item.w(), item.h());
+       item.x(center.x() - size.width()/2);
+       item.y(center.y() - size.height()/2);
+       m_geometry->insert(item);
+       pos = item.frame() + 1;
+       ix++;
+    }
+    slotPositionChanged(-1, false);
+    emit parameterChanged();
+}
 
 
 void GeometryWidget::slotUpdateGeometry()
@@ -553,6 +590,7 @@ void GeometryWidget::slotUpdateGeometry()
             geom->insert(item2);
         }
     }
+    if (m_geomPath) m_geomPath->setPoints(m_geometry);
     emit parameterChanged();
 }
 
@@ -731,4 +769,41 @@ void GeometryWidget::slotFitToHeight()
     updateMonitorGeometry();
 }
 
+void GeometryWidget::importKeyframes(const QString &data)
+{
+    QStringList list = data.split(';', QString::SkipEmptyParts);
+    QPoint screenSize = m_frameSize;
+    if (screenSize == QPoint() || screenSize.x() == 0 || screenSize.y() == 0) {
+        screenSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    }
+    for (int i = 0; i < list.count(); i++) {
+       Mlt::GeometryItem item;
+       QString geom = list.at(i);
+       if (geom.contains('=')) {
+           item.frame(geom.section('=', 0, 0).toInt());
+       }
+       geom = geom.section('=', 1);
+       if (geom.contains('/')) {
+           item.x(geom.section('/', 0, 0).toDouble());
+           item.y(geom.section('/', 1, 1).section(':', 0, 0).toDouble());
+       }
+       else {
+           item.x(0);
+           item.y(0);
+       }
+       if (geom.contains('x')) {
+           item.w(geom.section('x', 0, 0).section(':', 1, 1).toDouble());
+           item.h(geom.section('x', 1, 1).section(':', 0, 0).toDouble());
+       }
+       else {
+           item.w(screenSize.x());
+           item.h(screenSize.y());
+       }
+       //TODO: opacity
+       item.mix(100);
+       m_geometry->insert(item);
+    }
+    emit parameterChanged();
+}
+
 #include "geometrywidget.moc"