const'ify + fix indent + minor optimization

[kdenlive] / src / geometrywidget.cpp

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 4e68956d818eaf4b5fe22771509675865bcb351f..661b388d972e3b9d52336153ddd45ba6d0d93a66 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -38,7 +38,7 @@
 
 
 
-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)),
@@ -57,6 +57,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     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();
@@ -89,7 +90,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     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()));
@@ -275,7 +276,7 @@ GeometryWidget::~GeometryWidget()
        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();
@@ -291,6 +292,16 @@ void GeometryWidget::slotShowPreviousKeyFrame(bool show)
     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();
@@ -317,7 +328,7 @@ QString GeometryWidget::getExtraValue(const QString &name) const
     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;
@@ -361,19 +372,19 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
     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)
@@ -459,7 +470,7 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek)
     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)) {
@@ -500,7 +511,7 @@ void GeometryWidget::slotAddKeyframe(int 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);
@@ -529,13 +540,13 @@ void GeometryWidget::slotDeleteKeyframe(int pos)
     }
     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) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);
@@ -614,7 +625,7 @@ void GeometryWidget::slotUpdateGeometry()
     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;
@@ -624,7 +635,7 @@ void GeometryWidget::slotUpdateGeometry()
             geom->insert(item2);
         }
     }
-    if (m_geomPath) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);
@@ -815,6 +826,14 @@ void GeometryWidget::slotResetKeyframes()
        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.frame(0);
     item.x(0);
@@ -824,7 +843,7 @@ void GeometryWidget::slotResetKeyframes()
     item.mix(100);
     m_geometry->insert(item);
     m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
-    if (m_geomPath) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);
@@ -842,6 +861,14 @@ void GeometryWidget::slotResetNextKeyframes()
        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);
@@ -853,7 +880,7 @@ void GeometryWidget::slotResetNextKeyframes()
        m_geometry->insert(item);
     }
     m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
-    if (m_geomPath) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);
@@ -872,6 +899,16 @@ void GeometryWidget::slotResetPreviousKeyframes()
        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);
@@ -892,7 +929,7 @@ void GeometryWidget::slotResetPreviousKeyframes()
        m_geometry->insert(item);
     }
     m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
-    if (m_geomPath) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);
@@ -948,7 +985,7 @@ void GeometryWidget::importKeyframes(const QString &data, int maximum)
        m_geometry->insert(item);
     }
     m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint);
-    if (m_geomPath) {
+    if (m_geomPath && KdenliveSettings::onmonitoreffects_geometryshowpath()) {
        m_scene->removeItem(m_geomPath);
        m_geomPath->setPoints(m_geometry);
        m_scene->addItem(m_geomPath);