diff --git a/src/common/pluginmanager.cpp b/src/common/pluginmanager.cpp index 52717e1ba..cc44b8ff8 100644 --- a/src/common/pluginmanager.cpp +++ b/src/common/pluginmanager.cpp @@ -1,6 +1,5 @@ #include "pluginmanager.h" #include -#include #include #include "mlexception.h" @@ -64,7 +63,6 @@ void PluginManager::loadPlugins(RichParameterSet& defaultGlobal) QStringList pluginfilters; pluginfilters << QString("*." + DLLExtension()); - //pluginfilters << "*.xml"; //only the file with extension pluginfilters will be listed by function entryList() pluginsDir.setNameFilters(pluginfilters); diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index a8636283a..3d2205788 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -350,9 +350,6 @@ public: QMenu* rasterLayerMenu() { return filterMenuRasterLayer; } private: - //the xml filters run in a different thread. The xmlfiltertimer starts on executeFilter and stops on postFilterExecution - //function linked to the thread finished signal. - QElapsedTimer xmlfiltertimer; WordActionsMapAccessor wama; //////// ToolBars /////////////// QToolBar *mainToolBar; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 7bf90a897..33f3a4dfd 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -51,14 +51,10 @@ QProgressBar *MainWindow::qb; MainWindow::MainWindow() - :mwsettings(), gpumeminfo(NULL), xmlfiltertimer(), wama() + :mwsettings(), gpumeminfo(NULL), wama() { _currviewcontainer = NULL; - //xmlfiltertimer will be called repeatedly, so like Qt documentation suggests, the first time start function should be called. - //Subsequently restart function will be invoked. setContextMenuPolicy(Qt::NoContextMenu); - xmlfiltertimer.start(); - //xmlfiltertimer.elapsed(); //workspace = new QWorkspace(this); mdiarea = new QMdiArea(this); @@ -448,11 +444,6 @@ connectRenderModeActionList(rendlist);*/ connect(unsplitGroupAct, SIGNAL(triggered(QAction *)), this, SLOT(unsplitFromHandle(QAction *))); - //TOOL MENU - //showFilterEditAct = new QAction(tr("XML Plugin Editor GUI"), this); - //showFilterEditAct->setEnabled(true); - //connect(showFilterEditAct, SIGNAL(triggered()), this, SLOT(showXMLPluginEditorGui())); - } void MainWindow::createToolBars() diff --git a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h index b3dc1543c..a73ad7523 100644 --- a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h +++ b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h @@ -25,7 +25,6 @@ #define SAMPLEFILTERSPLUGIN_H #include -//class QScriptEngine; class FilterScreenedPoissonPlugin : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_sketchfab/filter_sketchfab.cpp b/src/meshlabplugins/filter_sketchfab/filter_sketchfab.cpp index dfed175cf..de5be3444 100644 --- a/src/meshlabplugins/filter_sketchfab/filter_sketchfab.cpp +++ b/src/meshlabplugins/filter_sketchfab/filter_sketchfab.cpp @@ -25,8 +25,7 @@ #include #include #include -#include -#include +#include #include #include "miniz.h" @@ -234,12 +233,13 @@ bool FilterSketchFabPlugin::upload( // get the api answer QByteArray result = reply->readAll(); - QScriptValue sc; - QScriptEngine engine; + QJSValue sc; + QJSEngine engine; qDebug() << "Result:" << result; sc = engine.evaluate("(" + QString(result) + ")"); QString uid = sc.property("uid").toString(); - if(uid.isEmpty()) return false; + if(uid.isEmpty()) + return false; qDebug() << "Model uploaded with id" << uid; urlModel = "https://sketchfab.com/models/"+uid.toStdString(); return true; diff --git a/src/meshlabplugins/filter_sketchfab/filter_sketchfab.pro b/src/meshlabplugins/filter_sketchfab/filter_sketchfab.pro index e8b2f3ff8..7711f56df 100644 --- a/src/meshlabplugins/filter_sketchfab/filter_sketchfab.pro +++ b/src/meshlabplugins/filter_sketchfab/filter_sketchfab.pro @@ -1,5 +1,7 @@ include (../../shared.pri) +QT += qml + HEADERS += \ filter_sketchfab.h \ miniz.h