frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

More fixes

Browse Source 
Former-commit-id: 331ba604dba8aa16f9cf42c5827c8542502be545
This commit is contained in:
AEtHeLsYn 2016-03-13 13:05:47 +01:00
parent a5a17776d4
commit 28f67871dc
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libsrc/hyperion/hyperion.schema.json
View File

@ -38,31 +38,6 @@
"type":"object", "type":"object",
"required":false, "required":false,
"properties": { "properties": {
"correctionValues" : {
"type" : "object",
"required" : false,
"properties" : {
"red" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
},
"green" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
}
"blue" : {
"type" : "integer",
"required" : false,
"minimum" : 0
"maximum" : 255
}
},
"additionalProperties" : false
},
"hsv" : { "hsv" : {
"type" : "object", "type" : "object",
"required" : false, "required" : false,

2
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -409,6 +409,8 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
transform["saturationGain"] = colorTransform->_hsvTransform.getSaturationGain(); transform["saturationGain"] = colorTransform->_hsvTransform.getSaturationGain();
transform["valueGain"] = colorTransform->_hsvTransform.getValueGain(); transform["valueGain"] = colorTransform->_hsvTransform.getValueGain();
transform["saturationLGain"] = colorTransform->_hslTransform.getSaturationGain();
transform["luminanceGain"] = colorTransform->_hslTransform.getLuminanceGain();
Json::Value & threshold = transform["threshold"]; Json::Value & threshold = transform["threshold"];
threshold.append(colorTransform->_rgbRedTransform.getThreshold()); threshold.append(colorTransform->_rgbRedTransform.getThreshold());

4
src/hyperion-remote/JsonConnection.cpp
View File

@ -216,12 +216,12 @@ void JsonConnection::setTransform(std::string * transformId, double * saturation
transform["valueGain"] = *value; transform["valueGain"] = *value;
} }
if (saturation != nullptr) if (saturationL != nullptr)
{ {
transform["saturationLGain"] = *saturationL; transform["saturationLGain"] = *saturationL;
} }
if (value != nullptr) if (luminance != nullptr)
{ {
transform["luminanceGain"] = *luminance; transform["luminanceGain"] = *luminance;
} }