-GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent):
+GeometryWidget::GeometryWidget(Monitor* monitor, const Timecode &timecode, int clipPos, bool isEffect, bool showRotation, QWidget* parent):
QWidget(parent),
m_monitor(monitor),
m_timePos(new TimecodeDisplay(timecode)),
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
MonitorEditWidget *edit = monitor->getEffectEdit();
edit->removeCustomControls();
+ edit->addCustomButton(KIcon("draw-path"), i18n("Show path"), this, SLOT(slotShowPath(bool)), true, KdenliveSettings::onmonitoreffects_geometryshowpath());
edit->addCustomButton(KIcon("transform-crop"), i18n("Show previous keyframe"), this, SLOT(slotShowPreviousKeyFrame(bool)), true, KdenliveSettings::onmonitoreffects_geometryshowprevious());
m_scene = edit->getScene();
m_scene->cleanup();
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)));
- connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotPositionChanged()));
+ connect(m_timePos, SIGNAL(timeCodeEditingFinished()), this, SLOT(slotPositionChanged()));
connect(m_ui.buttonPrevious, SIGNAL(clicked()), this, SLOT(slotPreviousKeyframe()));
connect(m_ui.buttonNext, SIGNAL(clicked()), this, SLOT(slotNextKeyframe()));
connect(m_ui.buttonAddDelete, SIGNAL(clicked()), this, SLOT(slotAddDeleteKeyframe()));
QAction *importKeyframes = new QAction(i18n("Import keyframes from clip"), this);
connect(importKeyframes, SIGNAL(triggered()), this, SIGNAL(importClipKeyframes()));
menu->addAction(importKeyframes);
- QAction *resetKeyframes = new QAction(i18n("Reset keyframes"), this);
+ QAction *resetKeyframes = new QAction(i18n("Reset all keyframes"), this);
connect(resetKeyframes, SIGNAL(triggered()), this, SLOT(slotResetKeyframes()));
menu->addAction(resetKeyframes);
+
+ QAction *resetNextKeyframes = new QAction(i18n("Reset keyframes after cursor"), this);
+ connect(resetNextKeyframes, SIGNAL(triggered()), this, SLOT(slotResetNextKeyframes()));
+ menu->addAction(resetNextKeyframes);
+ QAction *resetPreviousKeyframes = new QAction(i18n("Reset keyframes before cursor"), this);
+ connect(resetPreviousKeyframes, SIGNAL(triggered()), this, SLOT(slotResetPreviousKeyframes()));
+ menu->addAction(resetPreviousKeyframes);
menu->addSeparator();
QAction *syncTimeline = new QAction(KIcon("insert-link"), i18n("Synchronize with timeline cursor"), this);
delete m_spinHeight;
delete m_opacity;
if (m_rect) {
- m_scene->removeItem(m_rect);
- delete m_rect;
+ m_scene->removeItem(m_rect);
+ delete m_rect;
}
if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- delete m_geomPath;
+ m_scene->removeItem(m_geomPath);
+ delete m_geomPath;
}
- if (m_previous) delete m_previous;
+ delete m_previous;
delete m_geometry;
m_extraGeometryNames.clear();
m_extraFactors.clear();
slotPositionChanged(-1, false);
}
+void GeometryWidget::slotShowPath(bool show)
+{
+ KdenliveSettings::setOnmonitoreffects_geometryshowpath(show);
+ if (m_geomPath) {
+ if (show) m_scene->addItem(m_geomPath);
+ else m_scene->removeItem(m_geomPath);
+ }
+ slotPositionChanged(-1, false);
+}
+
void GeometryWidget::updateTimecodeFormat()
{
m_timePos->slotUpdateTimeCodeFormat();
return val;
}
-void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxframe)
+void GeometryWidget::setupParam(const QDomElement &elem, int minframe, int maxframe)
{
m_inPoint = minframe;
m_outPoint = maxframe;
Mlt::GeometryItem item;
m_geometry->fetch(&item, 0);
if (m_rect) {
- m_scene->removeItem(m_rect);
- delete m_rect;
+ m_scene->removeItem(m_rect);
+ delete m_rect;
}
if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- delete 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());
connect(m_geomPath, SIGNAL(changed()), this, SLOT(slotUpdatePath()));
m_geomPath->setPen(QPen(Qt::red));
m_geomPath->setPoints(m_geometry);
- m_scene->addItem(m_geomPath);
+ if (KdenliveSettings::onmonitoreffects_geometryshowpath())
+ m_scene->addItem(m_geomPath);
m_scene->centerView();
slotPositionChanged(0, false);
}
-void GeometryWidget::addParameter(const QDomElement elem)
+void GeometryWidget::addParameter(const QDomElement &elem)
{
Mlt::Geometry *geometry = new Mlt::Geometry(elem.attribute("value").toUtf8().data(), m_outPoint - m_inPoint, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
m_extraGeometries.append(geometry);
m_timeline->addGeometry(geometry);
m_extraFactors.append(elem.attribute("factor", "1"));
m_extraGeometryNames.append(elem.attribute("name"));
- //kDebug()<<"ADDED PARAM: "<<elem.attribute("value");
}
void GeometryWidget::slotSyncPosition(int relTimelinePos)
m_opacity->setValue(item.mix());
m_opacity->blockSignals(false);
- for (int i = 0; i < m_extraGeometries.count(); i++) {
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
Mlt::Geometry *geom = m_extraGeometries.at(i);
QString name = m_extraGeometryNames.at(i);
if (!geom->fetch(&item, pos)) {
item.mix(m_opacity->value());
m_geometry->insert(item);
- for (int i = 0; i < m_extraGeometries.count(); i++) {
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
Mlt::Geometry *geom = m_extraGeometries.at(i);
QString name = m_extraGeometryNames.at(i);
DragValue *widget = findChild<DragValue *>(name);
}
m_geometry->remove(pos);
- for (int i = 0; i < m_extraGeometries.count(); i++) {
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
Mlt::Geometry *geom = m_extraGeometries.at(i);
geom->remove(pos);
}
m_timeline->update();
- if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- m_geomPath->setPoints(m_geometry);
- m_scene->addItem(m_geomPath);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
}
slotPositionChanged(pos, false);
emit parameterChanged();
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++;
+ 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();
item.h(rectSize.height());
m_geometry->insert(item);
- for (int i = 0; i < m_extraGeometries.count(); i++) {
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
Mlt::Geometry *geom = m_extraGeometries.at(i);
QString name = m_extraGeometryNames.at(i);
Mlt::GeometryItem item2;
geom->insert(item2);
}
}
- if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- m_geomPath->setPoints(m_geometry);
- m_scene->addItem(m_geomPath);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
}
emit parameterChanged();
}
emit seekToPos(m_clipPos + m_timePos->getValue());
}
-void GeometryWidget::setFrameSize(QPoint size)
+void GeometryWidget::setFrameSize(const QPoint &size)
{
m_frameSize = size;
}
// Delete existing keyframes
Mlt::GeometryItem item;
while (!m_geometry->next_key(&item, 1)) {
- m_geometry->remove(item.frame());
+ m_geometry->remove(item.frame());
+ }
+
+ // Delete extra geometry keyframes too
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
+ Mlt::Geometry *geom = m_extraGeometries.at(i);
+ while (!geom->next_key(&item, 1)) {
+ geom->remove(item.frame());
+ }
}
// Create neutral first keyframe
item.mix(100);
m_geometry->insert(item);
m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
- if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- m_geomPath->setPoints(m_geometry);
- m_scene->addItem(m_geomPath);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
+ }
+ slotPositionChanged(-1, false);
+ emit parameterChanged();
+}
+
+void GeometryWidget::slotResetNextKeyframes()
+{
+ // Delete keyframes after cursor pos
+ Mlt::GeometryItem item;
+ int pos = m_timePos->getValue();
+ while (!m_geometry->next_key(&item, pos)) {
+ m_geometry->remove(item.frame());
+ }
+
+ // Delete extra geometry keyframes too
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
+ Mlt::Geometry *geom = m_extraGeometries.at(i);
+ while (!geom->next_key(&item, pos)) {
+ geom->remove(item.frame());
+ }
+ }
+
+ // Make sure we have at least one keyframe
+ if (m_geometry->next_key(&item, 0)) {
+ item.frame(0);
+ item.x(0);
+ item.y(0);
+ item.w(m_monitor->render->frameRenderWidth());
+ item.h(m_monitor->render->renderHeight());
+ item.mix(100);
+ m_geometry->insert(item);
+ }
+ m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
+ }
+ slotPositionChanged(-1, false);
+ emit parameterChanged();
+}
+
+void GeometryWidget::slotResetPreviousKeyframes()
+{
+ // Delete keyframes before cursor pos
+ Mlt::GeometryItem item;
+ int pos = 0;
+ while (!m_geometry->next_key(&item, pos) && pos < m_timePos->getValue()) {
+ pos = item.frame() + 1;
+ m_geometry->remove(item.frame());
+ }
+
+ // Delete extra geometry keyframes too
+ for (int i = 0; i < m_extraGeometries.count(); ++i) {
+ Mlt::Geometry *geom = m_extraGeometries.at(i);
+ pos = 0;
+ while (!geom->next_key(&item, pos) && pos < m_timePos->getValue()) {
+ pos = item.frame() + 1;
+ geom->remove(item.frame());
+ }
+ }
+
+ // Make sure we have at least one keyframe
+ if (!m_geometry->next_key(&item, 0)) {
+ item.frame(0);
+ /*item.x(0);
+ item.y(0);
+ item.w(m_monitor->render->frameRenderWidth());
+ item.h(m_monitor->render->renderHeight());
+ item.mix(100);*/
+ m_geometry->insert(item);
+ }
+ else {
+ item.frame(0);
+ item.x(0);
+ item.y(0);
+ item.w(m_monitor->render->frameRenderWidth());
+ item.h(m_monitor->render->renderHeight());
+ item.mix(100);
+ m_geometry->insert(item);
+ }
+ m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
}
slotPositionChanged(-1, false);
emit parameterChanged();
-
}
void GeometryWidget::importKeyframes(const QString &data, int maximum)
Mlt::GeometryItem item;
while (!m_geometry->next_key(&item, 0)) {
- m_geometry->remove(item.frame());
+ m_geometry->remove(item.frame());
}
int offset = 1;
if (maximum > 0 && list.count() > maximum) {
- offset = list.count() / maximum;
+ offset = list.count() / maximum;
}
for (int i = 0; i < list.count(); i += offset) {
- QString geom = list.at(i);
- if (geom.contains('=')) {
- item.frame(geom.section('=', 0, 0).toInt());
- geom = geom.section('=', 1);
- }
- else item.frame(0);
- 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);
+ QString geom = list.at(i);
+ if (geom.contains('=')) {
+ item.frame(geom.section('=', 0, 0).toInt());
+ geom = geom.section('=', 1);
+ }
+ else item.frame(0);
+ 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);
}
m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
- if (m_geomPath) {
- m_scene->removeItem(m_geomPath);
- m_geomPath->setPoints(m_geometry);
- m_scene->addItem(m_geomPath);
+ if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
+ m_scene->removeItem(m_geomPath);
+ m_geomPath->setPoints(m_geometry);
+ m_scene->addItem(m_geomPath);
}
slotPositionChanged(-1, false);
emit parameterChanged();
m_inPoint = inPoint;
m_outPoint = outPoint;
m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
- m_timePos->setRange(0, m_outPoint - m_inPoint);
+ m_timePos->setRange(0, m_outPoint - m_inPoint);
}
#include "geometrywidget.moc"
projects / kdenlive / blobdiff