X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgeometrywidget.cpp;h=34d2b972314f0481980da792580b7dc617822846;hb=60d9d6db7d92c37de9e20f10c137552aa0cafbce;hp=72572e44ab63779e225639a7b3ad11e9a7f0f13e;hpb=8090077b4f8f547244e76988eb553ac5c5993d33;p=kdenlive

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 72572e44..34d2b972 100644
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -24,33 +24,38 @@
 #include "keyframehelper.h"
 #include "timecodedisplay.h"
 #include "monitorscene.h"
+#include "monitorscenecontrolwidget.h"
+#include "onmonitoritems/onmonitorrectitem.h"
 #include "kdenlivesettings.h"
 
 #include <QtCore>
 #include <QGraphicsView>
-#include <QGraphicsRectItem>
 #include <QVBoxLayout>
 #include <QGridLayout>
 
-GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, QWidget* parent ):
-        QWidget(parent),
-        m_monitor(monitor),
-        m_timePos(new TimecodeDisplay(timecode)),
-        m_clipPos(clipPos),
-        m_inPoint(0),
-        m_outPoint(1),
-        m_isEffect(isEffect),
-        m_rect(NULL),
-        m_geometry(NULL)
+
+
+GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos, bool isEffect, bool disabled, QWidget* parent):
+    QWidget(parent),
+    m_monitor(monitor),
+    m_timePos(new TimecodeDisplay(timecode)),
+    m_clipPos(clipPos),
+    m_inPoint(0),
+    m_outPoint(1),
+    m_isEffect(isEffect),
+    m_rect(NULL),
+    m_geometry(NULL),
+    m_showScene(true)
 {
     m_ui.setupUi(this);
+    m_scene = monitor->getEffectScene();
 
 
     /*
         Setup of timeline and keyframe controls
     */
 
-    ((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 4);
+    ((QGridLayout *)(m_ui.widgetTimeWrapper->layout()))->addWidget(m_timePos, 1, 6);
 
     QVBoxLayout *layout = new QVBoxLayout(m_ui.frameTimeline);
     m_timeline = new KeyframeHelper(m_ui.frameTimeline);
@@ -64,14 +69,19 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
     m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
 
+    m_ui.buttonSync->setIcon(KIcon("insert-link"));
+    m_ui.buttonSync->setToolTip(i18n("Synchronize with timeline cursor"));
+    m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
+
     connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(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)));
-    connect(m_timePos, SIGNAL(editingFinished()), this , SLOT(slotPositionChanged()));
+    connect(m_timePos, SIGNAL(editingFinished()), 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()));
+    connect(m_ui.buttonSync,      SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
 
 
     /*
@@ -98,6 +108,9 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
 
     connect(m_ui.spinSize,         SIGNAL(valueChanged(int)), this, SLOT(slotResize(int)));
 
+    connect(m_ui.spinOpacity,      SIGNAL(valueChanged(int)), this, SLOT(slotSetOpacity(int)));
+    connect(m_ui.sliderOpacity,    SIGNAL(valueChanged(int)), m_ui.spinOpacity, SLOT(setValue(int)));
+
     connect(m_ui.buttonMoveLeft,   SIGNAL(clicked()), this, SLOT(slotMoveLeft()));
     connect(m_ui.buttonCenterH,    SIGNAL(clicked()), this, SLOT(slotCenterH()));
     connect(m_ui.buttonMoveRight,  SIGNAL(clicked()), this, SLOT(slotMoveRight()));
@@ -106,19 +119,35 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     connect(m_ui.buttonMoveBottom, SIGNAL(clicked()), this, SLOT(slotMoveBottom()));
 
 
-    m_scene = monitor->getEffectScene();
+    /*
+        Setup of configuration controls
+    */
+
+    m_config = new MonitorSceneControlWidget(m_scene, m_ui.frameSettings);
+    QHBoxLayout *settingsLayout = new QHBoxLayout(m_ui.frameSettings);
+    settingsLayout->addWidget(m_config);
+    settingsLayout->setContentsMargins(0, 0, 0, 0);
+    ((QGridLayout *)m_ui.widgetConfigButton->layout())->addWidget(m_config->getShowHideButton(), 1, 1);
+    connect(m_config, SIGNAL(showScene(bool)), this, SLOT(slotShowScene(bool)));
+    slotShowScene(!disabled);
+
+
     connect(m_scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateGeometry()));
-    connect(m_monitor->render, SIGNAL(rendererPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
+    connect(m_scene, SIGNAL(addKeyframe()),    this, SLOT(slotAddKeyframe()));
+    connect(m_monitor, SIGNAL(renderPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
     connect(this, SIGNAL(parameterChanged()), this, SLOT(slotUpdateProperties()));
 }
 
 GeometryWidget::~GeometryWidget()
 {
+    m_scene->setEnabled(true);
     delete m_timePos;
     delete m_timeline;
     m_scene->removeItem(m_rect);
     delete m_geometry;
-    m_monitor->slotEffectScene(false);
+    delete m_config;
+    if (m_monitor)
+        m_monitor->slotEffectScene(false);
 }
 
 void GeometryWidget::updateTimecodeFormat()
@@ -136,49 +165,57 @@ void GeometryWidget::setupParam(const QDomElement elem, int minframe, int maxfra
     m_inPoint = minframe;
     m_outPoint = maxframe;
 
-    char *tmp = (char *) qstrdup(elem.attribute("value").toUtf8().data());
     if (m_geometry)
-        m_geometry->parse(tmp, maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight());
+        m_geometry->parse(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
     else
-        m_geometry = new Mlt::Geometry(tmp, maxframe - minframe, m_monitor->render->renderWidth(), m_monitor->render->renderHeight());
-    delete[] tmp;
+        m_geometry = new Mlt::Geometry(elem.attribute("value").toUtf8().data(), maxframe - minframe, m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
 
-    if (elem.attribute("fixed") == "1") {
+    if (elem.attribute("fixed") == "1" || maxframe < minframe) {
         // Keyframes are disabled
         m_ui.widgetTimeWrapper->setHidden(true);
     } else {
+        m_ui.widgetTimeWrapper->setHidden(false);
         m_timeline->setKeyGeometry(m_geometry, m_outPoint - m_inPoint - 1);
         m_timeline->update();
         m_timePos->setRange(0, m_outPoint - m_inPoint - 1);
     }
 
+    // no opacity
+    if (elem.attribute("opacity") == "false")
+        m_ui.widgetOpacity->setHidden(true);
+
     Mlt::GeometryItem item;
 
     m_geometry->fetch(&item, 0);
     delete m_rect;
-    m_rect = new QGraphicsRectItem(QRectF(0, 0, item.w(), item.h()));
+    m_rect = new OnMonitorRectItem(QRectF(0, 0, item.w(), item.h()), m_monitor->render->dar(), m_scene);
     m_rect->setPos(item.x(), item.y());
     m_rect->setZValue(0);
-    m_rect->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-
-    QPen framepen(Qt::SolidLine);
-    framepen.setColor(Qt::yellow);
-    m_rect->setPen(framepen);
-    m_rect->setBrush(Qt::transparent);
     m_scene->addItem(m_rect);
 
     slotPositionChanged(0, false);
-    slotUpdateProperties();
     slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
 }
 
+void GeometryWidget::slotSyncPosition(int relTimelinePos)
+{
+    // do only sync if this effect is keyframable
+    if (m_timePos->maximum() > 0 && KdenliveSettings::transitionfollowcursor()) {
+        relTimelinePos = qMax(0, relTimelinePos);
+        relTimelinePos = qMin(relTimelinePos, m_timePos->maximum());
+        if (relTimelinePos != m_timePos->getValue())
+            slotPositionChanged(relTimelinePos, false);
+    }
+}
+
 
 void GeometryWidget::slotPositionChanged(int pos, bool seek)
 {
     if (pos == -1)
         pos = m_timePos->getValue();
+    else
+        m_timePos->setValue(pos);
 
-    m_timePos->setValue(pos);
     m_timeline->blockSignals(true);
     m_timeline->setValue(pos);
     m_timeline->blockSignals(false);
@@ -186,12 +223,14 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek)
     Mlt::GeometryItem item;
     if (m_geometry->fetch(&item, pos) || item.key() == false) {
         // no keyframe
+        m_rect->setEnabled(false);
         m_scene->setEnabled(false);
         m_ui.widgetGeometry->setEnabled(false);
         m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
         m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
     } else {
         // keyframe
+        m_rect->setEnabled(true);
         m_scene->setEnabled(true);
         m_ui.widgetGeometry->setEnabled(true);
         m_ui.buttonAddDelete->setIcon(KIcon("edit-delete"));
@@ -200,6 +239,14 @@ void GeometryWidget::slotPositionChanged(int pos, bool seek)
 
     m_rect->setPos(item.x(), item.y());
     m_rect->setRect(0, 0, item.w(), item.h());
+
+    m_ui.spinOpacity->blockSignals(true);
+    m_ui.sliderOpacity->blockSignals(true);
+    m_ui.spinOpacity->setValue(item.mix());
+    m_ui.sliderOpacity->setValue(item.mix());
+    m_ui.spinOpacity->blockSignals(false);
+    m_ui.sliderOpacity->blockSignals(false);
+
     slotUpdateProperties();
 
     if (seek && KdenliveSettings::transitionfollowcursor())
@@ -210,6 +257,7 @@ void GeometryWidget::slotKeyframeMoved(int pos)
 {
     slotPositionChanged(pos);
     slotUpdateGeometry();
+    QTimer::singleShot(100, this, SIGNAL(parameterChanged()));
 }
 
 void GeometryWidget::slotAddKeyframe(int pos)
@@ -224,6 +272,7 @@ void GeometryWidget::slotAddKeyframe(int pos)
     item.y(rectpos.y());
     item.w(r.width());
     item.h(r.height());
+    item.mix(m_ui.spinOpacity->value());
     m_geometry->insert(item);
 
     m_timeline->update();
@@ -252,8 +301,9 @@ void GeometryWidget::slotPreviousKeyframe()
 {
     Mlt::GeometryItem item;
     // Go to start if no keyframe is found
+    int currentPos = m_timePos->getValue();
     int pos = 0;
-    if(!m_geometry->prev_key(&item, m_timeline->value() - 1))
+    if (!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
         pos = item.frame();
 
     slotPositionChanged(pos);
@@ -282,18 +332,20 @@ void GeometryWidget::slotAddDeleteKeyframe()
 
 void GeometryWidget::slotCheckMonitorPosition(int renderPos)
 {
-    /*
-        We do only get the position in timeline if this geometry belongs to a transition,
-        therefore we need to ways here.
-    */
-    if (m_isEffect) {
-        emit checkMonitorPosition(renderPos);
-    } else {
-        if (renderPos >= m_clipPos && renderPos <= m_clipPos + m_outPoint - m_inPoint) {
-            if (!m_scene->views().at(0)->isVisible())
-                m_monitor->slotEffectScene(true);
+    if (m_showScene) {
+        /*
+            We do only get the position in timeline if this geometry belongs to a transition,
+            therefore we need two ways here.
+        */
+        if (m_isEffect) {
+            emit checkMonitorPosition(renderPos);
         } else {
-            m_monitor->slotEffectScene(false);
+            if (renderPos >= m_clipPos && renderPos <= m_clipPos + m_outPoint - m_inPoint) {
+                if (!m_scene->views().at(0)->isVisible())
+                    m_monitor->slotEffectScene(true);
+            } else {
+                m_monitor->slotEffectScene(false);
+            }
         }
     }
 }
@@ -303,6 +355,7 @@ void GeometryWidget::slotUpdateGeometry()
 {
     Mlt::GeometryItem item;
     int pos = m_timePos->getValue();
+
     // get keyframe and make sure it is the correct one
     if (m_geometry->next_key(&item, pos) || item.frame() != pos)
         return;
@@ -323,9 +376,9 @@ void GeometryWidget::slotUpdateProperties()
     QPointF rectPos = m_rect->pos();
     int size;
     if (rectSize.width() / m_monitor->render->dar() < rectSize.height())
-        size = (int)(rectSize.width() * 100 / m_monitor->render->renderWidth());
+        size = (int)((rectSize.width() * 100.0 / m_monitor->render->frameRenderWidth()) + 0.5);
     else
-        size = (int)(rectSize.height() * 100 / m_monitor->render->renderHeight());
+        size = (int)((rectSize.height() * 100.0 / m_monitor->render->renderHeight()) + 0.5);
 
     m_ui.spinX->blockSignals(true);
     m_ui.spinY->blockSignals(true);
@@ -374,11 +427,30 @@ void GeometryWidget::slotSetHeight(int value)
 
 void GeometryWidget::slotResize(int value)
 {
-    m_rect->setRect(0, 0, m_monitor->render->renderWidth() * value / 100, m_monitor->render->renderHeight() * value / 100);
+    m_rect->setRect(0, 0,
+                    (int)((m_monitor->render->frameRenderWidth() * value / 100.0) + 0.5),
+                    (int)((m_monitor->render->renderHeight() * value / 100.0) + 0.5));
     slotUpdateGeometry();
 }
 
 
+void GeometryWidget::slotSetOpacity(int value)
+{
+    m_ui.sliderOpacity->blockSignals(true);
+    m_ui.sliderOpacity->setValue(value);
+    m_ui.sliderOpacity->blockSignals(false);
+
+    int pos = m_timePos->getValue();
+    Mlt::GeometryItem item;
+    if (m_geometry->fetch(&item, pos) || item.key() == false)
+        return;
+    item.mix(value);
+    m_geometry->insert(item);
+
+    emit parameterChanged();
+}
+
+
 void GeometryWidget::slotMoveLeft()
 {
     m_rect->setPos(0, m_rect->pos().y());
@@ -387,13 +459,13 @@ void GeometryWidget::slotMoveLeft()
 
 void GeometryWidget::slotCenterH()
 {
-    m_rect->setPos((m_monitor->render->renderWidth() - m_rect->rect().width()) / 2, m_rect->pos().y());
+    m_rect->setPos((m_monitor->render->frameRenderWidth() - m_rect->rect().width()) / 2, m_rect->pos().y());
     slotUpdateGeometry();
 }
 
 void GeometryWidget::slotMoveRight()
 {
-    m_rect->setPos(m_monitor->render->renderWidth() - m_rect->rect().width(), m_rect->pos().y());
+    m_rect->setPos(m_monitor->render->frameRenderWidth() - m_rect->rect().width(), m_rect->pos().y());
     slotUpdateGeometry();
 }
 
@@ -415,4 +487,21 @@ void GeometryWidget::slotMoveBottom()
     slotUpdateGeometry();
 }
 
+
+void GeometryWidget::slotSetSynchronize(bool sync)
+{
+    KdenliveSettings::setTransitionfollowcursor(sync);
+    if (sync)
+        emit seekToPos(m_clipPos + m_timePos->getValue());
+}
+
+void GeometryWidget::slotShowScene(bool show)
+{
+    m_showScene = show;
+    if (!m_showScene)
+        m_monitor->slotEffectScene(false);
+    else
+        slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
+}
+
 #include "geometrywidget.moc"