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

Added default values for color transform configuration. 

Former-commit-id: a0d7c9279d5789ea3d19c8bb3004e1f596c39623
This commit is contained in:
T. van der Zwan 2013-10-17 07:44:42 +00:00
parent 8d53c765c3
commit 6756db2417
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deploy/hyperion-remote
View File

Binary file not shown.

2
deploy/hyperiond.REMOVED.git-id
View File

@ -1 +1 @@
eec9520a7c9861d27e5944da29ba31a5fcee41eb
a0d2edb5c6043c421c8efc82a4b86edaa6d8837e

13
libsrc/hyperion/Hyperion.cpp
View File

@ -43,15 +43,18 @@ LedDevice* Hyperion::constructDevice(const Json::Value& deviceConfig)
HsvTransform * Hyperion::createHsvTransform(const Json::Value & hsvConfig)
{
return new HsvTransform(hsvConfig["saturationGain"].asDouble(), hsvConfig["valueGain"].asDouble());
const double saturationGain = hsvConfig.get("saturationGain", 1.0).asDouble();
const double valueGain = hsvConfig.get("valueGain", 1.0).asDouble();
return new HsvTransform(saturationGain, valueGain);
}
ColorTransform* Hyperion::createColorTransform(const Json::Value& colorConfig)
{
const double threshold = colorConfig["threshold"].asDouble();
const double gamma = colorConfig["gamma"].asDouble();
const double blacklevel = colorConfig["blacklevel"].asDouble();
const double whitelevel = colorConfig["whitelevel"].asDouble();
const double threshold = colorConfig.get("threshold", 0.0).asDouble();
const double gamma = colorConfig.get("gamma", 1.0).asDouble();
const double blacklevel = colorConfig.get("blacklevel", 0.0).asDouble();
const double whitelevel = colorConfig.get("whitelevel", 1.0).asDouble();
ColorTransform* transform = new ColorTransform(threshold, gamma, blacklevel, whitelevel);
return transform;