From 9bc27e1d8a3cb3623f23ac46ddb174b448a2133e Mon Sep 17 00:00:00 2001 From: brindosch Date: Sat, 22 Apr 2017 17:27:27 +0200 Subject: [PATCH] update --- config/hyperion.config.json.commented | 16 +++++----- config/hyperion.config.json.default | 8 ++--- .../hyperion/schemas/hyperion.schema-2.json | 32 +++++++++---------- src/hyperiond/hyperiond.cpp | 8 ++--- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/config/hyperion.config.json.commented b/config/hyperion.config.json.commented index 24a86dbb..d3577238 100644 --- a/config/hyperion.config.json.commented +++ b/config/hyperion.config.json.commented @@ -122,10 +122,10 @@ /// * 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] /// * 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 - /// * signalDetectionHorizontalOffsetMin : 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 - /// * signalDetectionHorizontalOffsetMax : area for signal detection - vertical maximum 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 + /// * sDVOffsetMin : area for signal detection - vertical minimum 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 + /// * sDVOffsetMax : area for signal detection - vertical maximum offset value. Values between 0.0 and 1.0 "grabberV4L2" : [ { @@ -148,10 +148,10 @@ "greenSignalThreshold" : 5, "blueSignalThreshold" : 5, "signalDetection" : false, - "signalDetectionVerticalOffsetMin" : 0.25, - "signalDetectionHorizontalOffsetMin" : 0.25, - "signalDetectionVerticalOffsetMax" : 0.75, - "signalDetectionHorizontalOffsetMax" : 0.75 + "sDVOffsetMin" : 0.25, + "sDHOffsetMin" : 0.25, + "sDVOffsetMax" : 0.75, + "sDHOffsetMax" : 0.75 } ], diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default index 2b534742..a79e2357 100644 --- a/config/hyperion.config.json.default +++ b/config/hyperion.config.json.default @@ -79,10 +79,10 @@ "greenSignalThreshold" : 5, "blueSignalThreshold" : 5, "signalDetection" : false, - "signalDetectionVerticalOffsetMin" : 0.25, - "signalDetectionHorizontalOffsetMin" : 0.25, - "signalDetectionVerticalOffsetMax" : 0.75, - "signalDetectionHorizontalOffsetMax" : 0.75 + "sDVOffsetMin" : 0.25, + "sDHOffsetMin" : 0.25, + "sDVOffsetMax" : 0.75, + "sDHOffsetMax" : 0.75 } ], diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json index 90edaa3d..86b5f6f0 100644 --- a/libsrc/hyperion/schemas/hyperion.schema-2.json +++ b/libsrc/hyperion/schemas/hyperion.schema-2.json @@ -611,14 +611,14 @@ }, "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, + "default" : 0.25, + "step" : 0.01, "options": { "dependencies": { "signalDetection": true @@ -626,14 +626,14 @@ }, "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, + "default" : 0.75, + "step" : 0.01, "options": { "dependencies": { "signalDetection": true @@ -641,14 +641,14 @@ }, "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, + "default" : 0.25, + "step" : 0.01, "options": { "dependencies": { "signalDetection": true @@ -656,14 +656,14 @@ }, "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, + "default" : 0.75, + "step" : 0.01, "options": { "dependencies": { "signalDetection": true diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index afca453d..98745d7d 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -606,10 +606,10 @@ void HyperionDaemon::createGrabberV4L2() grabberConfig["cropBottom"].toInt(0)); grabber->setSignalDetectionEnable(grabberConfig["signalDetection"].toBool(true)); grabber->setSignalDetectionOffset( - grabberConfig["signalDetectionHorizontalOffsetMin"].toDouble(0.25), - grabberConfig["signalDetectionVerticalOffsetMin"].toDouble(0.25), - grabberConfig["signalDetectionHorizontalOffsetMax"].toDouble(0.75), - grabberConfig["signalDetectionVerticalOffsetMax"].toDouble(0.75)); + grabberConfig["sDHOffsetMin"].toDouble(0.25), + grabberConfig["sDVOffsetMin"].toDouble(0.25), + grabberConfig["sDHOffsetMax"].toDouble(0.75), + grabberConfig["sDVOffsetMax"].toDouble(0.75)); Debug(_log, "V4L2 grabber created"); QObject::connect(grabber, SIGNAL(emitImage(int, const Image&, const int)), _protoServer, SLOT(sendImageToProtoSlaves(int, const Image&, const int)));