Add color adjustment to all RBG channels

* Channel adjustment config * Create RgbChannelAdjustment.h * Delete RgbChannelAdjustment.h * Create RgbChannelAdjustment.cpp * Create RgbChannelAdjustment.h * Delete RgbChannelAdjustment.cpp * Create ColorAdjustment.cpp * Delete RgbChannelAdjustment.h * Create ColorAdjustment.h * Update ColorAdjustment.h * Update ColorAdjustment.h * Update ColorAdjustment.h * Update ColorAdjustment.cpp * Update Hyperion.cpp * Update Hyperion.cpp * Update Hyperion.cpp * Update Hyperion.h * Create RgbChannelAdjustment.cpp * Create RgbChannelAdjustment.h * Create ColorAdjustment.h * Create MultiColorAdjustment.h * Update MultiColorAdjustment.h * Create MultiColorAdjustment.cpp * Delete ColorAdjustment.cpp * Delete ColorAdjustment.h * Update RgbChannelAdjustment.cpp * Update Hyperion.cpp * Update Hyperion.h * Update Hyperion.cpp * Bug fixes * Update hyperion.config.json * Add color adjustment to json server and client and adapt hyperion-remote * Change the color modification order * Minor bug fix * Create calibration Images folder * Create calibration Gamma folder * Create calibration RGB folder * Added files via upload * Delete .gitkeep * Delete .gitkeep * Added files via upload * Delete .gitkeep * Update color effect order and don't correct twice * Uploaded gradient images Former-commit-id: 8ab465e59834f12a21709a6f4546bd6808a2a495
2025-03-01 10:33:28 +00:00 · 2016-04-02 00:04:11 +02:00
parent 078dbfd88e
commit b37cbd26d5
41 changed files with 870 additions and 13 deletions
--- a/libsrc/jsonserver/JsonClientConnection.cpp
+++ b/libsrc/jsonserver/JsonClientConnection.cpp
@@ -19,6 +19,7 @@
 #include <hyperion/MessageForwarder.h>
 #include <hyperion/ColorTransform.h>
 #include <hyperion/ColorCorrection.h>
+#include <hyperion/ColorAdjustment.h>
 #include <utils/ColorRgb.h>

 // project includes
@@ -252,6 +253,8 @@ void JsonClientConnection::handleMessage(const std::string &messageString)
 		handleCorrectionCommand(message);
 	else if (command == "temperature")
 		handleTemperatureCommand(message);
+	else if (command == "adjustment")
+		handleAdjustmentCommand(message);
 	else
 		handleNotImplemented();
 }
@@ -470,6 +473,34 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
 		whitelevel.append(colorTransform->_rgbGreenTransform.getWhitelevel());
 		whitelevel.append(colorTransform->_rgbBlueTransform.getWhitelevel());
 	}
+	
+	// collect adjustment information
+	Json::Value & adjustmentArray = info["adjustment"];
+	for (const std::string& adjustmentId : _hyperion->getAdjustmentIds())
+	{
+		const ColorAdjustment * colorAdjustment = _hyperion->getAdjustment(adjustmentId);
+		if (colorAdjustment == nullptr)
+		{
+			std::cerr << "JSONCLIENT ERROR: Incorrect color adjustment id: " << adjustmentId << std::endl;
+			continue;
+		}
+
+		Json::Value & adjustment = adjustmentArray.append(Json::Value());
+		adjustment["id"] = adjustmentId;
+
+		Json::Value & redAdjust = adjustment["redAdjust"];
+		redAdjust.append(colorAdjustment->_rgbRedAdjustment.getadjustmentR());
+		redAdjust.append(colorAdjustment->_rgbRedAdjustment.getadjustmentG());
+		redAdjust.append(colorAdjustment->_rgbRedAdjustment.getadjustmentB());
+		Json::Value & greenAdjust = adjustment["greenAdjust"];
+		greenAdjust.append(colorAdjustment->_rgbGreenAdjustment.getadjustmentR());
+		greenAdjust.append(colorAdjustment->_rgbGreenAdjustment.getadjustmentG());
+		greenAdjust.append(colorAdjustment->_rgbGreenAdjustment.getadjustmentB());
+		Json::Value & blueAdjust = adjustment["blueAdjust"];
+		blueAdjust.append(colorAdjustment->_rgbBlueAdjustment.getadjustmentR());
+		blueAdjust.append(colorAdjustment->_rgbBlueAdjustment.getadjustmentG());
+		blueAdjust.append(colorAdjustment->_rgbBlueAdjustment.getadjustmentB());
+	}

 	// collect effect info
 	Json::Value & effects = info["effects"] = Json::Value(Json::arrayValue);
@@ -634,6 +665,47 @@ void JsonClientConnection::handleTemperatureCommand(const Json::Value &message)

 	sendSuccessReply();
 }
+
+void JsonClientConnection::handleAdjustmentCommand(const Json::Value &message)
+{
+	const Json::Value & adjustment = message["adjustment"];
+
+	const std::string adjustmentId = adjustment.get("id", _hyperion->getAdjustmentIds().front()).asString();
+	ColorAdjustment * colorAdjustment = _hyperion->getAdjustment(adjustmentId);
+	if (colorAdjustment == nullptr)
+	{
+		//sendErrorReply(std::string("Incorrect transform identifier: ") + transformId);
+		return;
+	}
+		
+	if (adjustment.isMember("redAdjust"))
+	{
+		const Json::Value & values = adjustment["redAdjust"];
+		colorAdjustment->_rgbRedAdjustment.setadjustmentR(values[0u].asInt());
+		colorAdjustment->_rgbRedAdjustment.setadjustmentG(values[1u].asInt());
+		colorAdjustment->_rgbRedAdjustment.setadjustmentB(values[2u].asInt());
+	}
+
+	if (adjustment.isMember("greenAdjust"))
+	{
+		const Json::Value & values = adjustment["greenAdjust"];
+		colorAdjustment->_rgbGreenAdjustment.setadjustmentR(values[0u].asInt());
+		colorAdjustment->_rgbGreenAdjustment.setadjustmentG(values[1u].asInt());
+		colorAdjustment->_rgbGreenAdjustment.setadjustmentB(values[2u].asInt());
+	}
+
+	if (adjustment.isMember("blueAdjust"))
+	{
+		const Json::Value & values = adjustment["blueAdjust"];
+		colorAdjustment->_rgbBlueAdjustment.setadjustmentR(values[0u].asInt());
+		colorAdjustment->_rgbBlueAdjustment.setadjustmentG(values[1u].asInt());
+		colorAdjustment->_rgbBlueAdjustment.setadjustmentB(values[2u].asInt());
+	}	
+	// commit the changes
+	_hyperion->adjustmentsUpdated();
+
+	sendSuccessReply();
+}
 	
 void JsonClientConnection::handleNotImplemented()
 {
@@ -712,7 +784,6 @@ void JsonClientConnection::sendMessage(const Json::Value & message, QTcpSocket *

 }

-
 void JsonClientConnection::sendSuccessReply()
 {
 	// create reply
--- a/libsrc/jsonserver/JsonClientConnection.h
+++ b/libsrc/jsonserver/JsonClientConnection.h
@@ -126,6 +126,13 @@ private:
 	/// @param message the incoming message
 	///
 	void handleTemperatureCommand(const Json::Value & message);
+	
+	///
+	/// Handle an incoming JSON Adjustment message
+	///
+	/// @param message the incoming message
+	///
+	void handleAdjustmentCommand(const Json::Value & message);

 	///
 	/// Handle an incoming JSON message of unknown type
--- a/libsrc/jsonserver/JsonSchemas.qrc
+++ b/libsrc/jsonserver/JsonSchemas.qrc
@@ -9,6 +9,7 @@
        <file alias="schema-transform">schema/schema-transform.json</file>
        <file alias="schema-correction">schema/schema-correction.json</file>
        <file alias="schema-temperature">schema/schema-temperature.json</file>
+        <file alias="schema-adjustment">schema/schema-adjustment.json</file>
        <file alias="schema-effect">schema/schema-effect.json</file>
    </qresource>
 </RCC>
--- a/libsrc/jsonserver/schema/schema-adjustment.json
+++ b/libsrc/jsonserver/schema/schema-adjustment.json
@@ -0,0 +1,56 @@
+{
+	"type":"object",
+	"required":true,
+	"properties":{
+		"command": {
+			"type" : "string",
+			"required" : true,
+			"enum" : ["adjustment"]
+		},
+		"adjustment": {
+			"type": "object",
+			"required": true,
+			"properties": {
+				"id" : {
+					"type" : "string",
+					"required" : false
+				},
+				"redAdjust": {
+					"type": "array",
+					"required": false,
+					"items" : {
+						"type": "integer",
+						"minimum": 0,
+						"maximum": 255
+					},
+					"minItems": 3,
+					"maxItems": 3
+				},
+				"greenAdjust": {
+					"type": "array",
+					"required": false,
+					"items" : {
+						"type": "integer",
+						"minimum": 0,
+						"maximum": 255
+					},
+					"minItems": 3,
+					"maxItems": 3
+				},
+				"blueAdjust": {
+					"type": "array",
+					"required": false,
+					"items" : {
+						"type": "integer",
+						"minimum": 0,
+						"maximum": 255
+					},
+					"minItems": 3,
+					"maxItems": 3
+				}
+			},
+			"additionalProperties": false
+		}
+	},
+	"additionalProperties": false
+}
--- a/libsrc/jsonserver/schema/schema.json
+++ b/libsrc/jsonserver/schema/schema.json
@@ -5,7 +5,7 @@
        "command": {
            "type" : "string",
            "required" : true,
-            "enum" : ["color", "image", "effect", "serverinfo", "clear", "clearall", "transform", "correction", "temperature"]
+            "enum" : ["color", "image", "effect", "serverinfo", "clear", "clearall", "transform", "correction", "temperature", "adjustment"]
        }
    }
 }