X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkeyframeedit.cpp;h=ac367215b7b24a7cbb69165db0642431fc45f708;hb=1404e8f1d631c81399e0e92ffce7dfac0195fabb;hp=2ff4ec6be4d095382cfe38c2f7dddfb1e1fa91f0;hpb=32c8c40056e65b230f058b168e8e078ba066038b;p=kdenlive diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp index 2ff4ec6b..ac367215 100644 --- a/src/keyframeedit.cpp +++ b/src/keyframeedit.cpp @@ -25,11 +25,11 @@ #include -KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent) : - QWidget(parent), - m_min(minFrame), - m_max(maxFrame), - m_timecode(tc) +KeyframeEdit::KeyframeEdit(const QDomElement &e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent) : + QWidget(parent), + m_min(minFrame), + m_max(maxFrame), + m_timecode(tc) { setupUi(this); if (m_max == -1) { @@ -99,7 +99,7 @@ KeyframeEdit::~KeyframeEdit() } } -void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) +void KeyframeEdit::addParameter(const QDomElement &e, int activeKeyframe) { keyframe_list->blockSignals(true); m_params.append(e.cloneNode().toElement()); @@ -116,8 +116,8 @@ void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) keyframe_list->setHorizontalHeaderItem(columnId, new QTableWidgetItem(paramName)); DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, 0, - m_params.at(columnId).attribute("min").toDouble(), m_params.at(columnId).attribute("max").toDouble(), - m_params.at(columnId).attribute("default").toDouble(), comment, columnId, m_params.at(columnId).attribute("suffix"), m_params.at(columnId).attribute("decimals").toInt(), this); + m_params.at(columnId).attribute("min").toDouble(), m_params.at(columnId).attribute("max").toDouble(), + m_params.at(columnId).attribute("default").toDouble(), comment, columnId, m_params.at(columnId).attribute("suffix"), m_params.at(columnId).attribute("decimals").toInt(), this); connect(doubleparam, SIGNAL(valueChanged(double)), this, SLOT(slotAdjustKeyframeValue(double))); connect(this, SIGNAL(showComments(bool)), doubleparam, SLOT(slotShowComment(bool))); connect(doubleparam, SIGNAL(setInTimeline(int)), this, SLOT(slotUpdateVisibleParameter(int))); @@ -127,7 +127,7 @@ void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe) } QStringList frames = e.attribute("keyframes").split(';', QString::SkipEmptyParts); - for (int i = 0; i < frames.count(); i++) { + for (int i = 0; i < frames.count(); ++i) { int frame = frames.at(i).section(':', 0, 0).toInt(); bool found = false; int j; @@ -210,7 +210,7 @@ void KeyframeEdit::slotAddKeyframe() keyframe_list->insertRow(newrow); keyframe_list->setVerticalHeaderItem(newrow, new QTableWidgetItem(getPosString(result))); - for (int i = 0; i < keyframe_list->columnCount(); i++) + 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(); @@ -242,14 +242,14 @@ void KeyframeEdit::slotGenerateParams(int row, int column) for (int col = 0; col < keyframe_list->horizontalHeader()->count(); col++) { item = keyframe_list->item(row, col); - if (!item) continue; + if (!item) continue; 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++) { + 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() + ';'); } @@ -287,7 +287,7 @@ void KeyframeEdit::slotGenerateParams(int row, int column) slotAdjustKeyframeInfo(false); QString keyframes; - for (int i = 0; i < keyframe_list->rowCount(); i++) { + 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() + ';'); } @@ -299,7 +299,7 @@ void KeyframeEdit::generateAllParams() { for (int col = 0; col < keyframe_list->columnCount(); col++) { QString keyframes; - for (int i = 0; i < keyframe_list->rowCount(); i++) { + 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() + ';'); } @@ -383,6 +383,8 @@ void KeyframeEdit::slotAdjustKeyframeValue(double value) int KeyframeEdit::getPos(int row) { + if (!keyframe_list->verticalHeaderItem(row)) + return 0; if (KdenliveSettings::frametimecode()) return keyframe_list->verticalHeaderItem(row)->text().toInt(); else @@ -434,7 +436,7 @@ void KeyframeEdit::slotResetKeyframe() 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")); + m_params[i].setAttribute("intimeline", (i == id ? "1" : "0")); } for (int col = 0; col < keyframe_list->columnCount(); col++) { DoubleParameterWidget *doubleparam = static_cast (m_slidersLayout->itemAtPosition(col, 0)->widget());