#include "keyframehelper.h"
#include "timecodedisplay.h"
#include "monitorscene.h"
+#include "monitoreditwidget.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),
- m_showScene(true)
+
+
+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),
+ m_showScene(true)
{
m_ui.setupUi(this);
- m_scene = monitor->getEffectScene();
+
+ MonitorEditWidget *edit = monitor->getEffectEdit();
+ edit->showVisibilityButton(true);
+ m_scene = edit->getScene();
/*
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);
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)));
/*
Setup of configuration controls
*/
- m_ui.buttonConfig->setIcon(KIcon("system-run"));
- m_ui.buttonConfig->setToolTip(i18n("Show/Hide settings"));
- m_ui.buttonConfig->setCheckable(true);
- m_ui.groupSettings->setHidden(true);
- m_ui.checkSync->setChecked(KdenliveSettings::transitionfollowcursor());
- m_ui.checkDirectUpdate->setChecked(m_scene->getDirectUpdate());
-
- connect(m_ui.buttonConfig, SIGNAL(toggled(bool)), m_ui.groupSettings, SLOT(setVisible(bool)));
-
- connect(m_ui.checkSync, SIGNAL(toggled(bool)), this, SLOT(slotSetSynchronize(bool)));
- connect(m_ui.checkShowScene, SIGNAL(toggled(bool)), this, SLOT(slotShowScene(bool)));
- connect(m_ui.checkDirectUpdate, SIGNAL(toggled(bool)), m_scene, SLOT(slotSetDirectUpdate(bool)));
-
+ connect(edit, SIGNAL(showEdit(bool)), this, SLOT(slotShowScene(bool)));
connect(m_scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateGeometry()));
+ 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);
+ if (m_monitor) {
+ m_monitor->getEffectEdit()->showVisibilityButton(false);
+ m_monitor->slotEffectScene(false);
+ }
}
void GeometryWidget::updateTimecodeFormat()
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_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 (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);
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"));
{
slotPositionChanged(pos);
slotUpdateGeometry();
+ QTimer::singleShot(100, this, SIGNAL(parameterChanged()));
}
void GeometryWidget::slotAddKeyframe(int pos)
// Go to start if no keyframe is found
int currentPos = m_timePos->getValue();
int pos = 0;
- if(!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
+ if (!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
pos = item.frame();
slotPositionChanged(pos);
if (m_showScene) {
/*
We do only get the position in timeline if this geometry belongs to a transition,
- therefore we need to ways here.
+ therefore we need two ways here.
*/
if (m_isEffect) {
emit checkMonitorPosition(renderPos);
{
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;
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);
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::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();
}
void GeometryWidget::slotSetSynchronize(bool sync)
{
KdenliveSettings::setTransitionfollowcursor(sync);
+ if (sync)
+ emit seekToPos(m_clipPos + m_timePos->getValue());
}
void GeometryWidget::slotShowScene(bool show)