ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #272: Fix param values getting lost in ScriptEvents

pull/280/head
Jenkins nymea 2020-04-05 14:43:23 +02:00
parent b74e25cfd4 d82054df5d
commit a062ab44cf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libnymea-core/scriptengine/scriptevent.cpp
View File

@ -32,6 +32,7 @@
#include <qqml.h>
#include <QQmlEngine>
#include <QJsonDocument>
namespace nymeaserver {
@ -104,16 +105,15 @@ void ScriptEvent::onEventTriggered(const Event &event)
return;
}
// ScriptParams *params = new ScriptParams(event.params());
// qmlEngine(this)->setObjectOwnership(params, QQmlEngine::JavaScriptOwnership);
QVariantMap params;
foreach (const Param &param, event.params()) {
params.insert(param.paramTypeId().toString().remove(QRegExp("[{}]")), param.value());
params.insert(param.paramTypeId().toString().remove(QRegExp("[{}]")), param.value().toByteArray());
QString paramName = thing->thingClass().eventTypes().findById(event.eventTypeId()).paramTypes().findById(param.paramTypeId()).name();
params.insert(paramName, param.value());
params.insert(paramName, param.value().toByteArray());
}
emit triggered(params);
// Note: Explicitly convert the params to a Json document because auto-casting from QVariantMap to the JS engine might drop some values.
emit triggered(QJsonDocument::fromVariant(params).toVariant().toMap());
}
}