From b6a52a0de54edaa078a7e34b92fedd8db3f4845c Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 20 May 2020 22:09:02 +0200 Subject: [PATCH] only classic plugin parameters admitted --- src/common/filterscript.cpp | 25 ++----------------------- src/common/filterscript.h | 30 +++++++++++------------------- src/meshlab/filterScriptDialog.cpp | 2 +- src/meshlab/mainwindow_RunTime.cpp | 4 ++-- src/meshlab/ml_std_par_dialog.cpp | 2 +- src/meshlabserver/mainserver.cpp | 2 +- 6 files changed, 18 insertions(+), 47 deletions(-) diff --git a/src/common/filterscript.cpp b/src/common/filterscript.cpp index 8ef98030a..fb27183da 100644 --- a/src/common/filterscript.cpp +++ b/src/common/filterscript.cpp @@ -52,7 +52,7 @@ QDomDocument FilterScript::xmlDoc() for(FilterScript::iterator ii=filtparlist.begin();ii!= filtparlist.end();++ii) { - OldFilterNameParameterValuesPair* oldpv = reinterpret_cast(*ii); + FilterNameParameterValuesPair* oldpv = reinterpret_cast(*ii); QDomElement tag = doc.createElement("filter"); QPair& pair = oldpv->pair; tag.setAttribute(QString("name"),pair.first); @@ -121,32 +121,11 @@ bool FilterScript::open(QString filename) //FilterParameter::addQDomElement(par,np); par.paramList.push_back(rp); } - OldFilterNameParameterValuesPair* tmp = new OldFilterNameParameterValuesPair(); + FilterNameParameterValuesPair* tmp = new FilterNameParameterValuesPair(); tmp->pair = qMakePair(name,par); filtparlist.append(tmp); - } - else - { - QString name=nf.attribute("name"); - qDebug("Reading filter with name %s", qUtf8Printable(name)); - QMap map; - for(QDomElement np = nf.firstChildElement("xmlparam"); !np.isNull(); np = np.nextSiblingElement("xmlparam")) - map[np.attribute("name")] = np.attribute("value"); - XMLFilterNameParameterValuesPair* tmp = new XMLFilterNameParameterValuesPair(); - tmp->pair = qMakePair(name,map); - filtparlist.append(tmp); } } return true; } - -void FilterScript::addExecutedXMLFilter( const QString& name,const QMap& parvalue ) -{ - XMLFilterNameParameterValuesPair* tmp = new XMLFilterNameParameterValuesPair(); - tmp->pair = qMakePair(name,parvalue); - filtparlist.append(tmp); -} - - - diff --git a/src/common/filterscript.h b/src/common/filterscript.h index 1b573f429..d0b42498f 100644 --- a/src/common/filterscript.h +++ b/src/common/filterscript.h @@ -34,26 +34,18 @@ class QDomElement; class FilterNameParameterValuesPair { public: - virtual QString filterName() const = 0; - virtual ~FilterNameParameterValuesPair() {} -}; - -class XMLFilterNameParameterValuesPair : public FilterNameParameterValuesPair -{ -public: - ~XMLFilterNameParameterValuesPair() {} - QString filterName() const { return pair.first; } - QPair< QString, QMap > pair; -}; - -class OldFilterNameParameterValuesPair : public FilterNameParameterValuesPair -{ -public: - ~OldFilterNameParameterValuesPair() {} - QString filterName() const { return pair.first; } + virtual QString filterName() const { return pair.first; } QPair< QString, RichParameterSet > pair; }; +//class XMLFilterNameParameterValuesPair : public FilterNameParameterValuesPair +//{ +//public: +// ~XMLFilterNameParameterValuesPair() {} +// QString filterName() const { return pair.first; } +// QPair< QString, QMap > pair; +//}; + /* The filterscipt class abstract the concept of history of processing. It is simply a list of all the performed actions @@ -73,8 +65,8 @@ public: QList< FilterNameParameterValuesPair* > filtparlist; typedef QList< FilterNameParameterValuesPair* >::iterator iterator; -public slots: - void addExecutedXMLFilter(const QString& name, const QMap& parvalue); +//public slots: + //void addExecutedXMLFilter(const QString& name, const QMap& parvalue); }; #endif diff --git a/src/meshlab/filterScriptDialog.cpp b/src/meshlab/filterScriptDialog.cpp index df4d53a9e..c21723533 100644 --- a/src/meshlab/filterScriptDialog.cpp +++ b/src/meshlab/filterScriptDialog.cpp @@ -198,7 +198,7 @@ void FilterScriptDialog::editOldParameters( const int row ) return; QString actionName = ui->scriptListWidget->currentItem()->text(); - OldFilterNameParameterValuesPair* old = reinterpret_cast(scriptPtr->filtparlist.at(row)); + FilterNameParameterValuesPair* old = reinterpret_cast(scriptPtr->filtparlist.at(row)); RichParameterSet oldParameterSet = old->pair.second; //get the main window MainWindow *mainWindow = qobject_cast(parentWidget()); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 21c24d641..d4b758727 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -789,7 +789,7 @@ void MainWindow::runFilterScript() if (meshDoc()->mm() != NULL) meshDoc()->mm()->updateDataMask(req); iFilter->setLog(&meshDoc()->Log); - OldFilterNameParameterValuesPair* old = reinterpret_cast(*ii); + FilterNameParameterValuesPair* old = reinterpret_cast(*ii); RichParameterSet ¶meterSet = old->pair.second; for(int i = 0; i < parameterSet.paramList.size(); i++) @@ -978,7 +978,7 @@ void MainWindow::startFilter() executeFilter(action, dummyParSet, false); //Insert the filter to filterHistory - OldFilterNameParameterValuesPair* tmp = new OldFilterNameParameterValuesPair(); + FilterNameParameterValuesPair* tmp = new FilterNameParameterValuesPair(); tmp->pair = qMakePair(action->text(), dummyParSet); meshDoc()->filterHistory->filtparlist.append(tmp); } diff --git a/src/meshlab/ml_std_par_dialog.cpp b/src/meshlab/ml_std_par_dialog.cpp index 33d430dad..953512a49 100644 --- a/src/meshlab/ml_std_par_dialog.cpp +++ b/src/meshlab/ml_std_par_dialog.cpp @@ -199,7 +199,7 @@ void MeshlabStdDialog::applyClick() //we don't need to reapply the filter to the mesh if ((q != nullptr) && (curMeshDoc != nullptr) && (curMeshDoc->filterHistory != nullptr)) { - OldFilterNameParameterValuesPair* oldpair = new OldFilterNameParameterValuesPair(); + FilterNameParameterValuesPair* oldpair = new FilterNameParameterValuesPair(); oldpair->pair = qMakePair(q->text(), curParSet); curMeshDoc->filterHistory->filtparlist.append(oldpair); } diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp index d6180884a..15e6cd7d6 100644 --- a/src/meshlabserver/mainserver.cpp +++ b/src/meshlabserver/mainserver.cpp @@ -352,7 +352,7 @@ public: //defined in the script file. RichParameterSet required; iFilter->initParameterSet(action,meshDocument,required); - OldFilterNameParameterValuesPair* pairold = reinterpret_cast(*ii); + FilterNameParameterValuesPair* pairold = reinterpret_cast(*ii); RichParameterSet ¶meterSet = pairold->pair.second; //The parameters in the script file are more than the required parameters of the filter. The script file is not correct.