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

Merge PR #135: Add MicroSiementsPerCentimeter unit support

Browse Source
This commit is contained in:
Jenkins 2019-01-29 12:55:43 +01:00
commit 4ea32c7177
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-app-core/jsonrpc/jsontypes.cpp
View File

@ -583,6 +583,8 @@ QPair<Types::Unit, QString> JsonTypes::stringToUnit(const QString &unitString)
return QPair<Types::Unit, QString>(Types::UnitPercentage, "%"); return QPair<Types::Unit, QString>(Types::UnitPercentage, "%");
} else if (unitString == "UnitPartsPerMillion") { } else if (unitString == "UnitPartsPerMillion") {
return QPair<Types::Unit, QString>(Types::UnitPartsPerMillion, "ppm"); return QPair<Types::Unit, QString>(Types::UnitPartsPerMillion, "ppm");
} else if (unitString == "UnitMicroSiemensPerCentimeter") {
return QPair<Types::Unit, QString>(Types::UnitMicroSiemensPerCentimeter, "µS/cm");
} else if (unitString == "UnitEuro") { } else if (unitString == "UnitEuro") {
return QPair<Types::Unit, QString>(Types::UnitEuro, "€"); return QPair<Types::Unit, QString>(Types::UnitEuro, "€");
} else if (unitString == "UnitDollar") { } else if (unitString == "UnitDollar") {

1
libnymea-common/types/types.h
View File

@ -83,6 +83,7 @@ public:
UnitKiloWattHour, UnitKiloWattHour,
UnitPercentage, UnitPercentage,
UnitPartsPerMillion, UnitPartsPerMillion,
UnitMicroSiemensPerCentimeter,
UnitEuro, UnitEuro,
UnitDollar UnitDollar
}; };