python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

moveQObjectToScript() has been added to ScriptManager

Browse Source
This commit is contained in:
Arin Alexander 2019-01-30 01:53:21 +03:00
parent 6a18faf600
commit f48e414114
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lrscriptenginemanagerintf.h
View File

@ -46,7 +46,9 @@ public:
virtual bool addFunction(const QString &name, const QString& script, virtual bool addFunction(const QString &name, const QString& script,
const QString &category="", const QString &description="") = 0; const QString &category="", const QString &description="") = 0;
virtual const QString& lastError() const = 0; virtual const QString& lastError() const = 0;
virtual ScriptValueType moveQObjectToScript(QObject* object, const QString objectName) = 0;
virtual ~IScriptEngineManager(){} virtual ~IScriptEngineManager(){}
}; };
} //namespace LimeReport } //namespace LimeReport

7
limereport/lrscriptenginemanager.cpp
View File

@ -562,6 +562,13 @@ void ScriptEngineManager::clearTableOfContents(){
} }
} }
ScriptValueType ScriptEngineManager::moveQObjectToScript(QObject* object, const QString objectName)
{
ScriptValueType result = scriptEngine()->newQObject(object);
scriptEngine()->globalObject().setProperty(objectName, result);
return result;
}
void ScriptEngineManager::updateModel() void ScriptEngineManager::updateModel()
{ {

2
limereport/lrscriptenginemanager.h
View File

@ -377,7 +377,7 @@ public:
QVariant evaluateScript(const QString &script); QVariant evaluateScript(const QString &script);
void addTableOfContentsItem(const QString& uniqKey, const QString& content, int indent); void addTableOfContentsItem(const QString& uniqKey, const QString& content, int indent);
void clearTableOfContents(); void clearTableOfContents();
ScriptValueType moveQObjectToScript(QObject* object, const QString objectName);
protected: protected:
void updateModel(); void updateModel();
bool containsFunction(const QString &functionName); bool containsFunction(const QString &functionName);

2
limereport/lrscriptenginemanagerintf.h
View File

@ -46,7 +46,9 @@ public:
virtual bool addFunction(const QString &name, const QString& script, virtual bool addFunction(const QString &name, const QString& script,
const QString &category="", const QString &description="") = 0; const QString &category="", const QString &description="") = 0;
virtual const QString& lastError() const = 0; virtual const QString& lastError() const = 0;
virtual ScriptValueType moveQObjectToScript(QObject* object, const QString objectName) = 0;
virtual ~IScriptEngineManager(){} virtual ~IScriptEngineManager(){}
}; };
} //namespace LimeReport } //namespace LimeReport