ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #243

Browse Source
This commit is contained in:
Simon Stürz 2015-11-26 16:37:11 +01:00 committed by Michael Zanetti
parent 88cfd9cf8a
commit 66528d6f38
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/jsonrpc/jsontypes.cpp
View File

@ -405,7 +405,7 @@ QVariantMap JsonTypes::packStateType(const StateType &stateType)
QVariantMap variantMap; QVariantMap variantMap;
variantMap.insert("id", stateType.id()); variantMap.insert("id", stateType.id());
variantMap.insert("name", stateType.name()); variantMap.insert("name", stateType.name());
variantMap.insert("type", QVariant::typeToName(stateType.type())); variantMap.insert("type", basicTypeToString(stateType.type()));
variantMap.insert("defaultValue", stateType.defaultValue()); variantMap.insert("defaultValue", stateType.defaultValue());
if(stateType.unit() != Types::UnitNone) { if(stateType.unit() != Types::UnitNone) {
@ -465,7 +465,7 @@ QVariantMap JsonTypes::packParamType(const ParamType &paramType)
{ {
QVariantMap variantMap; QVariantMap variantMap;
variantMap.insert("name", paramType.name()); variantMap.insert("name", paramType.name());
variantMap.insert("type", QVariant::typeToName(paramType.type())); variantMap.insert("type", basicTypeToString(paramType.type()));
// optional // optional
if (paramType.defaultValue().isValid()) { if (paramType.defaultValue().isValid()) {
variantMap.insert("defaultValue", paramType.defaultValue()); variantMap.insert("defaultValue", paramType.defaultValue());
@ -797,6 +797,36 @@ QVariantList JsonTypes::packPlugins()
return pluginsList; return pluginsList;
} }
QString JsonTypes::basicTypeToString(const QVariant::Type &type)
{
switch (type) {
case QVariant::Uuid:
return "Uuid";
break;
case QVariant::String:
return "String";
break;
case QVariant::Int:
return "Int";
break;
case QVariant::UInt:
return "UInt";
break;
case QVariant::Double:
return "Double";
break;
case QVariant::Bool:
return "Bool";
break;
case QVariant::Color:
return "Color";
break;
default:
return QVariant::typeToName(type);
break;
}
}
Param JsonTypes::unpackParam(const QVariantMap &paramMap) Param JsonTypes::unpackParam(const QVariantMap &paramMap)
{ {
if (paramMap.keys().count() == 0) { if (paramMap.keys().count() == 0) {

1
server/jsonrpc/jsontypes.h
View File

@ -176,6 +176,7 @@ public:
static QVariantList packEventTypes(const DeviceClass &deviceClass); static QVariantList packEventTypes(const DeviceClass &deviceClass);
static QVariantList packPlugins(); static QVariantList packPlugins();
static QString basicTypeToString(const QVariant::Type &type);
// unpack Types // unpack Types
static Param unpackParam(const QVariantMap &paramMap); static Param unpackParam(const QVariantMap &paramMap);