Clone single led color from other led (#157)

* start ledclone

* led cloning: clone scan areas from original led
main: show exceptions, better exit

* tune json schema for new option. somwe cleanup

* fix warnings and bug for framebuffer selection. thx to clang brought by new osx buikld on travis

* make ledclone feature work flawlessly for effects too. Effect sees the ledstring without cloned leds.
cloned leds will be inserted just before sending to leddevice

additional: remove warnings and fix code style

* fix warning

Author: redPanther

include/hyperion/Hyperion.h

@@ -268,6 +268,7 @@ public slots:
 	 * @return The constructed ledstring
 	 */
 	static LedString createLedString(const Json::Value & ledsConfig, const ColorOrder deviceOrder);
+	static LedString createLedStringClone(const Json::Value & ledsConfig, const ColorOrder deviceOrder);
 
 	static MultiColorTransform * createLedColorsTransform(const unsigned ledCnt, const Json::Value & colorTransformConfig);
 	static MultiColorCorrection * createLedColorsTemperature(const unsigned ledCnt, const Json::Value & colorTemperatureConfig);
@@ -312,6 +313,10 @@ private slots:
 	/// The specifiation of the led frame construction and picture integration
 	LedString _ledString;
 
+	/// specifiation of cloned leds
+	LedString _ledStringClone;
+
+	std::vector<ColorOrder> _ledStringColorOrder;
 	/// The priority muxer
 	PriorityMuxer _muxer;
 
@@ -368,4 +373,5 @@ private slots:
 
 	/// holds the current priority channel that is manualy selected
 	int _currentSourcePriority;
+	
 };

include/hyperion/LedString.h

@@ -97,6 +97,8 @@ struct Led
 	double minY_frac;
 	///  The maximum horizontal scan line included for this leds color
 	double maxY_frac;
+	/// id to clone
+	int clone;
 	/// the color order
 	ColorOrder colorOrder;
 };

libsrc/effectengine/Effect.cpp

@@ -50,18 +50,18 @@ void Effect::registerHyperionExtensionModule()
 	PyImport_AppendInittab("hyperion", &PyInit_hyperion);
 }
 
-Effect::Effect(PyThreadState * mainThreadState, int priority, int timeout, const std::string & script, const Json::Value & args) :
-	QThread(),
-	_mainThreadState(mainThreadState),
-	_priority(priority),
-	_timeout(timeout),
-	_script(script),
-	_args(args),
-	_endTime(-1),
-	_interpreterThreadState(nullptr),
-	_abortRequested(false),
-	_imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor()),
-	_colors()
+Effect::Effect(PyThreadState * mainThreadState, int priority, int timeout, const std::string & script, const Json::Value & args)
+	: QThread()
+	, _mainThreadState(mainThreadState)
+	, _priority(priority)
+	, _timeout(timeout)
+	, _script(script)
+	, _args(args)
+	, _endTime(-1)
+	, _interpreterThreadState(nullptr)
+	, _abortRequested(false)
+	, _imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor())
+	, _colors()
 {
 	_colors.resize(_imageProcessor->getLedCount(), ColorRgb::BLACK);
 

libsrc/effectengine/EffectEngine.cpp

@@ -18,12 +18,12 @@
 #include "Effect.h"
 #include "HyperionConfig.h"
 
-EffectEngine::EffectEngine(Hyperion * hyperion, const Json::Value & jsonEffectConfig) :
-	_hyperion(hyperion),
-	_availableEffects(),
-	_activeEffects(),
-	_mainThreadState(nullptr),
-	_log(Logger::getInstance("EFFECTENGINE"))
+EffectEngine::EffectEngine(Hyperion * hyperion, const Json::Value & jsonEffectConfig)
+	: _hyperion(hyperion)
+	, _availableEffects()
+	, _activeEffects()
+	, _mainThreadState(nullptr)
+	, _log(Logger::getInstance("EFFECTENGINE"))
 {
 	qRegisterMetaType<std::vector<ColorRgb>>("std::vector<ColorRgb>");
 

libsrc/hyperion/Hyperion.cpp

@@ -54,31 +54,7 @@ Hyperion* Hyperion::getInstance()
 
 ColorOrder Hyperion::createColorOrder(const Json::Value &deviceConfig)
 {
-	std::string order = deviceConfig.get("colorOrder", "rgb").asString();
-	if (order == "bgr")
-	{
-		return ORDER_BGR;
-	}
-	if (order == "rbg")
-	{
-		return ORDER_RBG;
-	}
-	if (order == "brg")
-	{
-		return ORDER_BRG;
-	}
-	if (order == "gbr")
-	{
-		return ORDER_GBR;
-	}
-	if (order == "grb")
-	{
-		return ORDER_GRB;
-	}
-
-	WarningIf( order != "rgb", Logger::getInstance("Core"), "Unknown color order defined (%s). Using RGB.", order.c_str());
-
-	return ORDER_RGB;
+	return stringToColorOrder( deviceConfig.get("colorOrder", "rgb").asString() );
 }
 
 ColorTransform * Hyperion::createColorTransform(const Json::Value & transformConfig)
@@ -443,40 +419,81 @@ RgbChannelAdjustment* Hyperion::createRgbChannelAdjustment(const Json::Value& co
 LedString Hyperion::createLedString(const Json::Value& ledsConfig, const ColorOrder deviceOrder)
 {
 	LedString ledString;
-
 	const std::string deviceOrderStr = colorOrderToString(deviceOrder);
+	int maxLedId = ledsConfig.size();
 	for (const Json::Value& ledConfig : ledsConfig)
 	{
 		Led led;
 		led.index = ledConfig["index"].asInt();
+		led.clone = ledConfig.get("clone",-1).asInt();
+		if ( led.clone < -1 || led.clone >= maxLedId )
+		{
+			Warning(Logger::getInstance("Core"), "LED %d: clone index of %d is out of range, clone ignored", led.index, led.clone);
+			led.clone = -1;
+		}
 
-		const Json::Value& hscanConfig = ledConfig["hscan"];
-		const Json::Value& vscanConfig = ledConfig["vscan"];
-		led.minX_frac = std::max(0.0, std::min(1.0, hscanConfig["minimum"].asDouble()));
-		led.maxX_frac = std::max(0.0, std::min(1.0, hscanConfig["maximum"].asDouble()));
-		led.minY_frac = std::max(0.0, std::min(1.0, vscanConfig["minimum"].asDouble()));
-		led.maxY_frac = std::max(0.0, std::min(1.0, vscanConfig["maximum"].asDouble()));
-
-		// Fix if the user swapped min and max
-		if (led.minX_frac > led.maxX_frac)
+		if ( led.clone < 0 )
 		{
-			std::swap(led.minX_frac, led.maxX_frac);
+			const Json::Value& hscanConfig = ledConfig["hscan"];
+			const Json::Value& vscanConfig = ledConfig["vscan"];
+			led.minX_frac = std::max(0.0, std::min(1.0, hscanConfig["minimum"].asDouble()));
+			led.maxX_frac = std::max(0.0, std::min(1.0, hscanConfig["maximum"].asDouble()));
+			led.minY_frac = std::max(0.0, std::min(1.0, vscanConfig["minimum"].asDouble()));
+			led.maxY_frac = std::max(0.0, std::min(1.0, vscanConfig["maximum"].asDouble()));
+			// Fix if the user swapped min and max
+			if (led.minX_frac > led.maxX_frac)
+			{
+				std::swap(led.minX_frac, led.maxX_frac);
+			}
+			if (led.minY_frac > led.maxY_frac)
+			{
+				std::swap(led.minY_frac, led.maxY_frac);
+			}
+
+			// Get the order of the rgb channels for this led (default is device order)
+			led.colorOrder = stringToColorOrder(ledConfig.get("colorOrder", deviceOrderStr).asString());
+			ledString.leds().push_back(led);
 		}
-		if (led.minY_frac > led.maxY_frac)
+	}
+
+	// Make sure the leds are sorted (on their indices)
+	std::sort(ledString.leds().begin(), ledString.leds().end(), [](const Led& lhs, const Led& rhs){ return lhs.index < rhs.index; });
+	return ledString;
+}
+
+LedString Hyperion::createLedStringClone(const Json::Value& ledsConfig, const ColorOrder deviceOrder)
+{
+	LedString ledString;
+	const std::string deviceOrderStr = colorOrderToString(deviceOrder);
+	int maxLedId = ledsConfig.size();
+	for (const Json::Value& ledConfig : ledsConfig)
+	{
+		Led led;
+		led.index = ledConfig["index"].asInt();
+		led.clone = ledConfig.get("clone",-1).asInt();
+		if ( led.clone < -1 || led.clone >= maxLedId )
 		{
-			std::swap(led.minY_frac, led.maxY_frac);
+			Warning(Logger::getInstance("Core"), "LED %d: clone index of %d is out of range, clone ignored", led.index, led.clone);
+			led.clone = -1;
 		}
 
-		// Get the order of the rgb channels for this led (default is device order)
-		const std::string ledOrderStr = ledConfig.get("colorOrder", deviceOrderStr).asString();
-		led.colorOrder = stringToColorOrder(ledOrderStr);
+		if ( led.clone >= 0 )
+		{
+			Debug(Logger::getInstance("Core"), "LED %d: clone from led %d", led.index, led.clone);
+			led.minX_frac = 0;
+			led.maxX_frac = 0;
+			led.minY_frac = 0;
+			led.maxY_frac = 0;
+			// Get the order of the rgb channels for this led (default is device order)
+			led.colorOrder = stringToColorOrder(ledConfig.get("colorOrder", deviceOrderStr).asString());
+
+			ledString.leds().push_back(led);
+		}
 
-		ledString.leds().push_back(led);
 	}
 
 	// Make sure the leds are sorted (on their indices)
 	std::sort(ledString.leds().begin(), ledString.leds().end(), [](const Led& lhs, const Led& rhs){ return lhs.index < rhs.index; });
-
 	return ledString;
 }
 
@@ -543,6 +560,7 @@ MessageForwarder * Hyperion::getForwarder()
 
 Hyperion::Hyperion(const Json::Value &jsonConfig, const std::string configFile)
 	: _ledString(createLedString(jsonConfig["leds"], createColorOrder(jsonConfig["device"])))
+	, _ledStringClone(createLedStringClone(jsonConfig["leds"], createColorOrder(jsonConfig["device"])))
 	, _muxer(_ledString.leds().size())
 	, _raw2ledTransform(createLedColorsTransform(_ledString.leds().size(), jsonConfig["color"]))
 	, _raw2ledTemperature(createLedColorsTemperature(_ledString.leds().size(), jsonConfig["color"]))
@@ -595,7 +613,7 @@ Hyperion::Hyperion(const Json::Value &jsonConfig, const std::string configFile)
 	QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(update()));
 
 	// create the effect engine
-	_effectEngine = new EffectEngine(this, jsonConfig["effects"]);
+	_effectEngine = new EffectEngine(this,jsonConfig["effects"]);
 
 	unsigned int hwLedCount = jsonConfig["device"].get("ledCount",getLedCount()).asUInt();
 	_hwLedCount = std::max(hwLedCount, getLedCount());
@@ -867,14 +885,32 @@ void Hyperion::update()
 	if (_adjustmentEnabled)  _raw2ledAdjustment->applyAdjustment(_ledBuffer);
 	if (_temperatureEnabled) _raw2ledTemperature->applyCorrection(_ledBuffer);
 
-	const std::vector<Led>& leds = _ledString.leds();
-
+	// init colororder vector, if nempty
+	if (_ledStringColorOrder.empty())
+	{
+		for (Led& led : _ledString.leds())
+		{
+			_ledStringColorOrder.push_back(led.colorOrder);
+		}
+		for (Led& led : _ledStringClone.leds())
+		{
+			_ledStringColorOrder.insert(_ledStringColorOrder.begin() + led.index, led.colorOrder);
+		}
+	}
+	
+	// insert cloned leds into buffer
+	for (Led& led : _ledStringClone.leds())
+	{
+		_ledBuffer.insert(_ledBuffer.begin() + led.index, _ledBuffer.at(led.clone));
+	}
+	
 	int i = 0;
 	for (ColorRgb& color : _ledBuffer)
 	{
-		const ColorOrder ledColorOrder = leds.at(i).colorOrder;
+		//const ColorOrder ledColorOrder = leds.at(i).colorOrder;
+
 		// correct the color byte order
-		switch (ledColorOrder)
+		switch (_ledStringColorOrder.at(i))
 		{
 		case ORDER_RGB:
 			// leave as it is

libsrc/hyperion/hyperion.schema.json

@@ -9,7 +9,7 @@
 			"properties" :
 			{
 				"level" :
-				{
+				{ 
 					"enum" : ["silent", "warn", "verbose", "debug"]
 				}
 			},
@@ -33,19 +33,19 @@
 				},
 				"output" :
 				{
-					"type" : "string",
-					"required" : true
+					"type" : "string"
 				},
 				"rate" :
 				{
 					"type" : "integer",
-					"required" : false,
 					"minimum" : 0
 				},
 				"colorOrder" :
 				{
-					"type" : "string",
-					"required" : false
+					"type":
+					{
+						"enum" : ["bgr", "rbg", "brg", "gbr", "grb"]
+					}
 				}
 			},
 			"additionalProperties" : true
@@ -852,20 +852,27 @@
 						"type":"integer",
 						"required":true
 					},
+					"clone":
+					{
+						"type":"integer"
+					},
 					"hscan":
 					{
 						"type":"object",
-						"required":true,
 						"properties":
 						{
 							"minimum":
 							{
 								"type":"number",
+								"minimum" : 0,
+								"maximum" : 1,
 								"required":true
 							},
 							"maximum":
 							{
 								"type":"number",
+								"minimum" : 0,
+								"maximum" : 1,
 								"required":true
 							}
 						},
@@ -874,26 +881,31 @@
 					"vscan":
 					{
 						"type":"object",
-						"required":true,
 						"properties":
 						{
 							"minimum":
 							{
 								"type":"number",
+								"minimum" : 0,
+								"maximum" : 1,
 								"required":true
 							},
 							"maximum":
 							{
 								"type":"number",
+								"minimum" : 0,
+								"maximum" : 1,
 								"required":true
 							}
 						},
 						"additionalProperties" : false
 					},
 					"colorOrder":
 					{
-						"type":"string",
-						"required":false
+						"type":
+						{
+							"enum" : ["bgr", "rbg", "brg", "gbr", "grb"]
+						}
 					}
 				},
 				"additionalProperties" : false