From fe09cc5a2277be22a7a56fa124bcdcb3a58c961d Mon Sep 17 00:00:00 2001 From: granzuglia Date: Wed, 3 Jan 2018 10:39:37 +1100 Subject: [PATCH] updated the filterthread with support for persistent parameters --- src/meshlab/filterthread.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/meshlab/filterthread.cpp b/src/meshlab/filterthread.cpp index a2c0e4907..8a55e270f 100644 --- a/src/meshlab/filterthread.cpp +++ b/src/meshlab/filterthread.cpp @@ -33,12 +33,9 @@ void FilterThread::run() Env env; QScriptValue val; - if (_mw != NULL) - val = env.loadMLScriptEnv(_md,_pm,_mw->currentGlobalPars()); - else - val = env.loadMLScriptEnv(_md,_pm); - if (val.isError()) - throw JavaScriptException("A Plugin-bridge-code generated a JavaScript Error: " + val.toString() + "\n"); + val = env.loadMLScriptEnv(_md, _pm); + if (val.isError()) + throw JavaScriptException("A Plugin-bridge-code generated a JavaScript Error: " + val.toString() + "\n"); QMap::iterator it =_pm.stringXMLFilterMap.find(_fname); if ((it == _pm.stringXMLFilterMap.end()) || (it->xmlInfo == NULL)) @@ -80,8 +77,8 @@ void FilterThread::run() } } - for (QMap::const_iterator itp = _parexpval.constBegin();itp != _parexpval.constEnd();++itp) - env.insertExpressionBinding(itp.key(),itp.value()); + for (QMap::const_iterator itp = _parexpval.constBegin(); itp != _parexpval.constEnd(); ++itp) + env.insertExpressionBinding(itp.key(), itp.value()); EnvWrap envwrap(env); _cur = this; _success = it->filterInterface->applyFilter(_fname, _md, envwrap, &localCallBack);