#include <QHeaderView>
-KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal, int maxVal, Timecode tc, const QString paramName, QWidget* parent) :
+KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal, int maxVal, Timecode tc, int active_keyframe, QWidget* parent) :
QWidget(parent),
m_min(minFrame),
m_max(maxFrame),
m_minVal(minVal),
m_maxVal(maxVal),
m_timecode(tc),
- m_previousPos(0)
+ m_previousPos(0),
+ m_active_keyframe(active_keyframe)
{
+ kDebug() << " / / / /MODIFIED KFR: " << m_active_keyframe;
setupUi(this);
- m_params.append(e);
+ m_params.append(e.cloneNode().toElement());
keyframe_list->setFont(KGlobalSettings::generalFont());
+ keyframe_seek->setChecked(KdenliveSettings::keyframeseek());
+ connect(keyframe_seek, SIGNAL(stateChanged(int)), this, SLOT(slotSetSeeking(int)));
- //keyframe_list->setHorizontalHeaderLabels(QStringList() << (paramName.isEmpty() ? i18n("Value") : paramName));
- //setResizeMode(1, QHeaderView::Interactive);
button_add->setIcon(KIcon("list-add"));
button_add->setToolTip(i18n("Add keyframe"));
button_delete->setIcon(KIcon("list-remove"));
button_delete->setToolTip(i18n("Delete keyframe"));
- connect(keyframe_list, SIGNAL(itemSelectionChanged()/*itemClicked(QTreeWidgetItem *, int)*/), this, SLOT(slotAdjustKeyframeInfo()));
- keyframe_val->setRange(m_minVal, m_maxVal);
+ connect(keyframe_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotAdjustKeyframeInfo()));
+ connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotGenerateParams(int, int)));
setupParam();
- //keyframe_list->sortItems(0);
- keyframe_list->resizeRowsToContents();
- keyframe_list->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+ keyframe_list->resizeRowsToContents();
+ keyframe_list->resizeColumnsToContents();
//keyframe_list->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
connect(button_delete, SIGNAL(clicked()), this, SLOT(slotDeleteKeyframe()));
connect(button_add, SIGNAL(clicked()), this, SLOT(slotAddKeyframe()));
- connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotGenerateParams(int, int)));
//connect(keyframe_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotSaveCurrentParam(QTreeWidgetItem *, int)));
connect(keyframe_pos, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframePos(int)));
- connect(keyframe_val, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int)));
+ //connect(keyframe_val, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int)));
keyframe_pos->setPageStep(1);
+ if (!keyframe_list->currentItem()) {
+ keyframe_list->setCurrentCell(0, 0);
+ keyframe_list->selectRow(0);
+ }
/*m_delegate = new KeyItemDelegate(minVal, maxVal);
keyframe_list->setItemDelegate(m_delegate);*/
}
{
keyframe_list->blockSignals(true);
keyframe_list->clear();
+ QLayoutItem *child;
+ while ((child = m_slidersLayout->takeAt(0)) != 0) {
+ QWidget *wid = child->widget();
+ delete child;
+ if (wid) delete wid;
+ }
//delete m_delegate;
}
void KeyframeEdit::addParameter(QDomElement e)
{
keyframe_list->blockSignals(true);
+ m_params.append(e.cloneNode().toElement());
QDomNode na = e.firstChildElement("name");
QString paramName = i18n(na.toElement().text().toUtf8().data());
int columnId = keyframe_list->columnCount();
keyframe_list->insertColumn(columnId);
keyframe_list->setHorizontalHeaderItem(columnId, new QTableWidgetItem(paramName));
- m_params.append(e);
+ m_slidersLayout->addWidget(new QLabel(paramName), columnId, 0);
+ QSlider *sl = new QSlider(Qt::Horizontal, this);
+ sl->setRange(m_params.at(columnId).attribute("min").toInt(), m_params.at(columnId).attribute("max").toInt());
+ connect(sl, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int)));
+ m_slidersLayout->addWidget(sl, columnId, 1);
+
QStringList frames = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
for (int i = 0; i < frames.count(); i++) {
int frame = frames.at(i).section(':', 0, 0).toInt();
bool found = false;
int j;
for (j = 0; j < keyframe_list->rowCount(); j++) {
- int currentPos = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(j)->text());
+ int currentPos;
+ if (KdenliveSettings::frametimecode()) currentPos = keyframe_list->verticalHeaderItem(j)->text().toInt();
+ else currentPos = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(j)->text());
if (frame == currentPos) {
keyframe_list->setItem(j, columnId, new QTableWidgetItem(frames.at(i).section(':', 1, 1)));
found = true;
}
}
if (!found) {
- //int newRow = keyframe_list->rowCount();
keyframe_list->insertRow(j);
- keyframe_list->setVerticalHeaderItem(j, new QTableWidgetItem(m_timecode.getTimecodeFromFrames(frame)));
+ QString currentPos;
+ if (KdenliveSettings::frametimecode()) currentPos = QString::number(frame);
+ else currentPos = m_timecode.getTimecodeFromFrames(frame);
+ keyframe_list->setVerticalHeaderItem(j, new QTableWidgetItem(currentPos));
keyframe_list->setItem(j, columnId, new QTableWidgetItem(frames.at(i).section(':', 1, 1)));
keyframe_list->resizeRowToContents(j);
}
}
+ keyframe_list->resizeColumnsToContents();
keyframe_list->blockSignals(false);
+ slotAdjustKeyframeInfo(false);
}
void KeyframeEdit::setupParam()
kDebug() << " INSERT COL: " << col << ", " << paramName;
keyframe_list->insertColumn(col);
keyframe_list->setHorizontalHeaderItem(col, new QTableWidgetItem(paramName));
+ m_slidersLayout = new QGridLayout;
+ m_slidersLayout->addWidget(new QLabel(paramName), 0, 0);
+ QSlider *sl = new QSlider(Qt::Horizontal, this);
+ sl->setRange(m_params.at(0).attribute("min").toInt(), m_params.at(0).attribute("max").toInt());
+ connect(sl, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int)));
+ m_slidersLayout->addWidget(sl, 0, 1);
+ param_sliders->setLayout(m_slidersLayout);
+ keyframe_list->setSelectionBehavior(QAbstractItemView::SelectRows);
+ keyframe_list->setSelectionMode(QAbstractItemView::SingleSelection);
+
QStringList frames = m_params.at(0).attribute("keyframes").split(";", QString::SkipEmptyParts);
for (int i = 0; i < frames.count(); i++) {
keyframe_list->insertRow(i);
- QString framePos = m_timecode.getTimecodeFromFrames(frames.at(i).section(':', 0, 0).toInt());
+ int currentpos = frames.at(i).section(':', 0, 0).toInt();
+ QString framePos;
+ if (KdenliveSettings::frametimecode()) framePos = QString::number(currentpos);
+ else framePos = m_timecode.getTimecodeFromFrames(currentpos);
keyframe_list->setVerticalHeaderItem(i, new QTableWidgetItem(framePos));
keyframe_list->setItem(i, col, new QTableWidgetItem(frames.at(i).section(':', 1, 1)));
+ if ((m_active_keyframe > -1) && (m_active_keyframe == currentpos)) {
+ keyframe_list->setCurrentCell(i, 0);
+ keyframe_list->selectRow(i);
+ }
//item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled);
}
/*QTreeWidgetItem *first = keyframe_list->topLevelItem(0);
if (first) keyframe_list->setCurrentItem(first);*/
keyframe_list->blockSignals(false);
- keyframe_list->setCurrentCell(0, 0);
- //slotAdjustKeyframeInfo();
+ //keyframe_list->setCurrentCell(0, 0);
+ slotAdjustKeyframeInfo(false);
button_delete->setEnabled(keyframe_list->rowCount() > 1);
}
keyframe_list->removeRow(keyframe_list->currentRow());
row = qMin(row, keyframe_list->rowCount() - 1);
keyframe_list->setCurrentCell(row, col);
- slotGenerateParams(row, col);
+ keyframe_list->selectRow(row);
+ generateAllParams();
button_delete->setEnabled(keyframe_list->rowCount() > 1);
}
int row = keyframe_list->currentRow();
int col = keyframe_list->currentColumn();
int newrow = row;
- int pos1 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row)->text());
+ int pos1;
+ if (KdenliveSettings::frametimecode()) pos1 = keyframe_list->verticalHeaderItem(row)->text().toInt();
+ else pos1 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row)->text());
+
int result;
kDebug() << "// ADD KF: " << row << ", MAX: " << keyframe_list->rowCount() << ", POS: " << pos1;
if (row < (keyframe_list->rowCount() - 1)) {
- int pos2 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row + 1)->text());
+ int pos2;
+ if (KdenliveSettings::frametimecode()) pos2 = keyframe_list->verticalHeaderItem(row + 1)->text().toInt();
+ else pos2 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row + 1)->text());
result = pos1 + (pos2 - pos1) / 2;
newrow++;
} else if (row == 0) {
result = m_min;
}
} else {
- int pos2 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row - 1)->text());
+ int pos2;
+ if (KdenliveSettings::frametimecode()) pos2 = keyframe_list->verticalHeaderItem(row - 1)->text().toInt();
+ else pos2 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row - 1)->text());
result = pos2 + (pos1 - pos2) / 2;
}
keyframe_list->insertRow(newrow);
- keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(m_timecode.getTimecodeFromFrames(result)));
- keyframe_list->setItem(newrow, keyframe_list->currentColumn(), new QTableWidgetItem(item->text()));
- keyframe_list->resizeRowToContents(newrow);
+ QString currentPos;
+ if (KdenliveSettings::frametimecode()) currentPos = QString::number(result);
+ else currentPos = m_timecode.getTimecodeFromFrames(result);
+ keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(currentPos));
+ for (int i = 0; i < keyframe_list->columnCount(); i++) {
+ keyframe_list->setItem(newrow, i, new QTableWidgetItem(keyframe_list->item(item->row(), i)->text()));
+ }
+ keyframe_list->resizeRowsToContents();
+ //keyframe_list->resizeRowToContents(newrow);
slotAdjustKeyframeInfo();
keyframe_list->blockSignals(false);
- slotGenerateParams(newrow, keyframe_list->currentColumn());
+ generateAllParams();
button_delete->setEnabled(keyframe_list->rowCount() > 1);
keyframe_list->setCurrentCell(newrow, col);
+ keyframe_list->selectRow(newrow);
//slotGenerateParams(newrow, 0);
}
void KeyframeEdit::slotGenerateParams(int row, int column)
{
+ if (column == -1) {
+ // position of keyframe changed
+ QTableWidgetItem *item = keyframe_list->item(row, 0);
+ if (item == NULL) return;
+ QString val = keyframe_list->verticalHeaderItem(row)->text();
+ int pos;
+ if (KdenliveSettings::frametimecode()) pos = val.toInt();
+ else pos = m_timecode.getFrameCount(val);
+
+ if (pos <= m_min) {
+ pos = m_min;
+ if (KdenliveSettings::frametimecode()) val = QString::number(pos);
+ else val = m_timecode.getTimecodeFromFrames(pos);
+ }
+ if (pos > m_max) {
+ pos = m_max;
+ if (KdenliveSettings::frametimecode()) val = QString::number(pos);
+ else val = m_timecode.getTimecodeFromFrames(pos);
+ }
+ if (val != keyframe_list->verticalHeaderItem(row)->text()) keyframe_list->verticalHeaderItem(row)->setText(val);
+
+ for (int col = 0; col < keyframe_list->horizontalHeader()->count(); col++) {
+ item = keyframe_list->item(row, col);
+ int v = item->text().toInt();
+ if (v >= m_params.at(col).attribute("max").toInt()) item->setText(m_params.at(col).attribute("max"));
+ if (v <= m_params.at(col).attribute("min").toInt()) item->setText(m_params.at(col).attribute("min"));
+ QString keyframes;
+ for (int i = 0; i < keyframe_list->rowCount(); i++) {
+ if (keyframe_list->item(i, col)) {
+ int pos3;
+ if (KdenliveSettings::frametimecode()) pos3 = keyframe_list->verticalHeaderItem(i)->text().toInt();
+ else pos3 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text());
+ keyframes.append(QString::number(pos3) + ':' + keyframe_list->item(i, col)->text() + ';');
+ }
+ }
+ m_params[col].setAttribute("keyframes", keyframes);
+ }
+
+ emit parameterChanged();
+ return;
+
+ }
QTableWidgetItem *item = keyframe_list->item(row, column);
if (item == NULL) return;
QString val = keyframe_list->verticalHeaderItem(row)->text();
- int pos = m_timecode.getFrameCount(val);
+ ;
+ int pos;
+ if (KdenliveSettings::frametimecode()) pos = val.toInt();
+ else pos = m_timecode.getFrameCount(val);
+
if (pos <= m_min) {
pos = m_min;
- val = m_timecode.getTimecodeFromFrames(pos);
+ if (KdenliveSettings::frametimecode()) val = QString::number(pos);
+ else val = m_timecode.getTimecodeFromFrames(pos);
}
if (pos > m_max) {
pos = m_max;
- val = m_timecode.getTimecodeFromFrames(pos);
+ if (KdenliveSettings::frametimecode()) val = QString::number(pos);
+ else val = m_timecode.getTimecodeFromFrames(pos);
}
/*QList<QTreeWidgetItem *> duplicates = keyframe_list->findItems(val, Qt::MatchExactly, 0);
duplicates.removeAll(item);
int v = item->text().toInt();
if (v >= m_params.at(column).attribute("max").toInt()) item->setText(m_params.at(column).attribute("max"));
if (v <= m_params.at(column).attribute("min").toInt()) item->setText(m_params.at(column).attribute("min"));
- slotAdjustKeyframeInfo();
+ slotAdjustKeyframeInfo(false);
QString keyframes;
for (int i = 0; i < keyframe_list->rowCount(); i++) {
- keyframes.append(QString::number(m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text())) + ':' + keyframe_list->item(i, 0)->text() + ';');
+ if (keyframe_list->item(i, column)) {
+ int pos3;
+ if (KdenliveSettings::frametimecode()) pos3 = keyframe_list->verticalHeaderItem(i)->text().toInt();
+ else pos3 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text());
+ keyframes.append(QString::number(pos3) + ':' + keyframe_list->item(i, column)->text() + ';');
+ }
}
m_params[column].setAttribute("keyframes", keyframes);
emit parameterChanged();
}
-void KeyframeEdit::slotAdjustKeyframeInfo()
+void KeyframeEdit::generateAllParams()
+{
+ for (int col = 0; col < keyframe_list->columnCount(); col++) {
+ QString keyframes;
+ for (int i = 0; i < keyframe_list->rowCount(); i++) {
+ if (keyframe_list->item(i, col)) {
+ int pos3;
+ if (KdenliveSettings::frametimecode()) pos3 = keyframe_list->verticalHeaderItem(i)->text().toInt();
+ else pos3 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text());
+ keyframes.append(QString::number(pos3) + ':' + keyframe_list->item(i, col)->text() + ';');
+ }
+ }
+ m_params[col].setAttribute("keyframes", keyframes);
+ }
+ emit parameterChanged();
+}
+
+const QString KeyframeEdit::getValue(const QString &name)
+{
+ for (int col = 0; col < keyframe_list->columnCount(); col++) {
+ QDomNode na = m_params.at(col).firstChildElement("name");
+ QString paramName = i18n(na.toElement().text().toUtf8().data());
+ kDebug() << paramName << " == " << name;
+ if (paramName == name) return m_params.at(col).attribute("keyframes");
+ }
+ return QString();
+}
+
+void KeyframeEdit::slotAdjustKeyframeInfo(bool seek)
{
QTableWidgetItem *item = keyframe_list->currentItem();
if (!item) return;
int max = m_max;
QTableWidgetItem *above = keyframe_list->item(item->row() - 1, item->column());
QTableWidgetItem *below = keyframe_list->item(item->row() + 1, item->column());
- if (above) min = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(above->row())->text()) + 1;
- if (below) max = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(below->row())->text()) - 1;
+ if (above) {
+ if (KdenliveSettings::frametimecode()) min = keyframe_list->verticalHeaderItem(above->row())->text().toInt();
+ else min = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(above->row())->text());
+ min++;
+ }
+ if (below) {
+ if (KdenliveSettings::frametimecode()) max = keyframe_list->verticalHeaderItem(below->row())->text().toInt();
+ else max = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(below->row())->text());
+ max--;
+ }
keyframe_pos->blockSignals(true);
keyframe_pos->setRange(min, max);
- keyframe_pos->setValue(m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(item->row())->text()));
+ int pos;
+ if (KdenliveSettings::frametimecode()) pos = keyframe_list->verticalHeaderItem(item->row())->text().toInt();
+ else pos = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(item->row())->text());
+
+ keyframe_pos->setValue(pos);
keyframe_pos->blockSignals(false);
- keyframe_val->blockSignals(true);
- keyframe_val->setValue(item->text().toInt());
- keyframe_val->blockSignals(false);
+ for (int col = 0; col < keyframe_list->columnCount(); col++) {
+ QSlider *sl = static_cast <QSlider*>(m_slidersLayout->itemAtPosition(col, 1)->widget());
+ if (!sl) continue;
+ sl->blockSignals(true);
+ sl->setValue(keyframe_list->item(item->row(), col)->text().toInt());
+ sl->blockSignals(false);
+ }
+ if (KdenliveSettings::keyframeseek() && seek) emit seekToPos(keyframe_pos->value() - m_min);
}
void KeyframeEdit::slotAdjustKeyframePos(int value)
{
QTableWidgetItem *item = keyframe_list->currentItem();
- keyframe_list->verticalHeaderItem(item->row())->setText(m_timecode.getTimecodeFromFrames(value));
- slotGenerateParams(item->row(), item->column());
+ QString val;
+ if (KdenliveSettings::frametimecode()) val = QString::number(value);
+ else val = m_timecode.getTimecodeFromFrames(value);
+ keyframe_list->verticalHeaderItem(item->row())->setText(val);
+ slotGenerateParams(item->row(), -1);
+ if (KdenliveSettings::keyframeseek()) emit seekToPos(value - m_min);
}
-void KeyframeEdit::slotAdjustKeyframeValue(int value)
+void KeyframeEdit::slotAdjustKeyframeValue(int /*value*/)
{
QTableWidgetItem *item = keyframe_list->currentItem();
- item->setText(QString::number(value));
+ for (int col = 0; col < keyframe_list->columnCount(); col++) {
+ QSlider *sl = static_cast <QSlider*>(m_slidersLayout->itemAtPosition(col, 1)->widget());
+ if (!sl) continue;
+ int val = sl->value();
+ QTableWidgetItem *nitem = keyframe_list->item(item->row(), col);
+ if (nitem->text().toInt() != val) {
+ nitem->setText(QString::number(val));
+ }
+ }
+ //keyframe_list->item(item->row() - 1, item->column());
+
}
+void KeyframeEdit::slotSetSeeking(int state)
+{
+ KdenliveSettings::setKeyframeseek(state == Qt::Checked);
+}
+
+
/*void KeyframeEdit::slotSaveCurrentParam(QTreeWidgetItem *item, int column)
{
if (item && column == 0) m_previousPos = m_timecode.getFrameCount(item->text(0));