From 694bd993d77c3fe3e1077670ae1ef5fa12f210ed Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Mon, 19 Sep 2011 15:37:45 +0000 Subject: [PATCH] reimplemented mesh evaluation: from meshDoc index to MeshModel* --- src/common/scriptinterface.cpp | 9 +++++++-- src/common/scriptinterface.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/scriptinterface.cpp b/src/common/scriptinterface.cpp index f007cd492..0cf91285a 100644 --- a/src/common/scriptinterface.cpp +++ b/src/common/scriptinterface.cpp @@ -530,9 +530,14 @@ int EnvWrap::evalEnum( const QString& nm ) return evalInt(nm); } -int EnvWrap::evalMesh(const QString& nm) +MeshModel* EnvWrap::evalMesh(const QString& nm) { - return evalInt(nm); + int ii = evalInt(nm); + QScriptValue mdsv = env->globalObject().property(ScriptAdapterGenerator::meshDocVarName()); + MeshDocumentScriptInterface* mdsi = dynamic_cast(mdsv.toQObject()); + if (mdsi != NULL) + return mdsi->md->getMesh(ii); + return NULL; } QColor EnvWrap::evalColor( const QString& nm ) diff --git a/src/common/scriptinterface.h b/src/common/scriptinterface.h index c4e1645ee..8bd008c33 100644 --- a/src/common/scriptinterface.h +++ b/src/common/scriptinterface.h @@ -170,7 +170,7 @@ public: /*QString getExpType(const QString& nm);*/ QString evalString(const QString& nm); int evalEnum( const QString& nm ); - int evalMesh(const QString& nm); + MeshModel* evalMesh(const QString& nm); }; QScriptValue EnvWrap_ctor(QScriptContext* c,QScriptEngine* e);