apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced obj_frame_prefix by object_prefix

Browse Source
This commit is contained in:
matlabbe 2016-06-13 11:21:36 -04:00
parent 881f70377f
commit 48e6ea0147
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ros/FindObjectROS.cpp
View File

@ -34,12 +34,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace find_object; using namespace find_object;
FindObjectROS::FindObjectROS(const std::string & objFramePrefix, QObject * parent) : FindObjectROS::FindObjectROS(QObject * parent) :
FindObject(true, parent), FindObject(true, parent),
objFramePrefix_("object") objFramePrefix_("object")
{ {
ros::NodeHandle pnh("~"); // public ros::NodeHandle pnh("~"); // public
pnh.param("object_prefix", objFramePrefix_, objFramePrefix_); pnh.param("object_prefix", objFramePrefix_, objFramePrefix_);
ROS_INFO("object_prefix = %s", objFramePrefix_.c_str());
ros::NodeHandle nh; // public ros::NodeHandle nh; // public

2
src/ros/FindObjectROS.h
View File

@ -44,7 +44,7 @@ class FindObjectROS : public find_object::FindObject
Q_OBJECT; Q_OBJECT;
public: public:
FindObjectROS(const std::string & objPrefix, QObject * parent = 0); FindObjectROS(QObject * parent = 0);
virtual ~FindObjectROS() {} virtual ~FindObjectROS() {}
public Q_SLOTS: public Q_SLOTS:

5
src/ros/find_object_2d_node.cpp
View File

@ -74,7 +74,6 @@ int main(int argc, char** argv)
std::string sessionPath; std::string sessionPath;
settingsPath = QDir::homePath().append("/.ros/find_object_2d.ini").toStdString(); settingsPath = QDir::homePath().append("/.ros/find_object_2d.ini").toStdString();
bool subscribeDepth = false; bool subscribeDepth = false;
std::string objFramePrefix = "object";
ros::NodeHandle nh("~"); ros::NodeHandle nh("~");
@ -83,14 +82,12 @@ int main(int argc, char** argv)
nh.param("session_path", sessionPath, sessionPath); nh.param("session_path", sessionPath, sessionPath);
nh.param("settings_path", settingsPath, settingsPath); nh.param("settings_path", settingsPath, settingsPath);
nh.param("subscribe_depth", subscribeDepth, subscribeDepth); nh.param("subscribe_depth", subscribeDepth, subscribeDepth);
nh.param("obj_frame_prefix", objFramePrefix, objFramePrefix);
ROS_INFO("gui=%d", (int)gui); ROS_INFO("gui=%d", (int)gui);
ROS_INFO("objects_path=%s", objectsPath.c_str()); ROS_INFO("objects_path=%s", objectsPath.c_str());
ROS_INFO("session_path=%s", sessionPath.c_str()); ROS_INFO("session_path=%s", sessionPath.c_str());
ROS_INFO("settings_path=%s", settingsPath.c_str()); ROS_INFO("settings_path=%s", settingsPath.c_str());
ROS_INFO("subscribe_depth = %s", subscribeDepth?"true":"false"); ROS_INFO("subscribe_depth = %s", subscribeDepth?"true":"false");
ROS_INFO("obj_frame_prefix = %s", objFramePrefix.c_str());
if(settingsPath.empty()) if(settingsPath.empty())
{ {
@ -114,7 +111,7 @@ int main(int argc, char** argv)
// Load settings, should be loaded before creating other objects // Load settings, should be loaded before creating other objects
Settings::init(settingsPath.c_str()); Settings::init(settingsPath.c_str());
FindObjectROS * findObjectROS = new FindObjectROS(objFramePrefix); FindObjectROS * findObjectROS = new FindObjectROS();
if(!sessionPath.empty()) if(!sessionPath.empty())
{ {
if(!objectsPath.empty()) if(!objectsPath.empty())