Expand effect engine & ui update (#445)

* update * update * update * . * . * . * update * . * . * . * . * update * . * update * . * update * update * update * update * update * update * . * update * update * update * . * . * . * Revert "." This reverts commit 4dd6404b32. * update * . * . * . * . * . * . * . * . * . * . * . * ... * . * . * . * . * . * . * . * . * . * update * update * update * remove svg and pic * colorpicker imgs to base64 to prevent delayed load if not cached * fix json2python func * update swirl with rgba * add double swirl, tune default val in schema, update explanation * adjust swirl.py * FileObserver for config checks with timer as fallback (#4)
2025-03-01 10:33:28 +00:00 · 2017-07-30 14:36:23 +02:00
parent 5bd020a570
commit 8a794039cf
74 changed files with 3472 additions and 864 deletions
--- a/libsrc/hyperion/Hyperion.cpp
+++ b/libsrc/hyperion/Hyperion.cpp
@@ -445,10 +445,18 @@ Hyperion::Hyperion(const QJsonObject &qjsonConfig, const QString configFile)
 	Debug(_log,"configured leds: %d hw leds: %d", getLedCount(), _hwLedCount);
 	WarningIf(hwLedCount < getLedCount(), _log, "more leds configured than available. check 'ledCount' in 'device' section");

-	// setup interval timer for config state checks	and initial shot
+	// setup config state checks and initial shot
 	checkConfigState();
-        QObject::connect(&_cTimer, SIGNAL(timeout()), this, SLOT(checkConfigState()));
-        _cTimer.start(2000);
+	if(_fsWatcher.addPath(_configFile))
+	{
+		QObject::connect(&_fsWatcher, &QFileSystemWatcher::fileChanged, this, &Hyperion::checkConfigState);
+	}
+	else
+	{
+		Warning(_log,"Filesystem Observer failed for file: %s, use fallback timer", _configFile.toStdString().c_str());
+		QObject::connect(&_cTimer, SIGNAL(timeout()), this, SLOT(checkConfigState()));
+		_cTimer.start(2000);
+	}

 	// pipe muxer signal for effect/color timerunner to hyperionStateChanged slot
 	QObject::connect(&_muxer, &PriorityMuxer::timerunner, this, &Hyperion::hyperionStateChanged);
@@ -545,7 +553,7 @@ Hyperion::BonjourRegister Hyperion::getHyperionSessions()
 	return _hyperionSessions;
 }

-void Hyperion::checkConfigState()
+void Hyperion::checkConfigState(QString cfile)
 {
 	// Check config modifications
 	QFile f(_configFile);
--- a/libsrc/hyperion/schema/schema-backgroundEffect.json
+++ b/libsrc/hyperion/schema/schema-backgroundEffect.json
@@ -34,14 +34,24 @@
 			},
 			"minItems" : 3,
 			"maxItems" : 3,
-			"propertyOrder" : 3
+			"propertyOrder" : 3,
+			"options": {
+				"dependencies": {
+					"type": "color"
+				}
+			}
 		},
 		"effect" :
 		{
 			"type" : "string",
 			"format" : "select",
 			"title" : "edt_conf_fge_effect_title",
-			"propertyOrder" : 4
+			"propertyOrder" : 4,
+			"options": {
+				"dependencies": {
+					"type": "effect"
+				}
+			}
 		}
 	},
 	"additionalProperties" : false
--- a/libsrc/hyperion/schema/schema-color.json
+++ b/libsrc/hyperion/schema/schema-color.json
@@ -20,6 +20,7 @@
 		{
 			"type" : "array",
 			"title" : "edt_conf_color_channelAdjustment_header_title",
+			"minItems": 1,
 			"required" : true,
 			"propertyOrder" : 3,
 			"items" :
--- a/libsrc/hyperion/schema/schema-foregroundEffect.json
+++ b/libsrc/hyperion/schema/schema-foregroundEffect.json
@@ -34,14 +34,24 @@
 			},
 			"minItems" : 3,
 			"maxItems" : 3,
-			"propertyOrder" : 3
+			"propertyOrder" : 3,
+			"options": {
+				"dependencies": {
+					"type": "color"
+				}
+			}
 		},
 		"effect" :
 		{
 			"type" : "string",
 			"format" : "select",
 			"title" : "edt_conf_fge_effect_title",
-			"propertyOrder" : 4
+			"propertyOrder" : 4,
+			"options": {
+				"dependencies": {
+					"type": "effect"
+				}
+			}
 		},
 		"duration_ms" :
 		{
--- a/libsrc/hyperion/schema/schema-grabberV4L2.json
+++ b/libsrc/hyperion/schema/schema-grabberV4L2.json
@@ -140,84 +140,112 @@
 			{
 				"type" : "boolean",
 				"title" : "edt_conf_v4l2_signalDetection_title",
-				"default" : true,
+				"default" : false,
 				"propertyOrder" : 16
 			},
 			"redSignalThreshold" :
 			{
 				"type" : "number",
 				"title" : "edt_conf_v4l2_redSignalThreshold_title",
-				"minimum" : 0.0,
-				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
+				"minimum" : 0,
+				"maximum" : 100,
+				"default" : 5,
 				"append" : "edt_append_percent",
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 17
 			},
 			"greenSignalThreshold" :
 			{
 				"type" : "number",
 				"title" : "edt_conf_v4l2_greenSignalThreshold_title",
-				"minimum" : 0.0,
-				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.025,
+				"minimum" : 0,
+				"maximum" : 100,
+				"default" : 5,
 				"append" : "edt_append_percent",
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 18
 			},
 			"blueSignalThreshold" :
 			{
 				"type" : "number",
 				"title" : "edt_conf_v4l2_blueSignalThreshold_title",
-				"minimum" : 0.0,
-				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
+				"minimum" : 0,
+				"maximum" : 100,
+				"default" : 5,
 				"append" : "edt_append_percent",
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 19
 			},
-			"signalDetectionVerticalOffsetMin" :
+			"sDVOffsetMin" :
 			{
 				"type" : "number",
-				"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMin_title",
+				"title" : "edt_conf_v4l2_sDVOffsetMin_title",
 				"minimum" : 0.0,
 				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
-				"append" : "edt_append_percent",
+				"default" : 0.25,
+				"step" : 0.01,
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 20
 			},
-			"signalDetectionVerticalOffsetMax" :
+			"sDVOffsetMax" :
 			{
 				"type" : "number",
-				"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMax_title",
+				"title" : "edt_conf_v4l2_sDVOffsetMax_title",
 				"minimum" : 0.0,
 				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
-				"append" : "edt_append_percent",
+				"default" : 0.75,
+				"step" : 0.01,
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 21
 			},
-			"signalDetectionHorizontalOffsetMin" :
+			"sDHOffsetMin" :
 			{
 				"type" : "number",
-				"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMin_title",
+				"title" : "edt_conf_v4l2_sDHOffsetMin_title",
 				"minimum" : 0.0,
 				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
-				"append" : "edt_append_percent",
+				"default" : 0.25,
+				"step" : 0.01,
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 22
 			},
-			"signalDetectionHorizontalOffsetMax" :
+			"sDHOffsetMax" :
 			{
 				"type" : "number",
-				"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMax_title",
+				"title" : "edt_conf_v4l2_sDHOffsetMax_title",
 				"minimum" : 0.0,
 				"maximum" : 1.0,
-				"default" : 0.1,
-				"step" : 0.005,
-				"append" : "edt_append_percent",
+				"default" : 0.75,
+				"step" : 0.01,
+				"options": {
+					"dependencies": {
+						"signalDetection": true
+					}
+				},
 				"propertyOrder" : 23
 			}
 		},
--- a/libsrc/hyperion/schemas/hyperion.schema-2.json
+++ b/libsrc/hyperion/schemas/hyperion.schema-2.json