X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=6a9ab4dd3267d0db61e65b608874962887ff568a;hb=b1d68d8d883f9602f84b7c8a12d73baba63b52d0;hp=f2ce5b1ed32c904bbfab0200ccb9862672da29d4;hpb=60d9d6db7d92c37de9e20f10c137552aa0cafbce;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index f2ce5b1e..6a9ab4dd 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -35,11 +35,14 @@ #include "doubleparameterwidget.h" #include "cornerswidget.h" #include "beziercurve/beziersplinewidget.h" -#include "beziercurve/cubicbezierspline.h" +#ifdef QJSON +#include "rotoscoping/rotowidget.h" +#endif #include #include #include +#include #include #include @@ -47,6 +50,9 @@ #include #include +// For QDomNode debugging (output into files); leaving here as sample code. +//#define DEBUG_ESE + class Boolval: public QWidget, public Ui::Boolval_UI { @@ -72,20 +78,36 @@ EffectStackEdit::EffectStackEdit(Monitor *monitor, QWidget *parent) : m_out(0), m_frameSize(QPoint()), m_keyframeEditor(NULL), - m_monitor(monitor) + m_monitor(monitor), + m_geometryWidget(NULL) { m_baseWidget = new QWidget(this); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); setFrameStyle(QFrame::NoFrame); setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); - + + QPalette p = palette(); + KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor dark_bg = scheme.shade(KColorScheme::DarkShade); + QColor selected_bg = scheme.decoration(KColorScheme::FocusColor).color(); + QColor hover_bg = scheme.decoration(KColorScheme::HoverColor).color(); + QColor light_bg = scheme.shade(KColorScheme::LightShade); + + QString stylesheet(QString("QProgressBar:horizontal {border: 1px solid %1;border-radius:0px;border-top-left-radius: 4px;border-bottom-left-radius: 4px;border-right: 0px;background:%4;padding: 0px;text-align:left center}\ + QProgressBar:horizontal#dragOnly {background: %1} QProgressBar:horizontal:hover#dragOnly {background: %3} QProgressBar:horizontal:hover {border: 1px solid %3;border-right: 0px;}\ + QProgressBar::chunk:horizontal {background: %1;} QProgressBar::chunk:horizontal:hover {background: %3;}\ + QProgressBar:horizontal[inTimeline=\"true\"] { border: 1px solid %2;border-right: 0px;background: %4;padding: 0px;text-align:left center } QProgressBar::chunk:horizontal[inTimeline=\"true\"] {background: %2;}\ + QAbstractSpinBox#dragBox {border: 1px solid %1;border-top-right-radius: 4px;border-bottom-right-radius: 4px;padding-right:0px;} QAbstractSpinBox::down-button#dragBox {width:0px;padding:0px;}\ + QAbstractSpinBox::up-button#dragBox {width:0px;padding:0px;} QAbstractSpinBox[inTimeline=\"true\"]#dragBox { border: 1px solid %2;} QAbstractSpinBox:hover#dragBox {border: 1px solid %3;} ") + .arg(dark_bg.name()).arg(selected_bg.name()).arg(hover_bg.name()).arg(light_bg.name())); + setStyleSheet(stylesheet); + setWidget(m_baseWidget); setWidgetResizable(true); m_vbox = new QVBoxLayout(m_baseWidget); m_vbox->setContentsMargins(0, 0, 0, 0); - m_vbox->setSpacing(0); - //wid->show(); + m_vbox->setSpacing(2); } EffectStackEdit::~EffectStackEdit() @@ -104,10 +126,16 @@ void EffectStackEdit::setFrameSize(QPoint p) QString type = pa.attributes().namedItem("type").nodeValue(); QString paramName = i18n(na.toElement().text().toUtf8().data()); - if (type == "geometry" && !KdenliveSettings::on_monitor_effects()) { - Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); - geom->setFrameSize(m_frameSize); - break; + if (type == "geometry") { + if (!KdenliveSettings::on_monitor_effects()) { + Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); + geom->setFrameSize(m_frameSize); + break; + } + else { + if (m_geometryWidget) m_geometryWidget->setFrameSize(m_frameSize); + break; + } } } } @@ -126,18 +154,19 @@ void EffectStackEdit::updateTimecodeFormat() if (type == "geometry") { if (KdenliveSettings::on_monitor_effects()) { - GeometryWidget *geom = (GeometryWidget*)m_valueItems[paramName+"geometry"]; - geom->updateTimecodeFormat(); + if (m_geometryWidget) m_geometryWidget->updateTimecodeFormat(); } else { Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); geom->updateTimecodeFormat(); } break; - } - if (type == "position") { + } else if (type == "position") { PositionEdit *posi = ((PositionEdit*)m_valueItems[paramName+"position"]); posi->updateTimecodeFormat(); break; + } else if (type == "roto-spline") { + RotoWidget *widget = static_cast(m_valueItems[paramName]); + widget->updateTimecodeFormat(); } } } @@ -148,7 +177,12 @@ void EffectStackEdit::meetDependency(const QString& name, QString type, QString KisCurveWidget *curve = (KisCurveWidget*)m_valueItems[name]; if (curve) { int color = value.toInt(); - curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)color, 0.8))); + curve->setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(curve->size(), (ColorTools::ColorsRGB)(color == 3 ? 4 : color), 0.8))); + } + } else if (type == "bezier_spline") { + BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems[name]; + if (widget) { + widget->setMode((BezierSplineWidget::CurveModes)((int)(value.toDouble() * 10))); } } } @@ -165,39 +199,39 @@ void EffectStackEdit::updateParameter(const QString &name, const QString &value) if (name == "disable") { // if effect is disabled, disable parameters widget - setEnabled(value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters()); - if (KdenliveSettings::on_monitor_effects()) { - // effect disabled, hide monitor scene if any - QDomNodeList namenode = m_params.elementsByTagName("parameter"); - for (int i = 0; i < namenode.count() ; i++) { - QDomNode pa = namenode.item(i); - QDomNode na = pa.firstChildElement("name"); - QString type = pa.attributes().namedItem("type").nodeValue(); - if (type == "geometry") { - QString paramName = i18n(na.toElement().text().toUtf8().data()); - paramName.append("geometry"); - GeometryWidget *geometry = ((GeometryWidget*)m_valueItems.value(paramName)); - geometry->slotShowScene(value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters()); - } - } - } + bool enabled = value.toInt() == 0 || !KdenliveSettings::disable_effect_parameters(); + setEnabled(enabled); + emit effectStateChanged(enabled); } } -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"; +// kDebug() << "// EMPTY EFFECT STACK"; return; } QDomNodeList namenode = m_params.elementsByTagName("parameter"); +#ifdef DEBUG_ESE + QFile debugFile("/tmp/namenodes.txt"); + if (debugFile.open(QFile::WriteOnly | QFile::Truncate)) { + QTextStream out(&debugFile); + QTextStream out2(stdout); + for (int i = 0; i < namenode.size(); i++) { + out << i << ": \n"; + namenode.at(i).save(out, 2); + out2 << i << ": \n"; + namenode.at(i).save(out2, 2); + } + } +#endif QDomElement e = m_params.toElement(); const int minFrame = e.attribute("start").toInt(); const int maxFrame = e.attribute("end").toInt(); @@ -205,6 +239,8 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in bool disable = d.attribute("disable") == "1" && KdenliveSettings::disable_effect_parameters(); setEnabled(!disable); + bool stretch = true; + for (int i = 0; i < namenode.count() ; i++) { QDomElement pa = namenode.item(i).toElement(); @@ -219,42 +255,35 @@ 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; + double min; + double max; if (pa.attribute("min").startsWith('%')) - min = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("min")); + min = ProfilesDialog::getStringEval(m_profile, pa.attribute("min")); else - min = pa.attribute("min").toInt(); + min = pa.attribute("min").toDouble(); if (pa.attribute("max").startsWith('%')) - max = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("max")); + max = ProfilesDialog::getStringEval(m_profile, pa.attribute("max")); 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, 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(this, SIGNAL(showComments()), doubleparam, SLOT(slotShowComment())); + 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 listitemsdisplay = pa.attribute("paramlistdisplay").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 (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; lsval->list->setIconSize(QSize(30, 30)); @@ -271,16 +300,24 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in } if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value)); lsval->name->setText(paramName); + lsval->labelComment->setText(comment); + lsval->widgetComment->setHidden(true); m_valueItems[paramName] = lsval; connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters())); + if (!comment.isEmpty()) + connect(this, SIGNAL(showComments(bool)), lsval->widgetComment, SLOT(setVisible(bool))); m_uiItems.append(lsval); } else if (type == "bool") { Boolval *bval = new Boolval; bval->setupUi(toFillin); bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked); bval->name->setText(paramName); + bval->labelComment->setText(comment); + bval->widgetComment->setHidden(true); m_valueItems[paramName] = bval; connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters())); + if (!comment.isEmpty()) + connect(this, SIGNAL(showComments(bool)), bval->widgetComment, SLOT(setVisible(bool))); m_uiItems.append(bval); } else if (type == "complex") { ComplexParameter *pl = new ComplexParameter; @@ -290,20 +327,23 @@ 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()) { - GeometryWidget *geometry = new GeometryWidget(m_monitor, m_timecode, pos, isEffect, disable, 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 - connect(geometry, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); - connect(geometry, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); + connect(m_geometryWidget, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); + connect(m_geometryWidget, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); if (minFrame == maxFrame) - geometry->setupParam(pa, m_in, m_out); + m_geometryWidget->setupParam(pa, m_in, m_out); else - geometry->setupParam(pa, minFrame, maxFrame); - m_vbox->addWidget(geometry); - m_valueItems[paramName+"geometry"] = geometry; - connect(geometry, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); - connect(this, SIGNAL(syncEffectsPos(int)), geometry, SLOT(slotSyncPosition(int))); + m_geometryWidget->setupParam(pa, minFrame, maxFrame); + m_vbox->addWidget(m_geometryWidget); + m_valueItems[paramName+"geometry"] = m_geometryWidget; + connect(m_geometryWidget, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); + 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 @@ -314,16 +354,30 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); connect(this, SIGNAL(syncEffectsPos(int)), geo, SLOT(slotSyncPosition(int))); } + } else if (type == "addedgeometry") { + // this is a parameter that should be linked to the geometry widget, for example rotation, shear, ... + if (m_geometryWidget) m_geometryWidget->addParameter(pa); } else if (type == "keyframe" || type == "simplekeyframe") { // keyframe editor widget if (m_keyframeEditor == NULL) { - KeyframeEdit *geo = new KeyframeEdit(pa, m_in, m_in + m_out, m_timecode, e.attribute("active_keyframe", "-1").toInt()); + KeyframeEdit *geo; + if (pa.attribute("widget") == "corners") { + // we want a corners-keyframe-widget + CornersWidget *corners = new CornersWidget(m_monitor, pa, m_in, m_out, m_timecode, e.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_out, m_timecode, e.attribute("active_keyframe", "-1").toInt()); + } m_vbox->addWidget(geo); m_valueItems[paramName+"keyframe"] = geo; m_keyframeEditor = geo; connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); connect(geo, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); - connect(this, SIGNAL(showComments()), geo, SIGNAL(showComments())); + connect(this, SIGNAL(showComments(bool)), geo, SIGNAL(showComments(bool))); } else { // we already have a keyframe editor, so just add another column for the new param m_keyframeEditor->addParameter(pa); @@ -382,35 +436,26 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in if (!depends.isEmpty()) meetDependency(paramName, type, EffectsList::parameter(e, depends)); } else if (type == "bezier_spline") { - BezierSplineWidget *widget = new BezierSplineWidget(this); - CubicBezierSpline spline; - spline.fromString(value); - widget->setSpline(spline); + BezierSplineWidget *widget = new BezierSplineWidget(value, this); + stretch = false; m_vbox->addWidget(widget); m_valueItems[paramName] = widget; connect(widget, SIGNAL(modified()), this, SLOT(collectAllParameters())); - } else if (type == "corners") { - CornersWidget *corners = new CornersWidget(m_monitor, pos, isEffect, pa.attribute("factor").toInt(), this); - connect(corners, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int))); - if (minFrame == maxFrame) - corners->setRange(m_in, m_out); - else - corners->setRange(minFrame, maxFrame); - - QString xName = pa.attribute("xpoints"); - QString yName = pa.attribute("ypoints"); - QPolygon points; - int x, y; - for (int j = 1; j <= 4; ++j) { - x = EffectsList::parameter(e, QString(xName).replace("%i", QString::number(j))).toInt(); - y = EffectsList::parameter(e, QString(yName).replace("%i", QString::number(j))).toInt(); - points << QPoint(x, y); - } - corners->setValue(points); - - m_vbox->addWidget(corners); - connect(corners, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); - m_valueItems[paramName] = corners; + QString depends = pa.attribute("depends"); + if (!depends.isEmpty()) + meetDependency(paramName, type, EffectsList::parameter(e, depends)); +#ifdef QJSON + } else if (type == "roto-spline") { + 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))); + connect(roto, SIGNAL(seekToPos(int)), this, SIGNAL(seekTimeline(int))); + connect(this, SIGNAL(syncEffectsPos(int)), roto, SLOT(slotSyncPosition(int))); + connect(this, SIGNAL(effectStateChanged(bool)), roto, SLOT(slotShowScene(bool))); + m_vbox->addWidget(roto); + m_valueItems[paramName] = roto; +#endif } else if (type == "wipe") { Wipeval *wpval = new Wipeval; wpval->setupUi(toFillin); @@ -484,10 +529,22 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in if (toFillin) m_vbox->addWidget(toFillin); } - m_vbox->addStretch(); + + if (stretch) + m_vbox->addStretch(); if (m_keyframeEditor) m_keyframeEditor->checkVisibleParam(); + + // Make sure all doubleparam spinboxes have the same width, looks much better + QList allWidgets = findChildren(); + int minSize = 0; + for (int i = 0; i < allWidgets.count(); i++) { + if (minSize < allWidgets.at(i)->spinSize()) minSize = allWidgets.at(i)->spinSize(); + } + for (int i = 0; i < allWidgets.count(); i++) { + allWidgets.at(i)->setSpinSize(minSize); + } } wipeInfo EffectStackEdit::getWipeInfo(QString value) @@ -596,7 +653,7 @@ void EffectStackEdit::collectAllParameters() paramName.append("geometry"); else if (type == "keyframe") paramName.append("keyframe"); - if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) { + if (type != "simplekeyframe" && type != "fixed" && type != "addedgeometry" && !m_valueItems.contains(paramName)) { kDebug() << "// Param: " << paramName << " NOT FOUND"; continue; } @@ -619,12 +676,13 @@ void EffectStackEdit::collectAllParameters() namenode.item(i) = complex->getParamDesc(); } else if (type == "geometry") { if (KdenliveSettings::on_monitor_effects()) { - GeometryWidget *geometry = ((GeometryWidget*)m_valueItems.value(paramName)); - namenode.item(i).toElement().setAttribute("value", geometry->getValue()); + if (m_geometryWidget) namenode.item(i).toElement().setAttribute("value", m_geometryWidget->getValue()); } else { Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName)); namenode.item(i).toElement().setAttribute("value", geom->getValue()); } + } else if (type == "addedgeometry") { + namenode.item(i).toElement().setAttribute("value", m_geometryWidget->getExtraValue(namenode.item(i).toElement().attribute("name"))); } else if (type == "position") { PositionEdit *pedit = ((PositionEdit*)m_valueItems.value(paramName)); int pos = pedit->getPosition(); @@ -670,18 +728,15 @@ void EffectStackEdit::collectAllParameters() meetDependency(paramName, type, EffectsList::parameter(newparam, depends)); } else if (type == "bezier_spline") { BezierSplineWidget *widget = (BezierSplineWidget*)m_valueItems.value(paramName); - setValue = widget->spline().toString(); - } else if (type == "corners") { - CornersWidget *corners = ((CornersWidget*)m_valueItems.value(paramName)); - QString xName = pa.attributes().namedItem("xpoints").nodeValue(); - QString yName = pa.attributes().namedItem("ypoints").nodeValue(); - QPolygon points = corners->getValue(); - QPoint p; - for (int j = 1; j <= 4; ++j) { - p = points.at(j - 1); - EffectsList::setParameter(newparam, QString(xName).replace("%i", QString::number(j)), QString::number(p.x())); - EffectsList::setParameter(newparam, QString(yName).replace("%i", QString::number(j)), QString::number(p.y())); - } + setValue = widget->spline(); + QString depends = pa.attributes().namedItem("depends").nodeValue(); + if (!depends.isEmpty()) + meetDependency(paramName, type, EffectsList::parameter(newparam, depends)); +#ifdef QJSON + } else if (type == "roto-spline") { + RotoWidget *widget = static_cast(m_valueItems.value(paramName)); + setValue = widget->getSpline(); +#endif } else if (type == "wipe") { Wipeval *wp = (Wipeval*)m_valueItems.value(paramName); wipeInfo info; @@ -754,6 +809,7 @@ void EffectStackEdit::clearAllItems() if (wid) delete wid; } m_keyframeEditor = NULL; + m_geometryWidget = NULL; blockSignals(false); }