#include "graphicsscenerectmove.h"
#include "geometryval.h"
+#include "kdenlivesettings.h"
-Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile) {
+Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) {
ui.setupUi(this);
QVBoxLayout* vbox = new QVBoxLayout(ui.widget);
QGraphicsView *view = new QGraphicsView(this);
m_alignMenu->addAction(i18n("Top"), this, SLOT(slotAlignTop()));
m_alignMenu->addAction(i18n("Bottom"), this, SLOT(slotAlignBottom()));
+
+ m_syncAction = configMenu->addAction(i18n("Sync timeline cursor"), this, SLOT(slotSyncCursor()));
+ m_syncAction->setCheckable(true);
+ m_syncAction->setChecked(KdenliveSettings::transitionfollowcursor());
+
//scene->setSceneRect(0, 0, profile.width * 2, profile.height * 2);
//view->fitInView(m_frameBorder, Qt::KeepAspectRatio);
const double sc = 100.0 / profile.height * 0.8;
QRectF srect = view->sceneRect();
- view->setSceneRect(srect.x(), -srect.height() / 2, srect.width(), srect.height() * 2);
+ view->setSceneRect(srect.x(), -srect.height() / 3 + 10, srect.width(), srect.height() + srect.height() / 3 * 2 - 10);
scene->setZoom(sc);
view->centerOn(m_frameBorder);
connect(ui.buttonNext , SIGNAL(clicked()) , this , SLOT(slotNextFrame()));
connect(ui.buttonPrevious , SIGNAL(clicked()) , this , SLOT(slotPreviousFrame()));
connect(ui.buttonDelete , SIGNAL(clicked()) , this , SLOT(slotDeleteFrame()));
connect(ui.buttonAdd , SIGNAL(clicked()) , this , SLOT(slotAddFrame()));
+ connect(scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties()));
}
void Geometryval::slotAlignCenter() {
emit parameterChanged();
}
-void Geometryval::slotPositionChanged(int pos) {
+void Geometryval::slotSyncCursor() {
+ KdenliveSettings::setTransitionfollowcursor(m_syncAction->isChecked());
+}
+
+void Geometryval::slotPositionChanged(int pos, bool seek) {
+ if (seek && KdenliveSettings::transitionfollowcursor()) emit seekToPos(pos);
ui.spinPos->setValue(pos);
m_helper->setValue(pos);
Mlt::GeometryItem item;
}
void Geometryval::slotDeleteFrame() {
+ // check there is more than one keyframe
+ Mlt::GeometryItem item;
+ const int pos = ui.spinPos->value();
+ int error = m_geom->next_key(&item, pos + 1);
+ if (error) {
+ error = m_geom->prev_key(&item, pos - 1);
+ if (error || item.frame() == pos) return;
+ }
+
m_geom->remove(ui.spinPos->value());
ui.buttonAdd->setEnabled(true);
ui.buttonDelete->setEnabled(false);
m_scaleMenu->setEnabled(false);
m_alignMenu->setEnabled(false);
m_helper->update();
+ slotPositionChanged(pos, false);
+ updateTransitionPath();
+ emit parameterChanged();
}
void Geometryval::slotAddFrame() {
m_scaleMenu->setEnabled(true);
m_alignMenu->setEnabled(true);
m_helper->update();
+ emit parameterChanged();
}
void Geometryval::slotNextFrame() {
Mlt::GeometryItem item;
int error = m_geom->next_key(&item, m_helper->value() + 1);
kDebug() << "// SEEK TO NEXT KFR: " << error;
- if (error) return;
+ if (error) {
+ // Go to end
+ ui.spinPos->setValue(ui.spinPos->maximum());
+ return;
+ }
int pos = item.frame();
ui.spinPos->setValue(pos);
}
void Geometryval::setupParam(const QDomElement& par, int minFrame, int maxFrame) {
param = par;
QString val = par.attribute("value");
+ if (par.attribute("fixed") == "1") {
+ m_fixedMode = true;
+ ui.buttonPrevious->setHidden(true);
+ ui.buttonNext->setHidden(true);
+ ui.buttonDelete->setHidden(true);
+ ui.buttonAdd->setHidden(true);
+ ui.spinTransp->setMaximum(500);
+ ui.label_pos->setHidden(true);
+ m_helper->setHidden(true);
+ ui.spinPos->setHidden(true);
+ }
char *tmp = (char *) qstrdup(val.toUtf8().data());
- m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
+ if (m_geom) m_geom->parse(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
+ else m_geom = new Mlt::Geometry(tmp, maxFrame - minFrame, m_profile.width, m_profile.height);
delete[] tmp;
- kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise();
+
+ //kDebug() << " / / UPDATING TRANSITION VALUE: " << m_geom->serialise();
//read param her and set rect
- m_helper->setKeyGeometry(m_geom, maxFrame - minFrame - 1);
- QDomDocument doc;
- doc.appendChild(doc.importNode(par, true));
- kDebug() << "IMPORTED TRANS: " << doc.toString();
- ui.spinPos->setMaximum(maxFrame - minFrame - 1);
+ if (!m_fixedMode) {
+ m_helper->setKeyGeometry(m_geom, maxFrame - minFrame - 1);
+ m_helper->update();
+ /*QDomDocument doc;
+ doc.appendChild(doc.importNode(par, true));
+ kDebug() << "IMPORTED TRANS: " << doc.toString();*/
+ ui.spinPos->setMaximum(maxFrame - minFrame - 1);
+ if (m_path == NULL) {
+ m_path = new QGraphicsPathItem();
+ m_path->setPen(QPen(Qt::red));
+ scene->addItem(m_path);
+ }
+ updateTransitionPath();
+ }
Mlt::GeometryItem item;
- m_path = new QGraphicsPathItem();
- m_path->setPen(QPen(Qt::red));
- updateTransitionPath();
-
- connect(scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateTransitionProperties()));
m_geom->fetch(&item, 0);
+ if (paramRect) delete paramRect;
paramRect = new QGraphicsRectItem(QRectF(0, 0, item.w(), item.h()));
paramRect->setPos(item.x(), item.y());
paramRect->setZValue(0);
paramRect->setPen(QPen(QBrush(QColor(255, 0, 0, 255)), 1.0));
scene->addItem(paramRect);
- scene->addItem(m_path);
- slotPositionChanged(0);
- connect(ui.spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int)));
+ slotPositionChanged(0, false);
+ if (!m_fixedMode) {
+ connect(ui.spinPos, SIGNAL(valueChanged(int)), this , SLOT(slotPositionChanged(int)));
+ }
connect(ui.spinTransp, SIGNAL(valueChanged(int)), this , SLOT(slotTransparencyChanged(int)));
}
void Geometryval::updateTransitionPath() {
+ if (m_fixedMode) return;
Mlt::GeometryItem item;
int pos = 0;
int counter = 0;
projects / kdenlive / blobdiff