X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=2d93948f44faca9fd7234d0c20e6836166e81404;hb=0f1de4df82fc4c17e55fc054d39a33b31f093e13;hp=c9c91dfdec037f52975e2be9ac9b3fcdfaab9771;hpb=a63b443f9bad49c40071ff2fea1c8cb87d153a43;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index c9c91dfd..2d93948f 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -15,6 +15,24 @@ * * ***************************************************************************/ +#include "effectstackedit.h" +#include "ui_constval_ui.h" +#include "ui_listval_ui.h" +#include "ui_boolval_ui.h" +#include "ui_colorval_ui.h" +#include "ui_wipeval_ui.h" +#include "complexparameter.h" +#include "geometryval.h" +#include "positionedit.h" +#include "effectslist.h" +#include "kdenlivesettings.h" +#include "profilesdialog.h" +#include "kis_curve_widget.h" +#include "kis_cubic_curve.h" + +#include +#include + #include #include #include @@ -22,141 +40,181 @@ #include #include -#include -#include -#include "ui_constval_ui.h" -#include "ui_listval_ui.h" -#include "ui_boolval_ui.h" -#include "ui_colorval_ui.h" -#include "ui_positionval_ui.h" -#include "ui_wipeval_ui.h" -#include "complexparameter.h" -#include "effectstackedit.h" -#include "geometryval.h" +class Boolval: public QWidget, public Ui::Boolval_UI +{ +}; -#include "kdenlivesettings.h" +class Colorval: public QWidget, public Ui::Colorval_UI +{ +}; -QMap EffectStackEdit::iconCache; +class Constval: public QWidget, public Ui::Constval_UI +{ +}; + +class Listval: public QWidget, public Ui::Listval_UI +{ +}; + +class Wipeval: public QWidget, public Ui::Wipeval_UI +{ +}; -EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) { - setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); - QVBoxLayout *vbox1 = new QVBoxLayout(parent); - vbox1->setContentsMargins(0, 0, 0, 0); - vbox1->setSpacing(0); - - QScrollArea *area = new QScrollArea; - QWidget *wid = new QWidget(parent); - area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - wid->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); - area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); - - vbox1->addWidget(area); - area->setWidget(wid); - area->setWidgetResizable(true); - vbox = new QVBoxLayout(wid); - vbox->setContentsMargins(0, 0, 0, 0); - vbox->setSpacing(0); - wid->show(); +QMap EffectStackEdit::iconCache; + +EffectStackEdit::EffectStackEdit(QWidget *parent) : + QScrollArea(parent), + m_in(0), + m_out(0), + m_frameSize(QPoint()), + m_keyframeEditor(NULL) +{ + m_baseWidget = new QWidget(this); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + setFrameStyle(QFrame::NoFrame); + setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding)); + + setWidget(m_baseWidget); + setWidgetResizable(true); + m_vbox = new QVBoxLayout(m_baseWidget); + m_vbox->setContentsMargins(0, 0, 0, 0); + m_vbox->setSpacing(0); + //wid->show(); } -EffectStackEdit::~EffectStackEdit() { +EffectStackEdit::~EffectStackEdit() +{ iconCache.clear(); + delete m_baseWidget; } -void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t) { +void EffectStackEdit::setFrameSize(QPoint p) +{ + m_frameSize = 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"); + QString type = pa.attributes().namedItem("type").nodeValue(); + QString paramName = i18n(na.toElement().text().toUtf8().data()); + + if (type == "geometry") { + Geometryval *geom = ((Geometryval*)m_valueItems[paramName+"geometry"]); + geom->setFrameSize(m_frameSize); + break; + } + } + +} + +void EffectStackEdit::updateProjectFormat(MltVideoProfile profile, Timecode t) +{ m_profile = profile; m_timecode = t; } -void EffectStackEdit::updateParameter(const QString &name, const QString &value) { - params.setAttribute(name, value); +void EffectStackEdit::updateParameter(const QString &name, const QString &value) +{ + m_params.setAttribute(name, value); } -void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) { - kDebug() << "in"; - params = d; +void EffectStackEdit::transferParamDesc(const QDomElement d, int in, int out) +{ + clearAllItems(); + if (m_keyframeEditor) delete m_keyframeEditor; + m_keyframeEditor = NULL; + m_params = d; m_in = in; m_out = out; - clearAllItems(); - if (params.isNull()) return; + if (m_params.isNull()) { + kDebug() << "// EMPTY EFFECT STACK"; + return; + } - QDomDocument doc; - doc.appendChild(doc.importNode(params, true)); - //kDebug() << "IMPORTED TRANS: " << doc.toString(); - QDomNodeList namenode = params.elementsByTagName("parameter"); - QDomElement e = params.toElement(); + /*QDomDocument doc; + doc.appendChild(doc.importNode(m_params, true)); + kDebug() << "IMPORTED TRANS: " << doc.toString();*/ + + QDomNodeList namenode = m_params.elementsByTagName("parameter"); + QDomElement e = m_params.toElement(); const int minFrame = e.attribute("start").toInt(); const int maxFrame = e.attribute("end").toInt(); - for (int i = 0;i < namenode.count() ;i++) { - kDebug() << "in form"; + for (int i = 0; i < namenode.count() ; i++) { QDomElement pa = namenode.item(i).toElement(); QDomNode na = pa.firstChildElement("name"); QString type = pa.attribute("type"); QString paramName = i18n(na.toElement().text().toUtf8().data()); - QWidget * toFillin = new QWidget; + QWidget * toFillin = new QWidget(m_baseWidget); QString value = pa.attribute("value").isNull() ? pa.attribute("default") : pa.attribute("value"); - if (type == "geometry") { - /*pa.setAttribute("namedesc", "X;Y;Width;Height;Transparency"); - pa.setAttribute("format", "%d%,%d%:%d%x%d%:%d"); - pa.setAttribute("min", "-500;-500;0;0;0"); - pa.setAttribute("max", "500;500;200;200;100");*/ - } else if (type == "complex") { - //pa.setAttribute("namedesc",pa.attribute("name")); - - } + /** 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,...) + */ - //TODO constant, list, bool, complex , color, geometry, position if (type == "double" || type == "constant") { - createSliderItem(paramName, value.toInt(), pa.attribute("min").toInt(), pa.attribute("max").toInt()); + int min; + int max; + if (pa.attribute("min").startsWith('%')) { + min = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("min")); + } else min = pa.attribute("min").toInt(); + if (pa.attribute("max").startsWith('%')) { + max = (int) ProfilesDialog::getStringEval(m_profile, pa.attribute("max")); + } else max = pa.attribute("max").toInt(); + createSliderItem(paramName, (int)(value.toDouble() + 0.5) , min, max, pa.attribute("suffix", QString())); delete toFillin; toFillin = NULL; } else if (type == "list") { - Ui::Listval_UI *lsval = new Ui::Listval_UI; + Listval *lsval = new Listval; lsval->setupUi(toFillin); - QStringList listitems = pa.attribute("paramlist").split(","); - QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(","); + QStringList listitems = pa.attribute("paramlist").split(','); + QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(','); if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; //lsval->list->addItems(listitems); - for (int i = 0;i < listitems.count();i++) { + lsval->list->setIconSize(QSize(30, 30)); + for (int i = 0; i < listitems.count(); i++) { lsval->list->addItem(listitemsdisplay.at(i), listitems.at(i)); - } - lsval->list->setCurrentIndex(listitems.indexOf(value)); - for (int i = 0;i < lsval->list->count();i++) { - QString entry = lsval->list->itemData(i).toString(); + QString entry = listitems.at(i); if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) { if (!EffectStackEdit::iconCache.contains(entry)) { QImage pix(entry); EffectStackEdit::iconCache[entry] = pix.scaled(30, 30); } - lsval->list->setIconSize(QSize(30, 30)); lsval->list->setItemIcon(i, QPixmap::fromImage(iconCache[entry])); } } - connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters())); + if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value)); lsval->title->setTitle(paramName); - valueItems[paramName] = lsval; - uiItems.append(lsval); + m_valueItems[paramName] = lsval; + connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters())); + m_uiItems.append(lsval); } else if (type == "bool") { - Ui::Boolval_UI *bval = new Ui::Boolval_UI; + Boolval *bval = new Boolval; bval->setupUi(toFillin); bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked); - - connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters())); bval->checkBox->setText(paramName); - valueItems[paramName] = bval; - uiItems.append(bval); + m_valueItems[paramName] = bval; + connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters())); + m_uiItems.append(bval); } else if (type == "complex") { - /*QStringList names=nodeAtts.namedItem("name").nodeValue().split(";"); - QStringList max=nodeAtts.namedItem("max").nodeValue().split(";"); - QStringList min=nodeAtts.namedItem("min").nodeValue().split(";"); - QStringList val=value.split(";"); + /*QStringList names=nodeAtts.namedItem("name").nodeValue().split(';'); + QStringList max=nodeAtts.namedItem("max").nodeValue().split(';'); + QStringList min=nodeAtts.namedItem("min").nodeValue().split(';'); + QStringList val=value.split(';'); kDebug() << "in complex"<setupParam(d, pa.attribute("name"), 0, 100); - vbox->addWidget(pl); - valueItems[paramName+"complex"] = pl; - items.append(pl); + m_vbox->addWidget(pl); + m_valueItems[paramName+"complex"] = pl; + connect(pl, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); } else if (type == "geometry") { - Geometryval *geo = new Geometryval(m_profile); + Geometryval *geo = new Geometryval(m_profile, m_frameSize, m_in); + geo->setupParam(pa, minFrame, maxFrame); + m_vbox->addWidget(geo); + m_valueItems[paramName+"geometry"] = geo; connect(geo, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); connect(geo, SIGNAL(seekToPos(int)), this, SLOT(slotSeekToPos(int))); - geo->setupParam(pa, minFrame, maxFrame); - vbox->addWidget(geo); - valueItems[paramName+"geometry"] = geo; - items.append(geo); + } else if (type == "keyframe" || type == "simplekeyframe") { + // keyframe editor widget + kDebug() << "min: " << m_in << ", MAX: " << m_out; + if (m_keyframeEditor == NULL) { + KeyframeEdit *geo = new KeyframeEdit(pa, m_in, m_in + m_out, pa.attribute("min").toInt(), pa.attribute("max").toInt(), 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, SLOT(slotSeekToPos(int))); + } else { + // we already have a keyframe editor, so just add another column for the new param + m_keyframeEditor->addParameter(pa); + } } else if (type == "color") { - Ui::Colorval_UI *cval = new Ui::Colorval_UI; + Colorval *cval = new Colorval; cval->setupUi(toFillin); bool ok; + if (value.startsWith('#')) value = value.replace('#', "0x"); cval->kcolorbutton->setColor(value.toUInt(&ok, 16)); - kDebug() << value.toUInt(&ok, 16); - - connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters())); + //kDebug() << "color: " << value << ", " << value.toUInt(&ok, 16); cval->label->setText(paramName); - valueItems[paramName] = cval; - uiItems.append(cval); + m_valueItems[paramName] = cval; + connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters())); + m_uiItems.append(cval); } else if (type == "position") { - Ui::Positionval_UI *pval = new Ui::Positionval_UI; - pval->setupUi(toFillin); int pos = value.toInt(); - if (d.attribute("id") == "fadein") { + if (d.attribute("id") == "fadein" || d.attribute("id") == "fade_from_black") { pos = pos - m_in; - } else if (d.attribute("id") == "fadeout") { + } else if (d.attribute("id") == "fadeout" || d.attribute("id") == "fade_to_black") { // fadeout position starts from clip end pos = m_out - (pos - m_in); } - pval->krestrictedline->setText(m_timecode.getTimecodeFromFrames(pos)); - connect(pval->krestrictedline, SIGNAL(editingFinished()), this, SLOT(collectAllParameters())); - pval->label->setText(paramName); - valueItems[paramName + "position"] = pval; - uiItems.append(pval); + PositionEdit *posedit = new PositionEdit(paramName, pos, 1, m_out, m_timecode); + m_vbox->addWidget(posedit); + m_valueItems[paramName+"position"] = posedit; + connect(posedit, SIGNAL(parameterChanged()), this, SLOT(collectAllParameters())); + } else if (type == "curve") { + KisCurveWidget *curve = new KisCurveWidget(this); + curve->setMaxPoints(pa.attribute("max").toInt()); + QList points; + int number = EffectsList::parameter(e, pa.attribute("number")).toInt(); + QString inName = pa.attribute("inpoints"); + QString outName = pa.attribute("outpoints"); + int start = pa.attribute("min").toInt(); + for (int j = start; j <= number; j++) { + QString in = inName; + 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()); + } + if (!points.isEmpty()) curve->setCurve(KisCubicCurve(points)); + QSpinBox *spinin = new QSpinBox(); + spinin->setRange(0, 1000); + QSpinBox *spinout = new QSpinBox(); + spinout->setRange(0, 1000); + curve->setupInOutControls(spinin, spinout, 0, 1000); + m_vbox->addWidget(curve); + m_vbox->addWidget(spinin); + m_vbox->addWidget(spinout); + connect(curve, SIGNAL(modified()), this, SLOT(collectAllParameters())); + m_valueItems[paramName] = curve; } else if (type == "wipe") { - Ui::Wipeval_UI *wpval = new Ui::Wipeval_UI; + Wipeval *wpval = new Wipeval; wpval->setupUi(toFillin); wipeInfo w = getWipeInfo(value); switch (w.start) { @@ -246,7 +339,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) { } wpval->start_transp->setValue(w.startTransparency); wpval->end_transp->setValue(w.endTransparency); - + m_valueItems[paramName] = wpval; connect(wpval->end_up, SIGNAL(clicked()), this, SLOT(collectAllParameters())); connect(wpval->end_down, SIGNAL(clicked()), this, SLOT(collectAllParameters())); connect(wpval->end_left, SIGNAL(clicked()), this, SLOT(collectAllParameters())); @@ -260,34 +353,34 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) { connect(wpval->start_transp, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters())); connect(wpval->end_transp, SIGNAL(valueChanged(int)), this, SLOT(collectAllParameters())); //wpval->title->setTitle(na.toElement().text()); - valueItems[paramName] = wpval; - uiItems.append(wpval); + m_uiItems.append(wpval); } else { delete toFillin; toFillin = NULL; } if (toFillin) { - items.append(toFillin); - vbox->addWidget(toFillin); + m_vbox->addWidget(toFillin); } } - vbox->addStretch(); + m_vbox->addStretch(); } -void EffectStackEdit::slotSeekToPos(int pos) { - emit seekTimeline(m_in + pos); +void EffectStackEdit::slotSeekToPos(int pos) +{ + emit seekTimeline(pos); } -wipeInfo EffectStackEdit::getWipeInfo(QString value) { +wipeInfo EffectStackEdit::getWipeInfo(QString value) +{ wipeInfo info; - QString start = value.section(";", 0, 0); - QString end = value.section(";", 1, 1).section("=", 1, 1); + QString start = value.section(';', 0, 0); + QString end = value.section(';', 1, 1).section('=', 1, 1); if (start.startsWith("-100%,0")) info.start = LEFT; else if (start.startsWith("100%,0")) info.start = RIGHT; else if (start.startsWith("0%,100%")) info.start = DOWN; else if (start.startsWith("0%,-100%")) info.start = UP; - else if (start.startsWith("0%,0%")) info.start = CENTER; + else info.start = CENTER; if (start.count(':') == 2) info.startTransparency = start.section(':', -1).toInt(); else info.startTransparency = 100; @@ -295,13 +388,14 @@ wipeInfo EffectStackEdit::getWipeInfo(QString value) { else if (end.startsWith("100%,0")) info.end = RIGHT; else if (end.startsWith("0%,100%")) info.end = DOWN; else if (end.startsWith("0%,-100%")) info.end = UP; - else if (end.startsWith("0%,0%")) info.end = CENTER; + else info.end = CENTER; if (end.count(':') == 2) info.endTransparency = end.section(':', -1).toInt(); else info.endTransparency = 100; return info; } -QString EffectStackEdit::getWipeString(wipeInfo info) { +QString EffectStackEdit::getWipeString(wipeInfo info) +{ QString start; QString end; @@ -322,7 +416,7 @@ QString EffectStackEdit::getWipeString(wipeInfo info) { start = "0%,0%:100%x100%"; break; } - start.append(":" + QString::number(info.startTransparency)); + start.append(':' + QString::number(info.startTransparency)); switch (info.end) { case LEFT: @@ -341,117 +435,162 @@ QString EffectStackEdit::getWipeString(wipeInfo info) { end = "0%,0%:100%x100%"; break; } - end.append(":" + QString::number(info.endTransparency)); + end.append(':' + QString::number(info.endTransparency)); return QString(start + ";-1=" + end); } -void EffectStackEdit::collectAllParameters() { - QDomElement oldparam = params.cloneNode().toElement(); - QDomNodeList namenode = params.elementsByTagName("parameter"); +void EffectStackEdit::collectAllParameters() +{ + if (m_valueItems.isEmpty() || m_params.isNull()) return; + const QDomElement oldparam = m_params.cloneNode().toElement(); + QDomElement newparam = oldparam.cloneNode().toElement(); + QDomNodeList namenode = newparam.elementsByTagName("parameter"); - for (int i = 0;i < namenode.count() ;i++) { + 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(); QString paramName = i18n(na.toElement().text().toUtf8().data()); + if (type == "complex") paramName.append("complex"); + else if (type == "position") paramName.append("position"); + else if (type == "geometry") paramName.append("geometry"); + else if (type == "keyframe") paramName.append("keyframe"); + if (type != "simplekeyframe" && !m_valueItems.contains(paramName)) { + kDebug() << "// Param: " << paramName << " NOT FOUND"; + continue; + } QString setValue; if (type == "double" || type == "constant") { - QSlider* slider = ((Ui::Constval_UI*)valueItems[paramName])->horizontalSlider; + QSlider* slider = ((Constval*)m_valueItems.value(paramName))->horizontalSlider; setValue = QString::number(slider->value()); } else if (type == "list") { - KComboBox *box = ((Ui::Listval_UI*)valueItems[paramName])->list; + KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list; setValue = box->itemData(box->currentIndex()).toString(); } else if (type == "bool") { - QCheckBox *box = ((Ui::Boolval_UI*)valueItems[paramName])->checkBox; + QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox; setValue = box->checkState() == Qt::Checked ? "1" : "0" ; } else if (type == "color") { - KColorButton *color = ((Ui::Colorval_UI*)valueItems[paramName])->kcolorbutton; + KColorButton *color = ((Colorval*)m_valueItems.value(paramName))->kcolorbutton; setValue = color->color().name(); - setValue.replace('#', "0x"); } else if (type == "complex") { - ComplexParameter *complex = ((ComplexParameter*)valueItems[paramName+"complex"]); + ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName)); namenode.item(i) = complex->getParamDesc(); } else if (type == "geometry") { - Geometryval *geom = ((Geometryval*)valueItems[paramName+"geometry"]); - namenode.item(i) = geom->getParamDesc(); + Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName)); + namenode.item(i).toElement().setAttribute("value", geom->getValue()); } else if (type == "position") { - KRestrictedLine *line = ((Ui::Positionval_UI*)valueItems[paramName+"position"])->krestrictedline; - int pos = m_timecode.getFrameCount(line->text(), KdenliveSettings::project_fps()); - if (params.attribute("id") == "fadein") { - pos += m_in; - if (pos > m_out) { + PositionEdit *pedit = ((PositionEdit*)m_valueItems.value(paramName)); + int pos = pedit->getPosition(); + setValue = QString::number(pos); + if (newparam.attribute("id") == "fadein" || newparam.attribute("id") == "fade_from_black") { + // Make sure duration is not longer than clip + /*if (pos > m_out) { pos = m_out; - line->setText(m_timecode.getTimecodeFromFrames(pos)); - } - } else if (params.attribute("id") == "fadeout") { - pos = m_out - (pos - m_in); - if (pos > m_out - m_in) { - pos = m_out - m_in; - line->setText(m_timecode.getTimecodeFromFrames(pos)); - } + pedit->setPosition(pos); + }*/ + EffectsList::setParameter(newparam, "in", QString::number(m_in)); + EffectsList::setParameter(newparam, "out", QString::number(m_in + pos)); + setValue.clear(); + } else if (newparam.attribute("id") == "fadeout" || newparam.attribute("id") == "fade_to_black") { + // Make sure duration is not longer than clip + /*if (pos > m_out) { + pos = m_out; + pedit->setPosition(pos); + }*/ + EffectsList::setParameter(newparam, "in", QString::number(m_out + m_in - pos)); + EffectsList::setParameter(newparam, "out", QString::number(m_out + m_in)); + setValue.clear(); + } + } else if (type == "curve") { + KisCurveWidget *curve = ((KisCurveWidget*)m_valueItems.value(paramName)); + QList points = curve->curve().points(); + QString number = pa.attributes().namedItem("number").nodeValue(); + QString inName = pa.attributes().namedItem("inpoints").nodeValue(); + 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())); + 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())); } - setValue = QString::number(pos); } else if (type == "wipe") { - Ui::Wipeval_UI *wp = (Ui::Wipeval_UI*)valueItems[paramName]; + Wipeval *wp = (Wipeval*)m_valueItems.value(paramName); wipeInfo info; if (wp->start_left->isChecked()) info.start = LEFT; else if (wp->start_right->isChecked()) info.start = RIGHT; else if (wp->start_up->isChecked()) info.start = UP; else if (wp->start_down->isChecked()) info.start = DOWN; else if (wp->start_center->isChecked()) info.start = CENTER; + else info.start = LEFT; info.startTransparency = wp->start_transp->value(); if (wp->end_left->isChecked()) info.end = LEFT; else if (wp->end_right->isChecked()) info.end = RIGHT; else if (wp->end_up->isChecked()) info.end = UP; else if (wp->end_down->isChecked()) info.end = DOWN; else if (wp->end_center->isChecked()) info.end = CENTER; + else info.end = RIGHT; info.endTransparency = wp->end_transp->value(); setValue = getWipeString(info); + } else if ((type == "simplekeyframe" || type == "keyframe") && m_keyframeEditor) { + QString realName = i18n(na.toElement().text().toUtf8().data()); + QString val = m_keyframeEditor->getValue(realName); + kDebug() << "SET VALUE: " << val; + namenode.item(i).toElement().setAttribute("keyframes", val); } - if (!setValue.isNull()) { pa.attributes().namedItem("value").setNodeValue(setValue); } } - emit parameterChanged(oldparam, params); + emit parameterChanged(oldparam, newparam); } -void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max) { - QWidget* toFillin = new QWidget; - Ui::Constval_UI *ctval = new Ui::Constval_UI; +void EffectStackEdit::createSliderItem(const QString& name, int val , int min, int max, const QString suffix) +{ + QWidget* toFillin = new QWidget(m_baseWidget); + Constval *ctval = new Constval; ctval->setupUi(toFillin); - ctval->horizontalSlider->setMinimum(min); ctval->horizontalSlider->setMaximum(max); + if (!suffix.isEmpty()) ctval->spinBox->setSuffix(suffix); ctval->spinBox->setMinimum(min); ctval->spinBox->setMaximum(max); ctval->horizontalSlider->setPageStep((int)(max - min) / 10); ctval->horizontalSlider->setValue(val); ctval->label->setText(name); - valueItems[name] = ctval; - uiItems.append(ctval); + m_valueItems[name] = ctval; + m_uiItems.append(ctval); connect(ctval->horizontalSlider, SIGNAL(valueChanged(int)) , this, SLOT(collectAllParameters())); - items.append(toFillin); - vbox->addWidget(toFillin); + m_vbox->addWidget(toFillin); } -void EffectStackEdit::slotSliderMoved(int) { +void EffectStackEdit::slotSliderMoved(int) +{ collectAllParameters(); } -void EffectStackEdit::clearAllItems() { - qDeleteAll(items); - foreach(void *p, uiItems) { - delete p; - } - uiItems.clear(); - items.clear(); - valueItems.clear(); - QLayoutItem *item = vbox->itemAt(0); - while (item) { - vbox->removeItem(item); - delete item; - item = vbox->itemAt(0); +void EffectStackEdit::clearAllItems() +{ + blockSignals(true); + m_valueItems.clear(); + m_uiItems.clear(); + /*while (!m_items.isEmpty()) { + QWidget *die = m_items.takeFirst(); + die->disconnect(); + delete die; + }*/ + //qDeleteAll(m_uiItems); + QLayoutItem *child; + while ((child = m_vbox->takeAt(0)) != 0) { + QWidget *wid = child->widget(); + delete child; + if (wid) delete wid; } + m_keyframeEditor = NULL; + blockSignals(false); }