X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackedit.cpp;h=d47da1ae9984ad9cc70c2f30e2ffb45d41ede763;hb=ead7176d2ab818ec3a1275aeca2b2fc0c1ea1276;hp=b0acd704b9c44a733e0b969f741500d15147d085;hpb=b6bef332a7961e3feba69ba2b34bf3f45cb575ee;p=kdenlive diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index b0acd704..d47da1ae 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -15,122 +15,203 @@ * * ***************************************************************************/ +#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 #include -#include "effectstackedit.h" + #include #include #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 "complexparameter.h" -static QMap iconCache; - -EffectStackEdit::EffectStackEdit(QFrame* frame, QWidget *parent): QObject(parent) { - QScrollArea *area; - QVBoxLayout *vbox1 = new QVBoxLayout(frame); - QVBoxLayout *vbox2 = new QVBoxLayout(frame); - vbox = new QVBoxLayout(frame); - vbox1->setContentsMargins(0, 0, 0, 0); - vbox1->setSpacing(0); - vbox2->setContentsMargins(0, 0, 0, 0); - vbox2->setSpacing(0); - vbox->setContentsMargins(0, 0, 0, 0); - vbox->setSpacing(0); - frame->setLayout(vbox1); - QFont widgetFont = frame->font(); - widgetFont.setPointSize(widgetFont.pointSize() - 2); - frame->setFont(widgetFont); - - area = new QScrollArea(frame); - QWidget *wid = new QWidget(area); - 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); - wid->setLayout(vbox2); - vbox2->addLayout(vbox); - vbox2->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)); - area->setWidget(wid); - area->setWidgetResizable(true); - wid->show(); +class Boolval: public QWidget, public Ui::Boolval_UI +{ +}; + +class Colorval: public QWidget, public Ui::Colorval_UI +{ +}; + +class Constval: public QWidget, public Ui::Constval_UI +{ +}; + +class Listval: public QWidget, public Ui::Listval_UI +{ +}; + +class Wipeval: public QWidget, public Ui::Wipeval_UI +{ +}; + + +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() +{ + iconCache.clear(); + delete m_baseWidget; +} + +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) +{ + m_params.setAttribute(name, value); } -void EffectStackEdit::transferParamDesc(const QDomElement& d, int , int) { - kDebug() << "in"; - params = d; - QDomNodeList namenode = params.elementsByTagName("parameter"); +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; + if (m_params.isNull()) { + kDebug() << "// EMPTY EFFECT STACK"; + return; + } + + /*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 = na.toElement().text(); - QWidget * toFillin = new QWidget; + QString paramName = i18n(na.toElement().text().toUtf8().data()); + 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;W;H"); - pa.setAttribute("format", "%d,%d:%dx%d"); - pa.setAttribute("min", "-100;-100;0;0"); - pa.setAttribute("max", "0;0;100;100"); - } - if (type == "complex") { - //pa.setAttribute("namedesc",pa.attribute("name")); - } - //TODO constant, list, bool, complex , color, geometry, position + /** 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 + * wipe: a widget designed for the wipe transition, allowing to choose a position (left, right, top,...) + */ + 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(","); - lsval->list->addItems(listitems); - lsval->list->setCurrentIndex(listitems.indexOf(value)); - for (int i = 0;i < lsval->list->count();i++) { - QString entry = lsval->list->itemText(i); + QStringList listitems = pa.attribute("paramlist").split(','); + QStringList listitemsdisplay = pa.attribute("paramlistdisplay").split(','); + if (listitemsdisplay.count() != listitems.count()) listitemsdisplay = listitems; + //lsval->list->addItems(listitems); + lsval->list->setIconSize(QSize(30, 30)); + for (int i = 0; i < listitems.count(); i++) { + lsval->list->addItem(listitemsdisplay.at(i), listitems.at(i)); + QString entry = listitems.at(i); if (!entry.isEmpty() && (entry.endsWith(".png") || entry.endsWith(".pgm"))) { - if (!iconCache.contains(entry)) { - QPixmap pix(entry); - iconCache[entry] = pix.scaled(30, 30); + 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, iconCache[entry]); + lsval->list->setItemIcon(i, QPixmap::fromImage(iconCache[entry])); } } + if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value)); + lsval->title->setTitle(paramName); + m_valueItems[paramName] = lsval; connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters())); - lsval->title->setTitle(na.toElement().text()); - valueItems[paramName] = lsval; - uiItems.append(lsval); + 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); - + bval->checkBox->setText(paramName); + m_valueItems[paramName] = bval; connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters())); - bval->checkBox->setText(na.toElement().text()); - valueItems[paramName] = bval; - uiItems.append(bval); - } else if (type == "complex" || type == "geometry") { - /*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(";"); + 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(';'); 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, 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))); + } 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); - + //kDebug() << "color: " << value << ", " << value.toUInt(&ok, 16); + cval->label->setText(paramName); + m_valueItems[paramName] = cval; connect(cval->kcolorbutton, SIGNAL(clicked()) , this, SLOT(collectAllParameters())); - cval->label->setText(na.toElement().text()); - valueItems[paramName] = cval; - uiItems.append(cval); + m_uiItems.append(cval); + } else if (type == "position") { + int pos = value.toInt(); + if (d.attribute("id") == "fadein" || d.attribute("id") == "fade_from_black") { + pos = pos - m_in; + } else if (d.attribute("id") == "fadeout" || d.attribute("id") == "fade_to_black") { + // fadeout position starts from clip end + pos = m_out - (pos - m_in); + } + 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 == "wipe") { + Wipeval *wpval = new Wipeval; + wpval->setupUi(toFillin); + wipeInfo w = getWipeInfo(value); + switch (w.start) { + case UP: + wpval->start_up->setChecked(true); + break; + case DOWN: + wpval->start_down->setChecked(true); + break; + case RIGHT: + wpval->start_right->setChecked(true); + break; + case LEFT: + wpval->start_left->setChecked(true); + break; + default: + wpval->start_center->setChecked(true); + break; + } + switch (w.end) { + case UP: + wpval->end_up->setChecked(true); + break; + case DOWN: + wpval->end_down->setChecked(true); + break; + case RIGHT: + wpval->end_right->setChecked(true); + break; + case LEFT: + wpval->end_left->setChecked(true); + break; + default: + wpval->end_center->setChecked(true); + break; + } + 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())); + connect(wpval->end_right, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->end_center, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->start_up, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->start_down, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->start_left, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->start_right, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + connect(wpval->start_center, SIGNAL(clicked()), this, SLOT(collectAllParameters())); + 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()); + m_uiItems.append(wpval); } else { delete toFillin; toFillin = NULL; } if (toFillin) { - items.append(toFillin); - vbox->addWidget(toFillin); + m_vbox->addWidget(toFillin); } } + m_vbox->addStretch(); +} + +void EffectStackEdit::slotSeekToPos(int pos) +{ + emit seekTimeline(pos); +} + +wipeInfo EffectStackEdit::getWipeInfo(QString value) +{ + wipeInfo info; + 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 info.start = CENTER; + if (start.count(':') == 2) info.startTransparency = start.section(':', -1).toInt(); + else info.startTransparency = 100; + + if (end.startsWith("-100%,0")) info.end = LEFT; + 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 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 start; + QString end; + switch (info.start) { + case LEFT: + start = "-100%,0%:100%x100%"; + break; + case RIGHT: + start = "100%,0%:100%x100%"; + break; + case DOWN: + start = "0%,100%:100%x100%"; + break; + case UP: + start = "0%,-100%:100%x100%"; + break; + default: + start = "0%,0%:100%x100%"; + break; + } + start.append(':' + QString::number(info.startTransparency)); + + switch (info.end) { + case LEFT: + end = "-100%,0%:100%x100%"; + break; + case RIGHT: + end = "100%,0%:100%x100%"; + break; + case DOWN: + end = "0%,100%:100%x100%"; + break; + case UP: + end = "0%,-100%:100%x100%"; + break; + default: + end = "0%,0%:100%x100%"; + break; + } + end.append(':' + QString::number(info.endTransparency)); + return QString(start + ";-1=" + end); } -void EffectStackEdit::collectAllParameters() { - QDomElement oldparam = params.cloneNode().toElement(); - QDomNodeList namenode = params.elementsByTagName("parameter"); - for (int i = 0;i < namenode.count() ;i++) { +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++) { 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[na.toElement().text()])->horizontalSlider; + QSlider* slider = ((Constval*)m_valueItems.value(paramName))->horizontalSlider; setValue = QString::number(slider->value()); - } else - if (type == "list") { - KComboBox *box = ((Ui::Listval_UI*)valueItems[na.toElement().text()])->list; - setValue = box->currentText(); - } else - if (type == "bool") { - QCheckBox *box = ((Ui::Boolval_UI*)valueItems[na.toElement().text()])->checkBox; - setValue = box->checkState() == Qt::Checked ? "1" : "0" ; - } else - if (type == "color") { - KColorButton *color = ((Ui::Colorval_UI*)valueItems[na.toElement().text()])->kcolorbutton; - setValue.sprintf("0x%08x", color->color().rgba()); - } else - if (type == "complex" || type == "geometry") { - ComplexParameter *complex = ((ComplexParameter*)valueItems[na.toElement().text()+"complex"]); - namenode.item(i) = complex->getParamDesc(); - } + } else if (type == "list") { + KComboBox *box = ((Listval*)m_valueItems.value(paramName))->list; + setValue = box->itemData(box->currentIndex()).toString(); + } else if (type == "bool") { + QCheckBox *box = ((Boolval*)m_valueItems.value(paramName))->checkBox; + setValue = box->checkState() == Qt::Checked ? "1" : "0" ; + } else if (type == "color") { + KColorButton *color = ((Colorval*)m_valueItems.value(paramName))->kcolorbutton; + setValue = color->color().name(); + } else if (type == "complex") { + ComplexParameter *complex = ((ComplexParameter*)m_valueItems.value(paramName)); + namenode.item(i) = complex->getParamDesc(); + } else if (type == "geometry") { + Geometryval *geom = ((Geometryval*)m_valueItems.value(paramName)); + namenode.item(i).toElement().setAttribute("value", geom->getValue()); + } else if (type == "position") { + 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; + 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 == "wipe") { + 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() { - foreach(QWidget* w, items) { - vbox->removeWidget(w); - delete w; - } - foreach(void * p, uiItems) { - delete p; +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; } - uiItems.clear(); - items.clear(); - valueItems.clear(); + m_keyframeEditor = NULL; + blockSignals(false); }