X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframeedit.cpp;h=eb21967eeb60c2fd843b65b01e6dbd34fb114fea;hb=4e56ce77c4559c6ae42dab27fe70f725dca3eb3e;hp=847caaab32f7578f227604d9fc3c2da9c4dbf511;hpb=a646f250a5cf8f2027d8a2924d12925444e613bc;p=kdenlive diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index 847caaab..eb21967e 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -16,6 +16,7 @@ ***************************************************************************/ #include "keyframeedit.h" +#include "doubleparameterwidget.h" #include "kdenlivesettings.h" #include @@ -23,159 +24,394 @@ #include - -KeyframeEdit::KeyframeEdit(QDomElement e, int maxFrame, int minVal, int maxVal, Timecode tc, QWidget* parent) : +KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal, int maxVal, Timecode tc, int active_keyframe, QWidget* parent) : QWidget(parent), - m_param(e), + 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.cloneNode().toElement()); keyframe_list->setFont(KGlobalSettings::generalFont()); - keyframe_list->setHeaderLabels(QStringList() << i18n("Position") << i18n("Value")); - //setResizeMode(1, QHeaderView::Interactive); - button_add->setIcon(KIcon("document-new")); - button_delete->setIcon(KIcon("edit-delete")); - connect(keyframe_list, SIGNAL(itemSelectionChanged()/*itemClicked(QTreeWidgetItem *, int)*/), this, SLOT(slotAdjustKeyframeInfo())); + keyframe_seek->setChecked(KdenliveSettings::keyframeseek()); + connect(keyframe_seek, SIGNAL(stateChanged(int)), this, SLOT(slotSetSeeking(int))); + + 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()), this, SLOT(slotAdjustKeyframeInfo())); + connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotGenerateParams(int, int))); setupParam(); - keyframe_list->header()->resizeSections(QHeaderView::ResizeToContents); + + 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(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotGenerateParams(QTreeWidgetItem *, int))); - connect(keyframe_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotSaveCurrentParam(QTreeWidgetItem *, int))); - connect(keyframe_pos, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(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))); keyframe_pos->setPageStep(1); - m_delegate = new KeyItemDelegate(minVal, maxVal); - keyframe_list->setItemDelegate(m_delegate); + if (!keyframe_list->currentItem()) { + keyframe_list->setCurrentCell(0, 0); + keyframe_list->selectRow(0); + } + // ensure the keyframe list shows at least 3 lines + keyframe_list->setMinimumHeight(QFontInfo(keyframe_list->font()).pixelSize() * 9); + /*m_delegate = new KeyItemDelegate(minVal, maxVal); + keyframe_list->setItemDelegate(m_delegate);*/ } KeyframeEdit::~KeyframeEdit() { keyframe_list->blockSignals(true); keyframe_list->clear(); - delete m_delegate; + 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)); + + DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, 0, + m_params.at(columnId).attribute("min").toInt(), m_params.at(columnId).attribute("max").toInt(), + m_params.at(columnId).attribute("default").toInt(), m_params.at(columnId).attribute("suffix"), this); + connect(doubleparam, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int))); + m_slidersLayout->addWidget(doubleparam, columnId, 0); + + 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 = getPos(j); + if (frame == currentPos) { + keyframe_list->setItem(j, columnId, new QTableWidgetItem(frames.at(i).section(':', 1, 1))); + found = true; + break; + } else if (currentPos > frame) { + break; + } + } + if (!found) { + keyframe_list->insertRow(j); + keyframe_list->setVerticalHeaderItem(j, new QTableWidgetItem(getPosString(frame))); + 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(QDomElement e) +void KeyframeEdit::setupParam() { - if (!e.isNull()) m_param = e; + keyframe_list->blockSignals(true); keyframe_list->clear(); - QStringList frames = m_param.attribute("keyframes").split(";", QString::SkipEmptyParts); + int col = keyframe_list->columnCount(); + QDomNode na = m_params.at(0).firstChildElement("name"); + QString paramName = i18n(na.toElement().text().toUtf8().data()); + kDebug() << " INSERT COL: " << col << ", " << paramName; + keyframe_list->insertColumn(col); + keyframe_list->setHorizontalHeaderItem(col, new QTableWidgetItem(paramName)); + m_slidersLayout = new QGridLayout(param_sliders); + + DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, 0, + m_params.at(0).attribute("min").toInt(), m_params.at(0).attribute("max").toInt(), + m_params.at(0).attribute("default").toInt(), m_params.at(0).attribute("suffix"), this); + connect(doubleparam, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int))); + m_slidersLayout->addWidget(doubleparam, 0, 0); + + keyframe_list->setSelectionBehavior(QAbstractItemView::SelectRows); + keyframe_list->setSelectionMode(QAbstractItemView::SingleSelection); + + QStringList frames = m_params.at(0).attribute("keyframes").split(";", QString::SkipEmptyParts); + setEnabled(frames.count() > 0); for (int i = 0; i < frames.count(); i++) { - QString framePos = m_timecode.getTimecodeFromFrames(frames.at(i).section(':', 0, 0).toInt()); - QTreeWidgetItem *item = new QTreeWidgetItem(QStringList() << framePos << frames.at(i).section(':', 1, 1)); - item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled); - keyframe_list->addTopLevelItem(item); + keyframe_list->insertRow(i); + int currentpos = frames.at(i).section(':', 0, 0).toInt(); + keyframe_list->setVerticalHeaderItem(i, new QTableWidgetItem(getPosString(currentpos))); + 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); - slotAdjustKeyframeInfo(); - button_delete->setEnabled(keyframe_list->topLevelItemCount() > 2); + /*QTreeWidgetItem *first = keyframe_list->topLevelItem(0); + if (first) keyframe_list->setCurrentItem(first);*/ + keyframe_list->blockSignals(false); + //keyframe_list->setCurrentCell(0, 0); + slotAdjustKeyframeInfo(false); + button_delete->setEnabled(keyframe_list->rowCount() > 1); } void KeyframeEdit::slotDeleteKeyframe() { - if (keyframe_list->topLevelItemCount() < 3) return; - QTreeWidgetItem *item = keyframe_list->currentItem(); - if (item) { - delete item; - slotGenerateParams(); - } - button_delete->setEnabled(keyframe_list->topLevelItemCount() > 2); + if (keyframe_list->rowCount() < 2) + return; + int col = keyframe_list->currentColumn(); + int row = keyframe_list->currentRow(); + keyframe_list->removeRow(keyframe_list->currentRow()); + row = qMin(row, keyframe_list->rowCount() - 1); + keyframe_list->setCurrentCell(row, col); + keyframe_list->selectRow(row); + generateAllParams(); + button_delete->setEnabled(keyframe_list->rowCount() > 1); } void KeyframeEdit::slotAddKeyframe() { keyframe_list->blockSignals(true); - int pos2; - QTreeWidgetItem *item = keyframe_list->currentItem(); - if (item == NULL) return; - int ix = keyframe_list->indexOfTopLevelItem(item); - int pos1 = m_timecode.getFrameCount(item->text(0)); - QTreeWidgetItem *below = keyframe_list->topLevelItem(ix + 1); - if (below == NULL) below = keyframe_list->topLevelItem(ix - 1); - if (below == NULL) { - if (pos1 == 0) pos2 = m_max; - else pos2 = 0; + QTableWidgetItem *item = keyframe_list->currentItem(); + int row = keyframe_list->currentRow(); + int col = keyframe_list->currentColumn(); + int newrow = row; + int pos1 = getPos(row); + + int result; + kDebug() << "// ADD KF: " << row << ", MAX: " << keyframe_list->rowCount() << ", POS: " << pos1; + if (row < (keyframe_list->rowCount() - 1)) { + result = pos1 + (getPos(row + 1) - pos1) / 2; + newrow++; + } else if (row == 0) { + if (pos1 == m_min) { + result = m_max - 1; + newrow++; + } else { + result = m_min; + } } else { - pos2 = m_timecode.getFrameCount(below->text(0)); + int pos2 = getPos(row - 1); + result = pos2 + (pos1 - pos2) / 2; } - int result = (pos1 + pos2) / 2; - if (result > pos1) ix++; - QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList() << m_timecode.getTimecodeFromFrames(result) << item->text(1)); - newItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled); - keyframe_list->insertTopLevelItem(ix, newItem); - keyframe_list->setCurrentItem(newItem); + keyframe_list->insertRow(newrow); + keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(getPosString(result))); + 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); - button_delete->setEnabled(keyframe_list->topLevelItemCount() > 2); - slotGenerateParams(); + generateAllParams(); + button_delete->setEnabled(keyframe_list->rowCount() > 1); + keyframe_list->setCurrentCell(newrow, col); + keyframe_list->selectRow(newrow); + //slotGenerateParams(newrow, 0); } -void KeyframeEdit::slotGenerateParams(QTreeWidgetItem *item, int column) +void KeyframeEdit::slotGenerateParams(int row, int column) { - if (item) { - if (column == 0) { - QString val = item->text(0); - int pos = m_timecode.getFrameCount(val); - if (pos <= 0) { - pos = 0; - val = m_timecode.getTimecodeFromFrames(pos); - } - if (pos > m_max) { - pos = m_max; - val = m_timecode.getTimecodeFromFrames(pos); - } - QList duplicates = keyframe_list->findItems(val, Qt::MatchExactly, 0); - duplicates.removeAll(item); - if (!duplicates.isEmpty()) { - // Trying to insert a keyframe at existing value, revert it - val = m_timecode.getTimecodeFromFrames(m_previousPos); + if (column == -1) { + // position of keyframe changed + QTableWidgetItem *item = keyframe_list->item(row, 0); + if (item == NULL) + return; + + int pos = getPos(row); + if (pos <= m_min) + pos = m_min; + if (pos > m_max) + pos = m_max; + QString val = getPosString(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)) + keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, col)->text() + ';'); } - if (val != item->text(0)) item->setText(0, val); - } - if (column == 1) { - if (item->text(1).toInt() >= m_param.attribute("max").toInt()) item->setText(1, m_param.attribute("max")); - if (item->text(1).toInt() <= m_param.attribute("min").toInt()) item->setText(1, m_param.attribute("min")); + m_params[col].setAttribute("keyframes", keyframes); } + + emit parameterChanged(); + return; + } + QTableWidgetItem *item = keyframe_list->item(row, column); + if (item == NULL) + return; + + int pos = getPos(row); + if (pos <= m_min) + pos = m_min; + if (pos > m_max) + pos = m_max; + /*QList duplicates = keyframe_list->findItems(val, Qt::MatchExactly, 0); + duplicates.removeAll(item); + if (!duplicates.isEmpty()) { + // Trying to insert a keyframe at existing value, revert it + val = m_timecode.getTimecodeFromFrames(m_previousPos); + }*/ + QString val = getPosString(pos); + if (val != keyframe_list->verticalHeaderItem(row)->text()) + keyframe_list->verticalHeaderItem(row)->setText(val); + + 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(false); + QString keyframes; - for (int i = 0; i < keyframe_list->topLevelItemCount(); i++) { - QTreeWidgetItem *item = keyframe_list->topLevelItem(i); - keyframes.append(QString::number(m_timecode.getFrameCount(item->text(0))) + ':' + item->text(1) + ';'); + for (int i = 0; i < keyframe_list->rowCount(); i++) { + if (keyframe_list->item(i, column)) + keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, column)->text() + ';'); + } + m_params[column].setAttribute("keyframes", keyframes); + emit parameterChanged(); +} + +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)) + keyframes.append(QString::number(getPos(i)) + ':' + keyframe_list->item(i, col)->text() + ';'); + } + m_params[col].setAttribute("keyframes", keyframes); } - m_param.setAttribute("keyframes", keyframes); emit parameterChanged(); } -void KeyframeEdit::slotAdjustKeyframeInfo() +const QString KeyframeEdit::getValue(const QString &name) { - QTreeWidgetItem *item = keyframe_list->currentItem(); - if (!item) return; - int min = 0; + 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 min = m_min; int max = m_max; - QTreeWidgetItem *above = keyframe_list->itemAbove(item); - QTreeWidgetItem *below = keyframe_list->itemBelow(item); - if (above) min = m_timecode.getFrameCount(above->text(0)) + 1; - if (below) max = m_timecode.getFrameCount(below->text(0)) - 1; + QTableWidgetItem *above = keyframe_list->item(item->row() - 1, item->column()); + QTableWidgetItem *below = keyframe_list->item(item->row() + 1, item->column()); + if (above) + min = getPos(above->row()) + 1; + if (below) + max = getPos(below->row()) - 1; + keyframe_pos->blockSignals(true); keyframe_pos->setRange(min, max); - keyframe_pos->setValue(m_timecode.getFrameCount(item->text(0))); + keyframe_pos->setValue(getPos(item->row())); keyframe_pos->blockSignals(false); + for (int col = 0; col < keyframe_list->columnCount(); col++) { + DoubleParameterWidget *doubleparam = static_cast (m_slidersLayout->itemAtPosition(col, 0)->widget()); + if (!doubleparam) + continue; + doubleparam->blockSignals(true); + if (keyframe_list->item(item->row(), col)) { + doubleparam->setValue(keyframe_list->item(item->row(), col)->text().toInt()); + } else { + kDebug() << "Null pointer exception caught: http://www.kdenlive.org/mantis/view.php?id=1771"; + } + doubleparam->blockSignals(false); + } + if (KdenliveSettings::keyframeseek() && seek) + emit seekToPos(keyframe_pos->value() - m_min); } -void KeyframeEdit::slotAdjustKeyframeValue(int value) +void KeyframeEdit::slotAdjustKeyframePos(int value) { - QTreeWidgetItem *item = keyframe_list->currentItem(); - item->setText(0, m_timecode.getTimecodeFromFrames(value)); + QTableWidgetItem *item = keyframe_list->currentItem(); + keyframe_list->verticalHeaderItem(item->row())->setText(getPosString(value)); + slotGenerateParams(item->row(), -1); + if (KdenliveSettings::keyframeseek()) + emit seekToPos(value - m_min); } -void KeyframeEdit::slotSaveCurrentParam(QTreeWidgetItem *item, int column) +void KeyframeEdit::slotAdjustKeyframeValue(int /*value*/) { - if (item && column == 0) m_previousPos = m_timecode.getFrameCount(item->text(0)); + QTableWidgetItem *item = keyframe_list->currentItem(); + for (int col = 0; col < keyframe_list->columnCount(); col++) { + DoubleParameterWidget *doubleparam = static_cast (m_slidersLayout->itemAtPosition(col, 0)->widget()); + if (!doubleparam) + continue; + int val = doubleparam->getValue(); + 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()); + } +int KeyframeEdit::getPos(int row) +{ + if (KdenliveSettings::frametimecode()) + return keyframe_list->verticalHeaderItem(row)->text().toInt(); + else + return m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row)->text()); +} + +QString KeyframeEdit::getPosString(int pos) +{ + if (KdenliveSettings::frametimecode()) + return QString::number(pos); + else + return m_timecode.getTimecodeFromFrames(pos); +} + +void KeyframeEdit::slotSetSeeking(int state) +{ + KdenliveSettings::setKeyframeseek(state == Qt::Checked); +} + +void KeyframeEdit::updateTimecodeFormat() +{ + for (int row = 0; row < keyframe_list->rowCount(); ++row) { + QString pos = keyframe_list->verticalHeaderItem(row)->text(); + if (KdenliveSettings::frametimecode()) + keyframe_list->verticalHeaderItem(row)->setText(QString::number(m_timecode.getFrameCount(pos))); + else + keyframe_list->verticalHeaderItem(row)->setText(m_timecode.getTimecodeFromFrames(pos.toInt())); + } +} + +/*void KeyframeEdit::slotSaveCurrentParam(QTreeWidgetItem *item, int column) +{ + if (item && column == 0) m_previousPos = m_timecode.getFrameCount(item->text(0)); +}*/ +