diff --git a/scenarios/LaserScannerTest/LaserScannerTest.scx b/scenarios/LaserScannerTest/LaserScannerTest.scx index 13d1b66eb669dd3db807b70d745e957602fb98fa..dde93318980244be817875d4c6053720d0455418 100644 --- a/scenarios/LaserScannerTest/LaserScannerTest.scx +++ b/scenarios/LaserScannerTest/LaserScannerTest.scx @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<scenario name="LaserScannerTest" lastChange="2017-03-07.16:53:44" creation="2017-03-07.16:12:47" globalConfigName="./config/global.cfg" package="RobotAPI"> +<scenario name="LaserScannerTest" lastChange="2017-03-09.17:02:34" creation="2017-03-07.16:12:47" globalConfigName="./config/global.cfg" package="RobotAPI"> <application name="HokuyoLaserUnitApp" instance="" package="RobotAPI"/> <application name="LaserScannerUnitObserverApp" instance="" package="RobotAPI"/> </scenario> diff --git a/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg b/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg index 402fa7bd286be393aa362a4979703030ef1d0321..6f8512d97047c86bb3fe4cadba24fad5fb6f5255 100644 --- a/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg +++ b/scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg @@ -74,12 +74,20 @@ # ArmarX.EnableProfiling = 0 +# ArmarX.HokuyoLaserUnit.AngleOffset: Offset is applied the raw angles before reporting them +# Attributes: +# - Default: -2.3561945 +# - Case sensitivity: no +# - Required: no +# ArmarX.HokuyoLaserUnit.AngleOffset = -2.3561945 + + # ArmarX.HokuyoLaserUnit.Devices: List of devices in form of 'IP1,port1;IP2,port2;...' # Attributes: # - Default: "" # - Case sensitivity: no # - Required: no -ArmarX.HokuyoLaserUnit.Devices = "Dummy1,100" +ArmarX.HokuyoLaserUnit.Devices = "192.168.0.10,10940" # ArmarX.HokuyoLaserUnit.EnableProfiling: enable profiler which is used for logging performance events diff --git a/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg b/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg index f38a4e69d82a34ea928134ce41c2c726883d50ed..5d4e2e744baf2c25a947db4ca667f51c39fcd31d 100644 --- a/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg +++ b/scenarios/LaserScannerTest/config/LaserScannerUnitObserverApp.cfg @@ -178,11 +178,6 @@ # ArmarX.Verbosity = Info -# Ice.Config: Custom Property -# Attributes: -# - Default: ::NOT_DEFINED:: -# - Case sensitivity: no -# - Required: no -# Ice.Config = ::NOT_DEFINED:: + diff --git a/source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp b/source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp index 2327635b3b5742939b3b99e6eaa7b3a8bc6dbd5d..c190417b22eeabd2a4f9acd43d755cde65231efb 100644 --- a/source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp +++ b/source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp @@ -143,7 +143,7 @@ void LaserScannerPluginWidgetController::onNewSensorValuesReported() LaserScan& scan = scans[deviceName]; for (LaserScanStep & step : scan) { - line(step.angle, step.distance / 30000.0f); + line(step.angle, step.distance / 10000.0f); } view->fitInView(scene.itemsBoundingRect(), Qt::KeepAspectRatio);