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

update

This commit is contained in:
brindosch 2017-04-22 17:27:27 +02:00
parent aa860e6100
commit 9bc27e1d8a
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/hyperion.config.json.commented
View File

@ -122,10 +122,10 @@
/// * redSignalThreshold : Signal threshold for the red channel between 0 and 100 [default=5] /// * redSignalThreshold : Signal threshold for the red channel between 0 and 100 [default=5]
/// * greenSignalThreshold : Signal threshold for the green channel between 0 and 100 [default=5] /// * greenSignalThreshold : Signal threshold for the green channel between 0 and 100 [default=5]
/// * blueSignalThreshold : Signal threshold for the blue channel between 0 and 100 [default=5] /// * blueSignalThreshold : Signal threshold for the blue channel between 0 and 100 [default=5]
/// * signalDetectionVerticalOffsetMin : area for signal detection - horizontal minimum offset value. Values between 0.0 and 1.0 /// * sDHOffsetMin : area for signal detection - horizontal minimum offset value. Values between 0.0 and 1.0
/// * signalDetectionHorizontalOffsetMin : area for signal detection - vertical minimum offset value. Values between 0.0 and 1.0 /// * sDVOffsetMin : area for signal detection - vertical minimum offset value. Values between 0.0 and 1.0
/// * signalDetectionVerticalOffsetMax : area for signal detection - horizontal maximum offset value. Values between 0.0 and 1.0 /// * sDHOffsetMax : area for signal detection - horizontal maximum offset value. Values between 0.0 and 1.0
/// * signalDetectionHorizontalOffsetMax : area for signal detection - vertical maximum offset value. Values between 0.0 and 1.0 /// * sDVOffsetMax : area for signal detection - vertical maximum offset value. Values between 0.0 and 1.0
"grabberV4L2" : "grabberV4L2" :
[ [
{ {
@ -148,10 +148,10 @@
"greenSignalThreshold" : 5, "greenSignalThreshold" : 5,
"blueSignalThreshold" : 5, "blueSignalThreshold" : 5,
"signalDetection" : false, "signalDetection" : false,
"signalDetectionVerticalOffsetMin" : 0.25, "sDVOffsetMin" : 0.25,
"signalDetectionHorizontalOffsetMin" : 0.25, "sDHOffsetMin" : 0.25,
"signalDetectionVerticalOffsetMax" : 0.75, "sDVOffsetMax" : 0.75,
"signalDetectionHorizontalOffsetMax" : 0.75 "sDHOffsetMax" : 0.75
} }
], ],

8
config/hyperion.config.json.default
View File

@ -79,10 +79,10 @@
"greenSignalThreshold" : 5, "greenSignalThreshold" : 5,
"blueSignalThreshold" : 5, "blueSignalThreshold" : 5,
"signalDetection" : false, "signalDetection" : false,
"signalDetectionVerticalOffsetMin" : 0.25, "sDVOffsetMin" : 0.25,
"signalDetectionHorizontalOffsetMin" : 0.25, "sDHOffsetMin" : 0.25,
"signalDetectionVerticalOffsetMax" : 0.75, "sDVOffsetMax" : 0.75,
"signalDetectionHorizontalOffsetMax" : 0.75 "sDHOffsetMax" : 0.75
} }
], ],

32
libsrc/hyperion/schemas/hyperion.schema-2.json
View File

@ -611,14 +611,14 @@
}, },
"propertyOrder" : 19 "propertyOrder" : 19
}, },
"signalDetectionVerticalOffsetMin" : "sDVOffsetMin" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMin_title", "title" : "edt_conf_v4l2_sDVOffsetMin_title",
"minimum" : 0.0, "minimum" : 0.0,
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.25,
"step" : 0.005, "step" : 0.01,
"options": { "options": {
"dependencies": { "dependencies": {
"signalDetection": true "signalDetection": true
@ -626,14 +626,14 @@
}, },
"propertyOrder" : 20 "propertyOrder" : 20
}, },
"signalDetectionVerticalOffsetMax" : "sDVOffsetMax" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_signalDetectionVerticalOffsetMax_title", "title" : "edt_conf_v4l2_sDVOffsetMax_title",
"minimum" : 0.0, "minimum" : 0.0,
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.75,
"step" : 0.005, "step" : 0.01,
"options": { "options": {
"dependencies": { "dependencies": {
"signalDetection": true "signalDetection": true
@ -641,14 +641,14 @@
}, },
"propertyOrder" : 21 "propertyOrder" : 21
}, },
"signalDetectionHorizontalOffsetMin" : "sDHOffsetMin" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMin_title", "title" : "edt_conf_v4l2_sDHOffsetMin_title",
"minimum" : 0.0, "minimum" : 0.0,
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.25,
"step" : 0.005, "step" : 0.01,
"options": { "options": {
"dependencies": { "dependencies": {
"signalDetection": true "signalDetection": true
@ -656,14 +656,14 @@
}, },
"propertyOrder" : 22 "propertyOrder" : 22
}, },
"signalDetectionHorizontalOffsetMax" : "sDHOffsetMax" :
{ {
"type" : "number", "type" : "number",
"title" : "edt_conf_v4l2_signalDetectionHorizontalOffsetMax_title", "title" : "edt_conf_v4l2_sDHOffsetMax_title",
"minimum" : 0.0, "minimum" : 0.0,
"maximum" : 1.0, "maximum" : 1.0,
"default" : 0.1, "default" : 0.75,
"step" : 0.005, "step" : 0.01,
"options": { "options": {
"dependencies": { "dependencies": {
"signalDetection": true "signalDetection": true

8
src/hyperiond/hyperiond.cpp
View File

@ -606,10 +606,10 @@ void HyperionDaemon::createGrabberV4L2()
grabberConfig["cropBottom"].toInt(0)); grabberConfig["cropBottom"].toInt(0));
grabber->setSignalDetectionEnable(grabberConfig["signalDetection"].toBool(true)); grabber->setSignalDetectionEnable(grabberConfig["signalDetection"].toBool(true));
grabber->setSignalDetectionOffset( grabber->setSignalDetectionOffset(
grabberConfig["signalDetectionHorizontalOffsetMin"].toDouble(0.25), grabberConfig["sDHOffsetMin"].toDouble(0.25),
grabberConfig["signalDetectionVerticalOffsetMin"].toDouble(0.25), grabberConfig["sDVOffsetMin"].toDouble(0.25),
grabberConfig["signalDetectionHorizontalOffsetMax"].toDouble(0.75), grabberConfig["sDHOffsetMax"].toDouble(0.75),
grabberConfig["signalDetectionVerticalOffsetMax"].toDouble(0.75)); grabberConfig["sDVOffsetMax"].toDouble(0.75));
Debug(_log, "V4L2 grabber created"); Debug(_log, "V4L2 grabber created");
QObject::connect(grabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), _protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int))); QObject::connect(grabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), _protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)));