Skip to content

Commit 72dab2a

Browse files
committed
YarpOpenraveGrabber implement getCameraDescription
- roboticslab-uc3m/yarp-devices#244
1 parent c68d11d commit 72dab2a

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

libraries/YarpPlugins/YarpOpenraveGrabber/DeviceDriverImpl.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ bool YarpOpenraveGrabber::open(yarp::os::Searchable& config)
4545

4646
sensorBasePtr = vectorOfSensorPtr.at(sensorIndex)->GetSensor();
4747

48-
std::string tipo = sensorBasePtr->GetName();
48+
std::string sensorName = sensorBasePtr->GetName();
4949

50-
printf("Sensor %d name: %s\n",sensorIndex,tipo.c_str());
50+
printf("Sensor %d name: %s\n",sensorIndex,sensorName.c_str());
51+
cameraDescriptor.deviceDescription = sensorName;
52+
cameraDescriptor.busType = BUS_UNKNOWN;
5153

5254
// printf("Sensor %d description: %s\n",sensorIter,psensorbase->GetDescription().c_str());
5355

libraries/YarpPlugins/YarpOpenraveGrabber/IFrameGrabberControlsImpl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ namespace roboticslab
1111

1212
bool YarpOpenraveGrabber::getCameraDescription(CameraDescriptor *camera)
1313
{
14-
return false;
14+
*camera = cameraDescriptor;
15+
return true;
1516
}
1617

1718
// ----------------------------------------------------------------------------

libraries/YarpPlugins/YarpOpenraveGrabber/YarpOpenraveGrabber.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,17 @@ class YarpOpenraveGrabber : YarpOpenraveBase,
8383

8484
private:
8585

86-
// General Grabber parameters //
86+
// General Grabber parameters
8787
int _height, _width;
8888

89-
//OpenRAVE//
89+
// OpenRAVE
9090
OpenRAVE::SensorBasePtr sensorBasePtr;
9191
boost::shared_ptr<OpenRAVE::SensorBase::CameraSensorData> sensorDataPtr;
9292
boost::shared_ptr<OpenRAVE::SensorBase::CameraGeomData> modGeomDataPtr;
9393

94+
// YARP
95+
CameraDescriptor cameraDescriptor;
96+
9497
static const int NOT_SET;
9598
};
9699

0 commit comments

Comments
 (0)