Skip to content

Commit

Permalink
issue#1 renaming directories and files
Browse files Browse the repository at this point in the history
  • Loading branch information
@jrgnicho
jrgnicho committed Mar 12, 2014
1 parent 75d2724 commit ccdfdfc
Show file tree
Hide file tree
Showing 44 changed files with 73 additions and 74 deletions.
2 changes: 1 addition & 1 deletion robot_blending/CMakeLists.txt → godel/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
project(robot_blending)
project(godel)
find_package(catkin REQUIRED)
catkin_metapackage()
15 changes: 7 additions & 8 deletions robot_blending/package.xml → godel/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0"?>
<package>
<name>robot_blending</name>
<name>godel</name>
<version>0.0.0</version>
<description>The robot_blending metapackage</description>
<description>The godel metapackage</description>

<maintainer email="ros-industrial@todo.todo">ros-industrial</maintainer>

<license>BSD</license>

<buildtool_depend>catkin</buildtool_depend>
<run_depend>rqt_robot_blending_plugin</run_depend>

<run_depend>godel_plugins</run_depend>
<run_depend>godel_surface_detection</run_depend>

<export>
<metapackage/>
</export>
<export>
<metapackage/>
</export>
</package>
32 changes: 16 additions & 16 deletions robot_blending_rqt_plugin/CMakeLists.txt → godel_plugins/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(robot_blending_rqt_plugin)
project(godel_plugins)

## Find catkin macros and libraries
find_package(catkin REQUIRED COMPONENTS
Expand All @@ -12,52 +12,52 @@ find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)

include(${QT_USE_FILE})

set(robot_blending_rqt_plugin_SRCS
set(godel_plugins_SRCS
src/rqt_plugins/robot_blending_plugin.cpp)

set(robot_blending_rqt_plugin_HDRS
include/robot_blending_rqt_plugin/rqt_plugins/robot_blending_plugin.h)
set(godel_plugins_HDRS
include/godel_plugins/rqt_plugins/robot_blending_plugin.h)

set(robot_blending_rqt_plugin_UIS
set(godel_plugins_UIS
src/rqt_plugins/robot_blending_plugin.ui)

set(robot_blending_rqt_plugin_INCLUDE_DIRECTORIES
set(godel_plugins_INCLUDE_DIRECTORIES
include
${CMAKE_CURRENT_BINARY_DIR})

catkin_package(
INCLUDE_DIRS ${robot_blending_rqt_plugin_INCLUDE_DIRECTORIES}
INCLUDE_DIRS ${godel_plugins_INCLUDE_DIRECTORIES}
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS roscpp rqt_gui rqt_gui_cpp
)

###########
## Build ##
###########
qt4_wrap_cpp(robot_blending_rqt_plugin_MOCS ${robot_blending_rqt_plugin_HDRS})
qt4_wrap_ui(robot_blending_rqt_plugin_UIS_H ${robot_blending_rqt_plugin_UIS})
qt4_wrap_cpp(godel_plugins_MOCS ${godel_plugins_HDRS})
qt4_wrap_ui(godel_plugins_UIS_H ${godel_plugins_UIS})

include_directories(${robot_blending_rqt_plugin_INCLUDE_DIRECTORIES} ${catkin_INCLUDE_DIRS})
include_directories(${godel_plugins_INCLUDE_DIRECTORIES} ${catkin_INCLUDE_DIRS})

## Declare a cpp library
add_library(${PROJECT_NAME}
${robot_blending_rqt_plugin_UIS_H}
${robot_blending_rqt_plugin_MOCS}
${robot_blending_rqt_plugin_SRCS})
${godel_plugins_UIS_H}
${godel_plugins_MOCS}
${godel_plugins_SRCS})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})

find_package(class_loader)
class_loader_hide_library_symbols(${PROJECT_NAME})

## Declare a cpp executable
# add_executable(robot_blending_rqt_plugin_node src/robot_blending_rqt_plugin_node.cpp)
# add_executable(godel_plugins_node src/godel_plugins_node.cpp)

## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
# add_dependencies(robot_blending_rqt_plugin_node robot_blending_rqt_plugin_generate_messages_cpp)
# add_dependencies(godel_plugins_node godel_plugins_generate_messages_cpp)

## Specify libraries to link a library or executable target against
# target_link_libraries(robot_blending_rqt_plugin_node
# target_link_libraries(godel_plugins_node
# ${catkin_LIBRARIES}
# )

Expand Down
2 changes: 1 addition & 1 deletion ...lugin/rqt_plugins/robot_blending_plugin.h → ...ugins/rqt_plugins/robot_blending_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ui_robot_blending_plugin.h>
#include <QWidget>

namespace robot_blending_rqt_plugin{ namespace rqt_plugins{
namespace godel_plugins{ namespace rqt_plugins{

class RobotBlendingPlugin : public rqt_gui_cpp::Plugin
{
Expand Down
4 changes: 2 additions & 2 deletions robot_blending_rqt_plugin/package.xml → godel_plugins/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package>
<name>robot_blending_rqt_plugin</name>
<name>godel_plugins</name>
<version>0.0.0</version>
<description>The robot_blending_rqt_plugin package</description>
<description>The godel_plugins package</description>

<maintainer email="ros-industrial@todo.todo">ros-industrial</maintainer>
<license>TODO</license>
Expand Down
4 changes: 2 additions & 2 deletions robot_blending_rqt_plugin/plugin.xml → godel_plugins/plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<library path="lib/librobot_blending_rqt_plugin">
<class name="robot_blending_rqt_plugin/RobotBlendingPlugin" type="robot_blending_rqt_plugin::rqt_plugins::RobotBlendingPlugin" base_class_type="rqt_gui_cpp::Plugin">
<library path="lib/libgodel_plugins">
<class name="godel_plugins/RobotBlendingPlugin" type="godel_plugins::rqt_plugins::RobotBlendingPlugin" base_class_type="rqt_gui_cpp::Plugin">
<description>
A GUI plugin to create and run robot paths for blending surfaces.
</description>
Expand Down
0 ...rqt_plugin/rqt/robot_blending.perspective → godel_plugins/rqt/robot_blending.perspective
View file
File renamed without changes.
0 ...nding_rqt_plugin/rviz/robot_blending.rviz → godel_plugins/rviz/robot_blending.rviz
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...src/rqt_plugins/robot_blending_plugin.cpp → ...src/rqt_plugins/robot_blending_plugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* Author: ros-industrial
*/

#include <robot_blending_rqt_plugin/rqt_plugins/robot_blending_plugin.h>
#include <godel_plugins/rqt_plugins/robot_blending_plugin.h>
#include <pluginlib/class_list_macros.h>

namespace robot_blending_rqt_plugin{ namespace rqt_plugins{
namespace godel_plugins{ namespace rqt_plugins{

const std::string RobotBlendingPlugin::QOBJECT_NAME = "RobotBlending";

Expand Down Expand Up @@ -48,5 +48,5 @@ void RobotBlendingPlugin::restoreSettings(const qt_gui_cpp::Settings& plugin_set

}}

PLUGINLIB_EXPORT_CLASS(robot_blending_rqt_plugin::rqt_plugins::RobotBlendingPlugin, rqt_gui_cpp::Plugin)
PLUGINLIB_EXPORT_CLASS(godel_plugins::rqt_plugins::RobotBlendingPlugin, rqt_gui_cpp::Plugin)

0 .../src/rqt_plugins/robot_blending_plugin.ui → .../src/rqt_plugins/robot_blending_plugin.ui
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions surface_detection/CMakeLists.txt → godel_surface_detection/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(surface_detection)
project(godel_surface_detection)

## Find catkin macros and libraries
find_package(catkin REQUIRED COMPONENTS
Expand All @@ -14,7 +14,7 @@ find_package(Boost REQUIRED COMPONENTS system)

ADD_DEFINITIONS("-std=c++0x")

set(surface_detection_INCLUDE_DIRECTORIES
set(godel_surface_detection_INCLUDE_DIRECTORIES
include
${catkin_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS})
Expand Down Expand Up @@ -97,7 +97,7 @@ catkin_package(
###########

## Specify additional locations of header files
include_directories(${surface_detection_INCLUDE_DIRECTORIES})
include_directories(${godel_surface_detection_INCLUDE_DIRECTORIES})
#link_directories(${PCL_LIBRARY_DIRS})
#add_definitions(${PCL_DEFINITIONS})

Expand Down
0 ...e_detection/config/surface_detection.yaml → ...e_detection/config/surface_detection.yaml
View file
File renamed without changes.
0 surface_detection/data/ism_test_cat.pcd → ...l_surface_detection/data/ism_test_cat.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_test_horse.pcd → ...surface_detection/data/ism_test_horse.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_test_lioness.pcd → ...rface_detection/data/ism_test_lioness.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_test_michael.pcd → ...rface_detection/data/ism_test_michael.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_test_wolf.pcd → ..._surface_detection/data/ism_test_wolf.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_train_cat.pcd → ..._surface_detection/data/ism_train_cat.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_train_horse.pcd → ...urface_detection/data/ism_train_horse.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_train_lioness.pcd → ...face_detection/data/ism_train_lioness.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_train_michael.pcd → ...face_detection/data/ism_train_michael.pcd
View file
File renamed without changes.
0 surface_detection/data/ism_train_wolf.pcd → ...surface_detection/data/ism_train_wolf.pcd
View file
File renamed without changes.
0 surface_detection/data/lamppost.pcd → godel_surface_detection/data/lamppost.pcd
View file
File renamed without changes.
0 surface_detection/data/milk.pcd → godel_surface_detection/data/milk.pcd
View file
File renamed without changes.
0 ...on/data/milk_cartoon_all_small_clorox.pcd → ...on/data/milk_cartoon_all_small_clorox.pcd
View file
File renamed without changes.
0 ...on/data/min_cut_segmentation_tutorial.pcd → ...on/data/min_cut_segmentation_tutorial.pcd
View file
File renamed without changes.
0 ...tion/data/region_growing_rgb_tutorial.pcd → ...tion/data/region_growing_rgb_tutorial.pcd
View file
File renamed without changes.
0 ...etection/data/region_growing_tutorial.pcd → ...etection/data/region_growing_tutorial.pcd
View file
File renamed without changes.
0 surface_detection/data/room_scan1.pcd → godel_surface_detection/data/room_scan1.pcd
View file
File renamed without changes.
0 surface_detection/data/room_scan2.pcd → godel_surface_detection/data/room_scan2.pcd
View file
File renamed without changes.
0 ...ace_detection/data/table_scene_lms400.pcd → ...ace_detection/data/table_scene_lms400.pcd
View file
File renamed without changes.
0 .../data/table_scene_mug_stereo_textured.pcd → .../data/table_scene_mug_stereo_textured.pcd
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...e_detection/detection/surface_detection.h → ...e_detection/detection/surface_detection.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* surface_detection.h
* godel_surface_detection.h
*
* Created on: Feb 11, 2014
* Author: ros-industrial
Expand All @@ -18,7 +18,7 @@
#include <pcl/surface/gp3.h>
#include <visualization_msgs/MarkerArray.h>

namespace surface_detection { namespace detection{
namespace godel_surface_detection { namespace detection{

typedef pcl::PointCloud<pcl::PointXYZ> Cloud;
typedef pcl::PointCloud<pcl::PointXYZRGB> CloudRGB;
Expand Down Expand Up @@ -61,7 +61,7 @@ namespace config

namespace params
{
static const std::string PARAMETER_NS = "surface_detection";
static const std::string PARAMETER_NS = "godel_surface_detection";

static const std::string ACQUISITION_TIME = "acquisition_time";
static const std::string FRAME_ID = "frame_id";
Expand Down Expand Up @@ -178,6 +178,6 @@ class SurfaceDetection {

};

}} /* namespace surface_detection */
}} /* namespace godel_surface_detection */

#endif /* SURFACE_DETECTION_H_ */
4 changes: 2 additions & 2 deletions .../interactive/interactive_surface_server.h → .../interactive/interactive_surface_server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace interactive_markers
typedef boost::shared_ptr<interactive_markers::InteractiveMarkerServer> InteractiveMarkerServerPtr;
}

namespace surface_detection {
namespace godel_surface_detection {
namespace interactive {

namespace params{
Expand Down Expand Up @@ -103,6 +103,6 @@ class InteractiveSurfaceServer {
};

} /* namespace interactive */
} /* namespace surface_detection */
} /* namespace godel_surface_detection */

#endif /* INTERACTIVE_SURFACE_SERVER_H_ */
7 changes: 7 additions & 0 deletions godel_surface_detection/launch/publish_cloud_file.launch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<launch>
<node name="point_cloud_publisher_node" pkg="godel_surface_detection" type="point_cloud_publisher_node"
args="-f data/milk_cartoon_all_small_clorox.pcd -r 0.5 -i world_frame" output="screen"/>
<node name="rviz_godel_surface_detection" pkg="rviz" type="rviz"
args="-d $(find godel_surface_detection)/rviz/godel_surface_detection.rviz" output="screen"/>
</launch>
8 changes: 8 additions & 0 deletions godel_surface_detection/launch/surface_detection.launch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<launch>
<node name="godel_surface_detection_node" pkg="godel_surface_detection" type="godel_surface_detection_node"
args="-a 4 -f world_frame" output="screen">
<rosparam command="load" file="$(find godel_surface_detection)/config/godel_surface_detection.yaml"/>
</node>

</launch>
4 changes: 2 additions & 2 deletions surface_detection/package.xml → godel_surface_detection/package.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package>
<name>surface_detection</name>
<name>godel_surface_detection</name>
<version>0.0.0</version>
<description>The surface_detection package</description>
<description>The godel_surface_detection package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
Expand Down
0 ...ace_detection/rviz/surface_detection.rviz → ...ace_detection/rviz/surface_detection.rviz
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ction/src/detection/surface_detection.cpp → ...ction/src/detection/surface_detection.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* surface_detection.cpp
* godel_surface_detection.cpp
*
* Created on: Feb 11, 2014
* Author: ros-industrial
*/

#include <surface_detection/detection/surface_detection.h>
#include <godel_surface_detection/detection/surface_detection.h>
#include <pcl_ros/transforms.h>
#include <tf/transform_listener.h>
#include <pcl/filters/statistical_outlier_removal.h>
Expand All @@ -16,7 +16,7 @@
#include <pcl/filters/voxel_grid.h>
#include <tf/transform_datatypes.h>

namespace surface_detection { namespace detection{
namespace godel_surface_detection { namespace detection{

SurfaceDetection::SurfaceDetection():
acquired_clouds_counter_(0),
Expand Down Expand Up @@ -497,4 +497,4 @@ bool SurfaceDetection::apply_voxel_downsampling(Cloud& cloud)
}


}} /* namespace surface_detection */
}} /* namespace godel_surface_detection */
6 changes: 3 additions & 3 deletions ...nteractive/interactive_surface_server.cpp → ...nteractive/interactive_surface_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* Author: ros-industrial
*/

#include <surface_detection/interactive/interactive_surface_server.h>
#include <godel_surface_detection/interactive/interactive_surface_server.h>
#include <tf/transform_datatypes.h>
#include <tf/tf.h>
#include <sstream>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/common/common.h>

namespace surface_detection {
namespace godel_surface_detection {
namespace interactive {

InteractiveSurfaceServer::InteractiveSurfaceServer() :
Expand Down Expand Up @@ -362,4 +362,4 @@ void InteractiveSurfaceServer::create_polygon_marker(


} /* namespace interactive */
} /* namespace surface_detection */
} /* namespace godel_surface_detection */
2 changes: 1 addition & 1 deletion .../src/nodes/point_cloud_publisher_node.cpp → .../src/nodes/point_cloud_publisher_node.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int main(int argc,char** argv)
// parsing arguments
std::string fpath;
pcl::console::parse(argc,argv,"-f",fpath);
file_path = path(ros::package::getPath("surface_detection") +
file_path = path(ros::package::getPath("godel_surface_detection") +
"/"+ fpath);

if(exists(file_path))
Expand Down
14 changes: 7 additions & 7 deletions ...tion/src/nodes/surface_detection_node.cpp → ...tion/src/nodes/surface_detection_node.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
/*
* surface_detection_node.cpp
* godel_surface_detection_node.cpp
*
* Created on: Feb 12, 2014
* Author: ros-industrial
*/
#include <ros/ros.h>
#include <surface_detection/detection/surface_detection.h>
#include <surface_detection/interactive/interactive_surface_server.h>
#include <godel_surface_detection/detection/surface_detection.h>
#include <godel_surface_detection/interactive/interactive_surface_server.h>
#include <pcl/console/parse.h>

const float DEFAULT_ACQUISITION_TIME = 2.0f; //second
const std::string DEFAULT_FRAME_ID = "world_frame";

const std::string SEGMENTS_CLOUD_TOPIC = "segments_cloud";
const std::string MARKER_ARRAY_TOPIC = "segment_markers";
const std::string NODE_NAME = "surface_detection_node";
const std::string NODE_NAME = "godel_surface_detection_node";
const std::string HELP_TEXT="\n" + NODE_NAME + " help:\n" +
"-h help menu\n" +
"-a <acquisition time (sec)>\n" +
"-i <frame id>\n";

int main(int argc,char** argv)
{
ros::init(argc,argv,"surface_detection_node");
ros::init(argc,argv,"godel_surface_detection_node");
ros::NodeHandle nh;

// parsing arguments
Expand Down Expand Up @@ -55,10 +55,10 @@ int main(int argc,char** argv)
MARKER_ARRAY_TOPIC,1);

// surface detection instance
surface_detection::detection::SurfaceDetection sf;
godel_surface_detection::detection::SurfaceDetection sf;

// marker server instance
surface_detection::interactive::InteractiveSurfaceServer servr;
godel_surface_detection::interactive::InteractiveSurfaceServer servr;

// load paramters
if(!sf.init() || !servr.init())
Expand Down
7 changes: 0 additions & 7 deletions surface_detection/launch/publish_cloud_file.launch
View file

This file was deleted.

8 changes: 0 additions & 8 deletions surface_detection/launch/surface_detection.launch
View file

This file was deleted.

0 comments on commit ccdfdfc

Please sign in to comment.