Skip to content
Snippets Groups Projects
Commit ac493398 authored by Fabian Paus's avatar Fabian Paus
Browse files

Updated ĺaser scanner GUI to support simulation

parent dc98bba6
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<scenario name="LaserScannerTest" lastChange="2017-03-09.17:02:34" creation="2017-03-07.16:12:47" globalConfigName="./config/global.cfg" package="RobotAPI"> <scenario name="LaserScannerTest" creation="2017-03-07.16:12:47" lastChange="2017-03-07.16:12:47" globalConfigName="./config/global.cfg" package="RobotAPI">
<application name="HokuyoLaserUnitApp" instance="" package="RobotAPI"/> <application name="HokuyoLaserUnitApp" instance="" package="RobotAPI" enabled="true"/>
<application name="LaserScannerUnitObserverApp" instance="" package="RobotAPI"/> <application name="LaserScannerUnitObserverApp" instance="" package="RobotAPI" enabled="true"/>
</scenario> </scenario>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
# - Default: "" # - Default: ""
# - Case sensitivity: no # - Case sensitivity: no
# - Required: no # - Required: no
ArmarX.HokuyoLaserUnit.Devices = "192.168.0.10,10940" ArmarX.HokuyoLaserUnit.Devices = "192.168.0.11,10940"
# ArmarX.HokuyoLaserUnit.EnableProfiling: enable profiler which is used for logging performance events # ArmarX.HokuyoLaserUnit.EnableProfiling: enable profiler which is used for logging performance events
......
...@@ -34,6 +34,7 @@ void HokuyoLaserUnit::onInitComponent() ...@@ -34,6 +34,7 @@ void HokuyoLaserUnit::onInitComponent()
{ {
topicName = getProperty<std::string>("LaserScannerTopicName").getValue(); topicName = getProperty<std::string>("LaserScannerTopicName").getValue();
offeringTopic(topicName); offeringTopic(topicName);
ARMARX_INFO << "Going to report on topic " << topicName;
updatePeriod = getProperty<int>("UpdatePeriod").getValue(); updatePeriod = getProperty<int>("UpdatePeriod").getValue();
angleOffset = getProperty<float>("AngleOffset").getValue(); angleOffset = getProperty<float>("AngleOffset").getValue();
...@@ -87,6 +88,7 @@ void HokuyoLaserUnit::onConnectComponent() ...@@ -87,6 +88,7 @@ void HokuyoLaserUnit::onConnectComponent()
{ {
continue; continue;
} }
ARMARX_INFO << "Connecting to " << device.ip << ":" << device.port;
int ret = urg_open(&device.urg, URG_ETHERNET, device.ip.c_str(), device.port); int ret = urg_open(&device.urg, URG_ETHERNET, device.ip.c_str(), device.port);
device.connected = (ret == 0); device.connected = (ret == 0);
if (!device.connected) if (!device.connected)
......
...@@ -74,7 +74,7 @@ QPointer<QDialog> LaserScannerPluginWidgetController::getConfigDialog(QWidget* p ...@@ -74,7 +74,7 @@ QPointer<QDialog> LaserScannerPluginWidgetController::getConfigDialog(QWidget* p
if (!dialog) if (!dialog)
{ {
dialog = new SimpleConfigDialog(parent); dialog = new SimpleConfigDialog(parent);
dialog->addProxyFinder<LaserScannerUnitInterfacePrx>({"LaserScannerUnit", "", "*LaserUnit"}); dialog->addProxyFinder<LaserScannerUnitInterfacePrx>({"LaserScannerUnit", "", "*"});
} }
return qobject_cast<SimpleConfigDialog*>(dialog); return qobject_cast<SimpleConfigDialog*>(dialog);
} }
...@@ -97,7 +97,6 @@ void LaserScannerPluginWidgetController::reportSensorValues(const std::string& d ...@@ -97,7 +97,6 @@ void LaserScannerPluginWidgetController::reportSensorValues(const std::string& d
scan = newScan; scan = newScan;
} }
ARMARX_INFO << deactivateSpam(1) << "Got new laser scan values";
emit newSensorValuesReported(); emit newSensorValuesReported();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment