X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=00ebba69d55ecc00fe2b0d9494c31a4cbfeb2cab;hb=29b7373a465ab472ad5be4edf00e98aabfe7825e;hp=3971fcc8b4b7d79f9b71aca2e04b151ac0c99ba8;hpb=1358c7644913c58cfca2b97c3dff9a2d165b7894;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 3971fcc8..00ebba69 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -82,7 +82,7 @@ EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) : m_geometryWidget(NULL) { m_baseWidget = new QWidget(this); - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setFrameStyle(QFrame::NoFrame); setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); @@ -122,9 +122,9 @@ void EffectStackEdit::setFrameSize(QPoint p) QDomNodeList namenode = m_params.elementsByTagName("parameter"); for (int i = 0; i < namenode.count() ; i++) { QDomNode pa = namenode.item(i); - QDomNode na = pa.firstChildElement("name"); + QDomElement na = pa.firstChildElement("name"); QString type = pa.attributes().namedItem("type").nodeValue(); - QString paramName = i18n(na.toElement().text().toUtf8().data()); + QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data()); if (type == "geometry") { if (!KdenliveSettings::on_monitor_effects()) { @@ -148,9 +148,9 @@ void EffectStackEdit::updateTimecodeFormat() QDomNodeList namenode = m_params.elementsByTagName("parameter"); for (int i = 0; i < namenode.count() ; i++) { QDomNode pa = namenode.item(i); - QDomNode na = pa.firstChildElement("name"); + QDomElement na = pa.firstChildElement("name"); QString type = pa.attributes().namedItem("type").nodeValue(); - QString paramName = i18n(na.toElement().text().toUtf8().data()); + QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data()); if (type == "geometry") { if (KdenliveSettings::on_monitor_effects()) { @@ -205,14 +205,14 @@ void EffectStackEdit::updateParameter(const QString &name, const QString &value) } } -void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, int out, bool isEffect) +void EffectStackEdit::transferParamDesc(const QDomElement d, ItemInfo info, bool isEffect) { clearAllItems(); if (m_keyframeEditor) delete m_keyframeEditor; m_keyframeEditor = NULL; m_params = d; - m_in = in; - m_out = out; + m_in = isEffect ? info.cropStart.frames(KdenliveSettings::project_fps()) : info.startPos.frames(KdenliveSettings::project_fps()); + m_out = isEffect ? (info.cropStart + info.cropDuration).frames(KdenliveSettings::project_fps()) - 1 : info.endPos.frames(KdenliveSettings::project_fps()); if (m_params.isNull()) { // kDebug() << "// EMPTY EFFECT STACK"; return; @@ -232,9 +232,10 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in } } #endif - QDomElement e = m_params.toElement(); - const int minFrame = e.attribute("start").toInt(); - const int maxFrame = e.attribute("end").toInt(); + int minFrame = d.attribute("start").toInt(); + int maxFrame = d.attribute("end").toInt(); + // In transitions, maxFrame is in fact one frame after the end of transition + if (maxFrame > 0) maxFrame --; bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters(); setEnabled(!disable); @@ -247,7 +248,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in QDomElement na = pa.firstChildElement("name"); QDomElement commentElem = pa.firstChildElement("comment"); QString type = pa.attribute("type"); - QString paramName = i18n(na.text().toUtf8().data()); + QString paramName = na.isNull() ? pa.attribute("name") : i18n(na.text().toUtf8().data()); QString comment; if (!commentElem.isNull()) comment = i18n(commentElem.text().toUtf8().data()); @@ -255,45 +256,42 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in QString value = pa.attribute("value").isNull() ? pa.attribute("default") : pa.attribute("value"); - /** Currently supported parameter types are: - * constant (=double): a slider with an integer value (use the "factor" attribute to divide the value so that you can get a double - * list: a combobox containing a list of values to choose - * bool: a checkbox - * complex: designed for keyframe parameters, but old and not finished, do not use - * geometry: a rectangle that can be moved & resized, with possible keyframes, used in composite transition - * keyframe: a list widget with a list of entries (position and value) - * color: a color chooser button - * position: a slider representing the position of a frame in the current clip - * curve: a single curve representing multiple points - * wipe: a widget designed for the wipe transition, allowing to choose a position (left, right, top,...) - */ + + /** See effects/README for info on the different types */ if (type == "double" || type == "constant") { - int min; - int max; - if (pa.attribute("min").startsWith('%')) - min = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("min")); + double min; + double max; + if (pa.attribute("min").contains('%')) + min = ProfilesDialog::getStringEval(m_profile, pa.attribute("min"), m_frameSize); else - min = pa.attribute("min").toInt(); - if (pa.attribute("max").startsWith('%')) - max = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("max")); + min = pa.attribute("min").toDouble(); + if (pa.attribute("max").contains('%')) + max = ProfilesDialog::getStringEval(m_profile, pa.attribute("max"), m_frameSize); else - max = pa.attribute("max").toInt(); + max = pa.attribute("max").toDouble(); - DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, (int)(value.toDouble() + 0.5), min, max, - pa.attribute("default").toInt(), comment, -1, pa.attribute("suffix"), this); + DoubleParameterWidget *doubleparam = new DoubleParameterWidget(paramName, value.toDouble(), min, max, + pa.attribute("default").toDouble(), comment, -1, pa.attribute("suffix"), pa.attribute("decimals").toInt(), this); m_vbox->addWidget(doubleparam); m_valueItems[paramName] = doubleparam; - connect(doubleparam, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters())); + connect(doubleparam, SIGNAL(valueChanged(double)), this, SLOT(collectAllParameters())); connect(this, SIGNAL(showComments(bool)), doubleparam, SLOT(slotShowComment(bool))); } else if (type == "list") { Listval *lsval = new Listval; lsval->setupUi(toFillin); - QStringList listitems = pa.attribute("paramlist").split(','); + QStringList listitems = pa.attribute("paramlist").split(';'); + if (listitems.count() == 1) { + // probably custom effect created before change to ';' as separator + listitems = pa.attribute("paramlist").split(","); + } QDomElement list = pa.firstChildElement("paramlistdisplay"); QStringList listitemsdisplay; - if (!list.isNull()) listitemsdisplay = i18n(list.text().toUtf8().data()).split(','); - else listitemsdisplay = i18n(pa.attribute("paramlistdisplay").toUtf8().data()).split(','); + if (!list.isNull()) { + listitemsdisplay = i18n(list.text().toUtf8().data()).split(','); + } else { + listitemsdisplay = i18n(pa.attribute("paramlistdisplay").toUtf8().data()).split(','); + } if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; lsval->list->setIconSize(QSize(30, 30)); @@ -337,7 +335,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); } else if (type == "geometry") { if (KdenliveSettings::on_monitor_effects()) { - m_geometryWidget = new GeometryWidget(m_monitor, m_timecode, pos, isEffect, m_params.hasAttribute("showrotation"), this); + m_geometryWidget = new GeometryWidget(m_monitor, m_timecode, isEffect ? 0 : qMax(0, (int)info.startPos.frames(KdenliveSettings::project_fps())), isEffect, m_params.hasAttribute("showrotation"), this); m_geometryWidget->setFrameSize(m_frameSize); m_geometryWidget->slotShowScene(!disable); // connect this before setupParam to make sure the monitor scene shows up at startup @@ -353,7 +351,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in connect(this, SIGNAL(syncEffectsPos(int)), m_geometryWidget, SLOT(slotSyncPosition(int))); connect(this, SIGNAL(effectStateChanged(bool)), m_geometryWidget, SLOT(slotShowScene(bool))); } else { - Geometryval *geo = new Geometryval(m_profile, m_timecode, m_frameSize, pos); + Geometryval *geo = new Geometryval(m_profile, m_timecode, m_frameSize, isEffect ? 0 : qMax(0, (int)info.startPos.frames(KdenliveSettings::project_fps()))); if (minFrame == maxFrame) geo->setupParam(pa, m_in, m_out); else @@ -373,14 +371,14 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in KeyframeEdit *geo; if (pa.attribute("widget") == "corners") { // we want a corners-keyframe-widget - CornersWidget *corners = new CornersWidget(m_monitor, pa, m_in, m_in + m_out, m_timecode, e.attribute("active_keyframe", "-1").toInt(), this); + CornersWidget *corners = new CornersWidget(m_monitor, pa, m_in, m_out, m_timecode, d.attribute("active_keyframe", "-1").toInt(), this); corners->slotShowScene(!disable); connect(corners, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); connect(this, SIGNAL(effectStateChanged(bool)), corners, SLOT(slotShowScene(bool))); connect(this, SIGNAL(syncEffectsPos(int)), corners, SLOT(slotSyncPosition(int))); geo = static_cast(corners); } else { - geo = new KeyframeEdit(pa, m_in, m_in + m_out, m_timecode, e.attribute("active_keyframe", "-1").toInt()); + geo = new KeyframeEdit(pa, m_in, m_out, m_timecode, d.attribute("active_keyframe", "-1").toInt()); } m_vbox->addWidget(geo); m_valueItems[paramName+"keyframe"] = geo; @@ -417,7 +415,12 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in KisCurveWidget *curve = new KisCurveWidget(this); curve->setMaxPoints(pa.attribute("max").toInt()); QList points; - int number = EffectsList::parameter(e, pa.attribute("number")).toInt(); + int number; + if (d.attribute("version").toDouble() > 0.2) { + number = EffectsList::parameter(d, pa.attribute("number")).toDouble() * 10; + } else { + number = EffectsList::parameter(d, pa.attribute("number")).toInt(); + } QString inName = pa.attribute("inpoints"); QString outName = pa.attribute("outpoints"); int start = pa.attribute("min").toInt(); @@ -426,7 +429,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in in.replace("%i", QString::number(j)); QString out = outName; out.replace("%i", QString::number(j)); - points << QPointF(EffectsList::parameter(e, in).toDouble(), EffectsList::parameter(e, out).toDouble()); + points << QPointF(EffectsList::parameter(d, in).toDouble(), EffectsList::parameter(d, out).toDouble()); } if (!points.isEmpty()) curve->setCurve(KisCubicCurve(points)); @@ -444,7 +447,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in QString depends = pa.attribute("depends"); if (!depends.isEmpty()) - meetDependency(paramName, type, EffectsList::parameter(e, depends)); + meetDependency(paramName, type, EffectsList::parameter(d, depends)); } else if (type == "bezier_spline") { BezierSplineWidget *widget = new BezierSplineWidget(value, this); stretch = false; @@ -453,10 +456,10 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in connect(widget, SIGNAL(modified()), this, SLOT(collectAllParameters())); QString depends = pa.attribute("depends"); if (!depends.isEmpty()) - meetDependency(paramName, type, EffectsList::parameter(e, depends)); + meetDependency(paramName, type, EffectsList::parameter(d, depends)); #ifdef QJSON } else if (type == "roto-spline") { - RotoWidget *roto = new RotoWidget(value, m_monitor, m_in, m_out, m_timecode, this); + RotoWidget *roto = new RotoWidget(value, m_monitor, info, m_timecode, this); roto->slotShowScene(!disable); connect(roto, SIGNAL(valueChanged()), this, SLOT(collectAllParameters())); connect(roto, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); @@ -560,16 +563,17 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in wipeInfo EffectStackEdit::getWipeInfo(QString value) { wipeInfo info; + // Convert old geometry values that used a comma as separator + if (value.contains(',')) value.replace(',','/'); QString start = value.section(';', 0, 0); QString end = value.section(';', 1, 1).section('=', 1, 1); - - if (start.startsWith("-100%,0")) + if (start.startsWith("-100%/0")) info.start = LEFT; - else if (start.startsWith("100%,0")) + else if (start.startsWith("100%/0")) info.start = RIGHT; - else if (start.startsWith("0%,100%")) + else if (start.startsWith("0%/100%")) info.start = DOWN; - else if (start.startsWith("0%,-100%")) + else if (start.startsWith("0%/-100%")) info.start = UP; else info.start = CENTER; @@ -579,13 +583,13 @@ wipeInfo EffectStackEdit::getWipeInfo(QString value) else info.startTransparency = 100; - if (end.startsWith("-100%,0")) + if (end.startsWith("-100%/0")) info.end = LEFT; - else if (end.startsWith("100%,0")) + else if (end.startsWith("100%/0")) info.end = RIGHT; - else if (end.startsWith("0%,100%")) + else if (end.startsWith("0%/100%")) info.end = DOWN; - else if (end.startsWith("0%,-100%")) + else if (end.startsWith("0%/-100%")) info.end = UP; else info.end = CENTER; @@ -605,38 +609,38 @@ QString EffectStackEdit::getWipeString(wipeInfo info) QString end; switch (info.start) { case LEFT: - start = "-100%,0%:100%x100%"; + start = "-100%/0%:100%x100%"; break; case RIGHT: - start = "100%,0%:100%x100%"; + start = "100%/0%:100%x100%"; break; case DOWN: - start = "0%,100%:100%x100%"; + start = "0%/100%:100%x100%"; break; case UP: - start = "0%,-100%:100%x100%"; + start = "0%/-100%:100%x100%"; break; default: - start = "0%,0%:100%x100%"; + start = "0%/0%:100%x100%"; break; } start.append(':' + QString::number(info.startTransparency)); switch (info.end) { case LEFT: - end = "-100%,0%:100%x100%"; + end = "-100%/0%:100%x100%"; break; case RIGHT: - end = "100%,0%:100%x100%"; + end = "100%/0%:100%x100%"; break; case DOWN: - end = "0%,100%:100%x100%"; + end = "0%/100%:100%x100%"; break; case UP: - end = "0%,-100%:100%x100%"; + end = "0%/-100%:100%x100%"; break; default: - end = "0%,0%:100%x100%"; + end = "0%/0%:100%x100%"; break; } end.append(':' + QString::number(info.endTransparency)); @@ -649,12 +653,13 @@ void EffectStackEdit::collectAllParameters() const QDomElement oldparam = m_params.cloneNode().toElement(); QDomElement newparam = oldparam.cloneNode().toElement(); QDomNodeList namenode = newparam.elementsByTagName("parameter"); + QLocale locale; for (int i = 0; i < namenode.count() ; i++) { QDomNode pa = namenode.item(i); - QDomNode na = pa.firstChildElement("name"); + QDomElement na = pa.firstChildElement("name"); QString type = pa.attributes().namedItem("type").nodeValue(); - QString paramName = i18n(na.toElement().text().toUtf8().data()); + QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data()); if (type == "complex") paramName.append("complex"); else if (type == "position") @@ -671,7 +676,7 @@ void EffectStackEdit::collectAllParameters() QString setValue; if (type == "double" || type == "constant") { DoubleParameterWidget *doubleparam = (DoubleParameterWidget*)m_valueItems.value(paramName); - setValue = QString::number(doubleparam->getValue()); + setValue = locale.toString(doubleparam->getValue()); } else if (type == "list") { KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list; setValue = box->itemData(box->currentIndex()).toString(); @@ -724,14 +729,18 @@ void EffectStackEdit::collectAllParameters() QString outName = pa.attributes().namedItem("outpoints").nodeValue(); int off = pa.attributes().namedItem("min").nodeValue().toInt(); int end = pa.attributes().namedItem("max").nodeValue().toInt(); - EffectsList::setParameter(newparam, number, QString::number(points.count())); + if (oldparam.attribute("version").toDouble() > 0.2) { + EffectsList::setParameter(newparam, number, locale.toString(points.count() / 10.)); + } else { + EffectsList::setParameter(newparam, number, QString::number(points.count())); + } for (int j = 0; (j < points.count() && j + off <= end); j++) { QString in = inName; in.replace("%i", QString::number(j + off)); QString out = outName; out.replace("%i", QString::number(j + off)); - EffectsList::setParameter(newparam, in, QString::number(points.at(j).x())); - EffectsList::setParameter(newparam, out, QString::number(points.at(j).y())); + EffectsList::setParameter(newparam, in, locale.toString(points.at(j).x())); + EffectsList::setParameter(newparam, out, locale.toString(points.at(j).y())); } QString depends = pa.attributes().namedItem("depends").nodeValue(); if (!depends.isEmpty())