X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframeedit.cpp;h=6085a27f554bae1da7c11b6e343b88fedf055a76;hb=85fea3e247282639f22174f8c998fd8f7c4843ec;hp=3ed920b0c0882b7a9c1cb3403ef56c071a3c3257;hpb=0dd982e178bdffc76c0e8a943e683614498c52e6;p=kdenlive diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index 3ed920b0..6085a27f 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -16,75 +16,115 @@ ***************************************************************************/ #include "keyframeedit.h" +#include "doubleparameterwidget.h" #include "kdenlivesettings.h" #include #include #include +#include +#include - -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, Timecode tc, int activeKeyframe, QWidget* parent) : QWidget(parent), m_min(minFrame), m_max(maxFrame), - m_minVal(minVal), - m_maxVal(maxVal), - m_timecode(tc), - m_previousPos(0) + m_timecode(tc) { setupUi(this); - m_params.append(e); + if (m_max == -1) { + // special case: keyframe for tracks, do not allow keyframes + widgetTable->setHidden(true); + } keyframe_list->setFont(KGlobalSettings::generalFont()); + buttonSeek->setChecked(KdenliveSettings::keyframeseek()); + connect(buttonSeek, SIGNAL(toggled(bool)), this, SLOT(slotSetSeeking(bool))); - //keyframe_list->setHorizontalHeaderLabels(QStringList() << (paramName.isEmpty() ? i18n("Value") : paramName)); - //setResizeMode(1, QHeaderView::Interactive); + buttonKeyframes->setIcon(KIcon("list-add")); 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); - setupParam(); - //keyframe_list->sortItems(0); + buttonResetKeyframe->setIcon(KIcon("edit-undo")); + buttonSeek->setIcon(KIcon("insert-link")); + connect(keyframe_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotAdjustKeyframeInfo())); + connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotGenerateParams(int, int))); + + m_showButtons = new QButtonGroup(this); + m_slidersLayout = new QGridLayout(param_sliders); + keyframe_list->setSelectionBehavior(QAbstractItemView::SelectRows); + keyframe_list->setSelectionMode(QAbstractItemView::SingleSelection); + addParameter(e, activeKeyframe); keyframe_list->resizeRowsToContents(); - keyframe_list->verticalHeader()->setResizeMode(QHeaderView::Fixed); //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(buttonKeyframes, SIGNAL(clicked()), this, SLOT(slotKeyframeMode())); + connect(buttonResetKeyframe, SIGNAL(clicked()), this, SLOT(slotResetKeyframe())); connect(keyframe_pos, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframePos(int))); - connect(keyframe_val, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int))); + connect(m_showButtons, SIGNAL(buttonClicked(int)), this, SLOT(slotUpdateVisibleParameter(int))); + + //connect(keyframe_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotSaveCurrentParam(QTreeWidgetItem *, 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); + + // Do not show keyframe table if only one keyframe exists at the beginning + if (keyframe_list->rowCount() < 2 && getPos(0) == m_min && m_max != -1) + widgetTable->setHidden(true); + else + buttonKeyframes->setHidden(true); } 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; + } } -void KeyframeEdit::addParameter(QDomElement e) +void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) { 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); + + 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); + + QRadioButton *radio = new QRadioButton(this); + m_showButtons->addButton(radio, columnId); + if (e.attribute("intimeline") == "1") + radio->setChecked(true); + m_slidersLayout->addWidget(radio, 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 = getPos(j); if (frame == currentPos) { keyframe_list->setItem(j, columnId, new QTableWidgetItem(frames.at(i).section(':', 1, 1))); found = true; @@ -94,50 +134,32 @@ void KeyframeEdit::addParameter(QDomElement e) } } if (!found) { - //int newRow = keyframe_list->rowCount(); keyframe_list->insertRow(j); - keyframe_list->setVerticalHeaderItem(j, new QTableWidgetItem(m_timecode.getTimecodeFromFrames(frame))); + 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); } + if ((activeKeyframe > -1) && (activeKeyframe == frame)) { + keyframe_list->setCurrentCell(i, columnId); + keyframe_list->selectRow(i); + } } + keyframe_list->resizeColumnsToContents(); keyframe_list->blockSignals(false); -} - -void KeyframeEdit::setupParam() -{ - keyframe_list->blockSignals(true); - keyframe_list->clear(); - 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)); - 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()); - keyframe_list->setVerticalHeaderItem(i, new QTableWidgetItem(framePos)); - keyframe_list->setItem(i, col, new QTableWidgetItem(frames.at(i).section(':', 1, 1))); - //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(); + slotAdjustKeyframeInfo(false); button_delete->setEnabled(keyframe_list->rowCount() > 1); } void KeyframeEdit::slotDeleteKeyframe() { - if (keyframe_list->rowCount() < 2) return; + 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); } @@ -149,12 +171,11 @@ void KeyframeEdit::slotAddKeyframe() 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 = getPos(row); + 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()); - result = pos1 + (pos2 - pos1) / 2; + result = pos1 + (getPos(row + 1) - pos1) / 2; newrow++; } else if (row == 0) { if (pos1 == m_min) { @@ -164,54 +185,91 @@ void KeyframeEdit::slotAddKeyframe() result = m_min; } } else { - int pos2 = m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(row - 1)->text()); + int pos2 = getPos(row - 1); result = pos2 + (pos1 - pos2) / 2; } keyframe_list->insertRow(newrow); - keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(m_timecode.getTimecodeFromFrames(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->resizeRowToContents(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(); slotAdjustKeyframeInfo(); keyframe_list->blockSignals(false); 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; + + int pos = getPos(row); + if (pos <= m_min) + pos = m_min; + if (m_max != -1 && 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() + ';'); + } + 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); - if (pos <= m_min) { + if (item == NULL) + return; + + int pos = getPos(row); + if (pos <= m_min) pos = m_min; - val = m_timecode.getTimecodeFromFrames(pos); - } - if (pos > m_max) { + if (m_max != -1 && 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 (val != keyframe_list->verticalHeaderItem(row)->text()) keyframe_list->verticalHeaderItem(row)->setText(val); + 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(); + 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->rowCount(); i++) { - if (keyframe_list->item(i, column)) keyframes.append(QString::number(m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text())) + ':' + keyframe_list->item(i, column)->text() + ';'); + 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(); @@ -220,49 +278,168 @@ void KeyframeEdit::slotGenerateParams(int row, int column) 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(m_timecode.getFrameCount(keyframe_list->verticalHeaderItem(i)->text())) + ':' + keyframe_list->item(i, col)->text() + ';'); - } - m_params[col].setAttribute("keyframes", keyframes); + 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); } emit parameterChanged(); } -void KeyframeEdit::slotAdjustKeyframeInfo() +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()); + 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; + if (!item) + return; int min = m_min; 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) + 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(keyframe_list->verticalHeaderItem(item->row())->text())); + keyframe_pos->setValue(getPos(item->row())); 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++) { + 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::slotAdjustKeyframePos(int value) { QTableWidgetItem *item = keyframe_list->currentItem(); - keyframe_list->verticalHeaderItem(item->row())->setText(m_timecode.getTimecodeFromFrames(value)); - slotGenerateParams(item->row(), item->column()); + keyframe_list->verticalHeaderItem(item->row())->setText(getPosString(value)); + slotGenerateParams(item->row(), -1); + if (KdenliveSettings::keyframeseek()) + emit seekToPos(value - m_min); } void KeyframeEdit::slotAdjustKeyframeValue(int value) { + Q_UNUSED(value); + QTableWidgetItem *item = keyframe_list->currentItem(); - item->setText(QString::number(value)); + 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()); } -/*void KeyframeEdit::slotSaveCurrentParam(QTreeWidgetItem *item, int column) +QString KeyframeEdit::getPosString(int pos) { - if (item && column == 0) m_previousPos = m_timecode.getFrameCount(item->text(0)); -}*/ + if (KdenliveSettings::frametimecode()) + return QString::number(pos); + else + return m_timecode.getTimecodeFromFrames(pos); +} + +void KeyframeEdit::slotSetSeeking(bool seek) +{ + KdenliveSettings::setKeyframeseek(seek); +} + +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::slotKeyframeMode() +{ + widgetTable->setHidden(false); + buttonKeyframes->setHidden(true); + slotAddKeyframe(); +} + +void KeyframeEdit::slotResetKeyframe() +{ + for (int col = 0; col < keyframe_list->columnCount(); ++col) { + DoubleParameterWidget *doubleparam = static_cast(m_slidersLayout->itemAtPosition(col, 0)->widget()); + if (doubleparam) + doubleparam->slotReset(); + } +} + +void KeyframeEdit::slotUpdateVisibleParameter(int id, bool update) +{ + for (int i = 0; i < m_params.count(); ++i) + m_params[i].setAttribute("intimeline", (i == id ? "1" : "0")); + if (update) emit parameterChanged(); +} + +bool KeyframeEdit::isVisibleParam(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()); + if (paramName == name) + return m_params.at(col).attribute("intimeline") == "1"; + } + return false; +} + +void KeyframeEdit::checkVisibleParam() +{ + if (m_params.count() == 0) + return; + + foreach(QDomElement elem, m_params) { + if (elem.attribute("intimeline") == "1") + return; + } + + slotUpdateVisibleParameter(0, false); + QRadioButton *radio = static_cast(m_slidersLayout->itemAtPosition(0, 1)->widget()); + if (radio) + radio->setChecked(true); +} +#include "keyframeedit.moc"