frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix json double evaluation for effects

This commit is contained in:
redPanther 2016-10-14 20:59:03 +02:00 committed by GitHub
parent f881a0abe3
commit 1565d60d86
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/effectengine/Effect.cpp
View File

@ -4,6 +4,7 @@
// stl includes // stl includes
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <cmath>
// Qt includes // Qt includes
#include <QDateTime> #include <QDateTime>
@ -188,10 +189,11 @@ PyObject *Effect::json2python(const QJsonValue &jsonData) const
return Py_BuildValue(""); return Py_BuildValue("");
case QJsonValue::Double: case QJsonValue::Double:
{ {
if (rint(jsonData.toDouble()) != jsonData.toDouble()) if (std::rint(jsonData.toDouble()) != jsonData.toDouble())
Py_BuildValue("d", jsonData.toDouble()); {
else return Py_BuildValue("d", jsonData.toDouble());
return Py_BuildValue("i", jsonData.toInt()); }
return Py_BuildValue("i", jsonData.toInt());
} }
case QJsonValue::Bool: case QJsonValue::Bool:
return Py_BuildValue("i", jsonData.toBool() ? 1 : 0); return Py_BuildValue("i", jsonData.toBool() ? 1 : 0);