lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated the filterthread with support for persistent parameters

Browse Source
This commit is contained in:
granzuglia 2018-01-03 10:39:37 +11:00
parent 7a19e3ceb9
commit fe09cc5a22
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/meshlab/filterthread.cpp
View File

@ -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<QString,MeshLabXMLFilterContainer>::iterator it =_pm.stringXMLFilterMap.find(_fname);
if ((it == _pm.stringXMLFilterMap.end()) || (it->xmlInfo == NULL))
@ -80,8 +77,8 @@ void FilterThread::run()
}
}
for (QMap<QString,QString>::const_iterator itp = _parexpval.constBegin();itp != _parexpval.constEnd();++itp)
env.insertExpressionBinding(itp.key(),itp.value());
for (QMap<QString, QString>::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);