Skip to content

Commit

Permalink
project renamed, legs extraction leftovers ignored
Browse files Browse the repository at this point in the history
  • Loading branch information
rayvburn committed Dec 30, 2020
1 parent 34109cb commit 0ecd72f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 51 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
src/actor_legs_extraction_node.cpp
src/LegsExtraction.*
launch/actor_legs_extraction.launch
config/legs.yaml
24 changes: 1 addition & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
cmake_minimum_required(VERSION 2.8.3)
project(actor_legs_extraction)
project(people_extraction)

find_package(catkin REQUIRED COMPONENTS
gazebo_ros
roscpp
obstacle_detector
people_msgs
)

catkin_package(
CATKIN_DEPENDS
gazebo_ros
roscpp
obstacle_detector
people_msgs
)

Expand All @@ -21,37 +19,17 @@ link_directories(${GAZEBO_LIBRARY_DIRS})
include_directories(${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")

add_library(${PROJECT_NAME}
src/LegsExtraction.hpp
src/LegsExtraction.cpp
)

add_library(people_extraction
src/PeopleExtraction.hpp
src/PeopleExtraction.cpp
)

add_dependencies(${PROJECT_NAME}
${catkin_EXPORTED_TARGETS}
)
target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES}
${GAZEBO_LIBRARIES}
${roscpp_LIBRARIES}
)

target_link_libraries(people_extraction
${catkin_LIBRARIES}
${GAZEBO_LIBRARIES}
${roscpp_LIBRARIES}
)

add_executable(actor_legs_extraction_node src/actor_legs_extraction_node.cpp)
target_link_libraries(actor_legs_extraction_node
${PROJECT_NAME}
${catkin_LIBRARIES}
)

add_executable(people_extraction_node src/people_extraction_node.cpp)
target_link_libraries(people_extraction_node
people_extraction
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# actor_legs_extraction
ROS package that searches for `actor` model (Gazebo plugin) and associates its pose with detected obstacles
# people_extraction
ROS package that searches for certain model names at `/gazebo/model_states` topic and republishes gathered data as [`people_msgs/People.msg`](http://docs.ros.org/en/api/people_msgs/html/msg/People.html) and [`people_msgs/PositionMeasurementArray.msg`](http://docs.ros.org/en/api/people_msgs/html/msg/PositionMeasurementArray.html) to ROS topics with a given names.
4 changes: 2 additions & 2 deletions launch/people_extraction.launch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<launch>
<rosparam file="$(find actor_legs_extraction)/config/people.yaml" command="load" ns="people_extraction" />
<node name="people_extraction" pkg="actor_legs_extraction" type="people_extraction_node" output="screen" ns="people_extraction"/>
<rosparam file="$(find people_extraction)/config/people.yaml" command="load" ns="people_extraction" />
<node name="people_extraction" pkg="people_extraction" type="people_extraction_node" output="screen" ns="people_extraction"/>
</launch>
5 changes: 2 additions & 3 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<package format="2">
<name>actor_legs_extraction</name>
<name>people_extraction</name>
<version>1.0.0</version>
<description>actor_legs_extraction package</description>
<description>people_extraction package</description>

<maintainer email="[email protected]">Jaroslaw Karwowski</maintainer>

Expand All @@ -10,7 +10,6 @@
<buildtool_depend>catkin</buildtool_depend>
<depend>roscpp</depend>
<depend>gazebo_ros</depend>
<depend>obstacle_detector</depend>
<depend>people_msgs</depend>

</package>
21 changes: 0 additions & 21 deletions src/actor_legs_extraction_node.cpp

This file was deleted.

0 comments on commit 0ecd72f

Please sign in to comment.