#include "monitorscene.h"
#include "monitoreditwidget.h"
#include "onmonitoritems/onmonitorrectitem.h"
+#include "onmonitoritems/onmonitorpathitem.h"
#include "kdenlivesettings.h"
#include "dragvalue.h"
m_outPoint(1),
m_isEffect(isEffect),
m_rect(NULL),
+ m_geomPath(NULL),
m_previous(NULL),
m_geometry(NULL),
m_showScene(true),
edit->removeCustomControls();
edit->addCustomButton(KIcon("transform-crop"), i18n("Show previous keyframe"), this, SLOT(slotShowPreviousKeyFrame(bool)), true, KdenliveSettings::onmonitoreffects_geometryshowprevious());
m_scene = edit->getScene();
-
+ m_scene->cleanup();
/*
Setup of timeline and keyframe controls
m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
m_ui.buttonSync->setIconSize(iconSize);
- connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(int)));
+ connect(m_timeline, SIGNAL(requestSeek(int)), this, SLOT(slotRequestSeek(int)));
connect(m_timeline, SIGNAL(keyframeMoved(int)), this, SLOT(slotKeyframeMoved(int)));
connect(m_timeline, SIGNAL(addKeyframe(int)), this, SLOT(slotAddKeyframe(int)));
connect(m_timeline, SIGNAL(removeKeyframe(int)), this, SLOT(slotDeleteKeyframe(int)));
m_spinHeight = new DragValue(i18nc("Frame height", "H"), m_monitor->render->renderHeight(), 0, 1, 99000, -1, QString(), false, this);
m_ui.horizontalLayout->addWidget(m_spinHeight, 0, 3);
+ m_ui.horizontalLayout->setColumnStretch(4, 10);
+
QMenu *menu = new QMenu(this);
QAction *adjustSize = new QAction(i18n("Adjust to original size"), this);
connect(adjustSize, SIGNAL(triggered()), this, SLOT(slotAdjustToFrameSize()));
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);
connect(m_spinWidth, SIGNAL(valueChanged(double)), this, SLOT(slotSetWidth(double)));
connect(m_spinHeight, SIGNAL(valueChanged(double)), this, SLOT(slotSetHeight(double)));
- connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
+ connect(m_spinSize, SIGNAL(valueChanged(double)), this, SLOT(slotResize(double)));
connect(m_opacity, SIGNAL(valueChanged(double)), this, SLOT(slotSetOpacity(double)));
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();
QStringList list = val.split(';', QString::SkipEmptyParts);
val.clear();
val.append(list.takeFirst().section('/', 0, 0));
- foreach (const QString value, list) {
+ foreach (const QString &value, list) {
val.append(';' + value.section('/', 0, 0));
}
}
{
m_inPoint = minframe;
m_outPoint = maxframe;
- m_scene->cleanup();
if (m_geometry)
m_geometry->parse(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
}
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);
}
}
}
+void GeometryWidget::slotRequestSeek(int pos)
+{
+ if (KdenliveSettings::transitionfollowcursor())
+ emit seekToPos(m_clipPos + pos);
+}
+
void GeometryWidget::slotPositionChanged(int pos, bool seek)
{
else
m_timePos->setValue(pos);
- m_timeline->blockSignals(true);
+ //m_timeline->blockSignals(true);
m_timeline->setValue(pos);
- m_timeline->blockSignals(false);
+ //m_timeline->blockSignals(false);
Mlt::GeometryItem item;
Mlt::GeometryItem previousItem;
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()
geom->insert(item2);
}
}
+ if (m_geomPath) m_geomPath->setPoints(m_geometry);
emit parameterChanged();
}
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"
projects / kdenlive / blobdiff