Commit 2d017007 authored by Niklas Yann Wettengel's avatar Niklas Yann Wettengel

added maintainers + fixed robbie_architecture-includes

parent 4def9922
cmake_minimum_required(VERSION 2.8.3)
project(or_libs)
find_package(catkin REQUIRED COMPONENTS message_generation roscpp_serialization roscpp cv_bridge)
find_package(catkin REQUIRED COMPONENTS
message_generation
roscpp_serialization
roscpp
cv_bridge
robbie_architecture
cmake_modules)
set(CMAKE_BUILD_TYPE Release)
......@@ -38,7 +44,6 @@ endif()
include_directories(
${catkin_INCLUDE_DIRS}
src
$ENV{HOMER_DIR}/catkin_ws/src/Libraries/robbie_architecture/src
)
add_subdirectory(src/ConnectedComponentAnalyzer)
......
......@@ -5,29 +5,34 @@
</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
<maintainer email="raphael@uni-koblenz.de">Raphael Memmesheimer</maintainer>
<maintainer email="heuer@uni-koblenz.de">Gregor Heuer</maintainer>
<maintainer email="niyawe@uni-koblenz.de">Niklas Yann Wettengel</maintainer>
<version>0.0.2</version>
<author>Viktor Seib</author>
<license>BSD</license>
<url></url>
<build_depend>message_generation</build_depend>
<build_depend>genmsg</build_depend>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>genmsg</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>robbie_architecture</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>roscpp_serialization</build_depend>
<build_depend>roslang</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>tf</build_depend>
<run_depend>cv_bridge</run_depend>
<build_depend>cv_bridge</build_depend>
<run_depend>message_runtime</run_depend>
<run_depend>robbie_architecture</run_depend>
<run_depend>roscpp_serialization</run_depend>
<run_depend>sensor_msgs</run_depend>
<build_depend>sensor_msgs</build_depend>
<run_depend>std_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>roscpp_serialization</run_depend>
<build_depend>roscpp_serialization</build_depend>
<!--<run_depend>robbie_architecture</run_depend>-->
<!--<build_depend>robbie_architecture</build_depend>-->
</package>
......
......@@ -9,14 +9,14 @@
*******************************************************************************/
#include <cstring>
#include "ros/ros.h"
#include <ros/ros.h>
#include "ConnectedComponentAnalyzer.h"
#include "ConnectedComponent.h"
#include "ipcccf.h"
#ifdef CLOCK_OUTPUT
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#endif
#define THIS ConnectedComponentAnalyzer
......
......@@ -9,7 +9,7 @@
*******************************************************************************/
#include "DefaultExtractor.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include "ParallelSurfExtractor.h"
// #include "OrigSurfExtractor.h"
......
......@@ -14,7 +14,7 @@
#include <opencv2/opencv.hpp>
#include <opencv2/highgui/highgui.hpp>
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Box2D.h>
/**
......
......@@ -13,8 +13,8 @@
#include <string.h>
#include <math.h>
#include "Workers/Math/Math.h"
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/vec2.h>
#define THIS KeyPoint
......
......@@ -13,9 +13,9 @@
#include <string.h>
#include <math.h>
#include "../../Architecture/Tracer/Tracer.h"
#include "../../Workers/Math/Math.h"
#include "../../Workers/Math/vec2.h"
#include <robbie_architecture/Architecture/Tracer/Tracer.h>
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/vec2.h>
#define THIS KeyPoint
......
......@@ -12,7 +12,7 @@
#define KeyPoint_H
#include <vector>
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Point2D.h>
/**
......
......@@ -14,8 +14,8 @@
#include <opencv2/opencv.hpp>
#include <Workers/Math/Box2D.h>
#include <Workers/Math/Point2D.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
#include <robbie_architecture/Workers/Math/Point2D.h>
#include "KeyPoint.h"
......
......@@ -10,7 +10,7 @@
#include "KeyPoint.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Box2D.h>
//#include "Workers/ImageHelpers/ImageMaskCV.h"
#include "ImageMaskCV.h"
......
......@@ -15,12 +15,12 @@
#include <sstream>
#include <float.h>
#include "Architecture/Config/Config.h"
#include "Architecture/Tracer/Tracer.h"
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <robbie_architecture/Architecture/Tracer/Tracer.h>
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#include "Workers/Puma2/ColorToGrayOperator.h"
#include "Workers/SimpleTimer/SimpleTimer.h"
#include <robbie_architecture/Workers/Puma2/ColorToGrayOperator.h>
#include <robbie_architecture/Workers/SimpleTimer/SimpleTimer.h>
#include <surf/surflib.h>
......
......@@ -13,14 +13,14 @@
#include <string>
#include "Workers/Math/Box2D.h"
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Box2D.h>
#include <robbie_architecture/Workers/Math/Point2D.h>
#include "Architecture/Serializer/ExtendedOutStream.h"
#include "Architecture/Serializer/ExtendedInStream.h"
#include <robbie_architecture/Architecture/Serializer/ExtendedOutStream.h>
#include <robbie_architecture/Architecture/Serializer/ExtendedInStream.h>
#include "Workers/Puma2/ImageMask.h"
#include "Workers/Puma2/GrayLevelImage8.h"
#include <robbie_architecture/Workers/Puma2/ImageMask.h>
#include <robbie_architecture/Workers/Puma2/GrayLevelImage8.h>
#include "KeyPoint.h"
#include "SurfExtractorBase.h"
......
......@@ -13,8 +13,8 @@
#include <string>
#include "Workers/Math/Box2D.h"
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Box2D.h>
#include <robbie_architecture/Workers/Math/Point2D.h>
#include "KeyPoint.h"
#include "SurfExtractorBase.h"
......
......@@ -12,7 +12,7 @@
#include <sstream>
#include <float.h>
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#define THIS SurfExtractorBase
......
......@@ -13,8 +13,8 @@
#include <string>
#include <ros/ros.h>
#include "Workers/Math/Box2D.h"
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Box2D.h>
#include <robbie_architecture/Workers/Math/Point2D.h>
#include "KeyPoint.h"
#include "KeyPointExtractor.h"
......
......@@ -16,8 +16,6 @@ SimpleHoughClusterer.cpp
add_library(ObjectRecognition ${ObjectRecognition_SRC})
target_link_libraries(ObjectRecognition
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libMath.so # TODO find better solution for this
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libConfig.so
KeyPointExtraction
${OpenCV_LIBS}
${catkin_LIBRARIES}
......
......@@ -7,7 +7,7 @@
#include "CvFundamentalMat.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <math.h>
......
......@@ -7,7 +7,7 @@
#include "CvHomography.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <math.h>
#include <cv.h>
......
......@@ -13,7 +13,7 @@
#include <ros/ros.h>
#include "../KeyPointExtraction/KeyPointMatch.h"
#include "../KeyPointExtraction/KeyPoint.h"
#include "Workers/Math/Homography.h"
#include <robbie_architecture/Workers/Math/Homography.h>
/**
* @class CvHomography
......
......@@ -10,9 +10,9 @@
#include "FLANNMatcher.h"
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/vec2.h>
#include <assert.h>
#include <map>
......
......@@ -19,8 +19,8 @@
#include <ros/ros.h>
#include "Workers/Math/Math.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
#include "../KeyPointExtraction/KeyPoint.h"
#include "../KeyPointExtraction/KeyPointMatch.h"
......
......@@ -6,7 +6,7 @@
*******************************************************************************/
#include "HoughAccumulator.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <sstream>
#include <algorithm> // for max_element
......
......@@ -9,7 +9,7 @@
#define HoughAccumulator_H
#include "../KeyPointExtraction/KeyPointMatch.h"
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Point2D.h>
#include <vector>
#include <list>
......
......@@ -10,10 +10,10 @@
#include "HoughClusterer.h"
#include "Architecture/Config/Config.h"
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#include "HoughIndexCalculator.h"
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/vec2.h>
#include <ros/ros.h>
#include <algorithm> // for max_element
......
......@@ -20,8 +20,8 @@
#include "../ObjectRecognition/HoughAccumulator.h"
#include "../KeyPointExtraction/KeyPointMatch.h"
#include "Workers/Math/Math.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
class ImageProperties;
......
......@@ -10,11 +10,11 @@
#include "HoughIndexCalculator.h"
#include "Architecture/Config/Config.h"
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#include "Workers/Math/Math.h"
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/vec2.h>
#include <algorithm> // for max_element
#include <assert.h>
......
......@@ -12,7 +12,7 @@
#include "../KeyPointExtraction/DefaultExtractor.h"
#include "../KeyPointExtraction/KeyPointHelper.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#define THIS ImagePropertiesCV
......
......@@ -19,7 +19,7 @@
//#include "Workers/ImageHelpers/ImageMaskCV.h"
#include "../KeyPointExtraction/ImageMaskCV.h"
#include "Workers/Math/Point2D.h"
#include <robbie_architecture/Workers/Math/Point2D.h>
// include headers that implement an archive in binary format
#include <boost/archive/binary_iarchive.hpp>
......@@ -27,7 +27,7 @@
#include <boost/archive/text_iarchive.hpp>
#include <boost/archive/text_oarchive.hpp>
#include "Architecture/Serializer/cvmat_serialization.h"
#include <robbie_architecture/Architecture/Serializer/cvmat_serialization.h>
/**
* @class ImageProperties
......
......@@ -7,7 +7,7 @@
#include "MatchHelper.h"
#include "Workers/Math/Math.h"
#include <robbie_architecture/Workers/Math/Math.h>
#define THIS MatchHelper
......
......@@ -13,8 +13,8 @@
#include "../KeyPointExtraction/KeyPoint.h"
#include "../KeyPointExtraction/KeyPointMatch.h"
#include "Workers/Math/Point2D.h"
#include "Workers/Math/Homography.h"
#include <robbie_architecture/Workers/Math/Point2D.h>
#include <robbie_architecture/Workers/Math/Homography.h>
/**
* @class MatchResult
......
......@@ -10,9 +10,9 @@
#include "NNRMatcher.h"
#include "Architecture/Singleton/Clock.h"
#include <robbie_architecture/Architecture/Singleton/Clock.h>
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/vec2.h>
#include <assert.h>
#include <map>
......
......@@ -17,8 +17,8 @@
#include <sstream>
#include <list>
#include "Workers/Math/Math.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
#include "../KeyPointExtraction/KeyPointMatch.h"
......
......@@ -10,7 +10,7 @@
#include "SimpleHoughClusterer.h"
#include "Workers/Math/vec2.h"
#include <robbie_architecture/Workers/Math/vec2.h>
#include <assert.h>
#include <map>
......
......@@ -19,8 +19,8 @@
#include "../KeyPointExtraction/KeyPoint.h"
#include "../KeyPointExtraction/KeyPointMatch.h"
#include "Workers/Math/Math.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Workers/Math/Math.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
/**
* @class SimpleHoughClusterer
......
cmake_minimum_required(VERSION 2.8.6)
project(or_msgs)
find_package(catkin REQUIRED COMPONENTS message_generation roscpp sensor_msgs)
find_package(catkin REQUIRED COMPONENTS message_generation roscpp sensor_msgs cmake_modules)
add_message_files(FILES
BoundingBox2D.msg
......
......@@ -3,26 +3,33 @@
<description>
or_msgs
</description>
<maintainer email="raphael@uni-koblenz.de">raphael</maintainer>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
<maintainer email="raphael@uni-koblenz.de">Raphael Memmesheimer</maintainer>
<maintainer email="heuer@uni-koblenz.de">Gregor Heuer</maintainer>
<maintainer email="niyawe@uni-koblenz.de">Niklas Yann Wettengel</maintainer>
<version>0.0.2</version>
<author>raphael</author>
<license>BSD</license>
<url>http://ros.org/wiki/user_distance_tracker</url>
<build_depend>message_generation</build_depend>
<build_depend>genmsg</build_depend>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>genmsg</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>roscpp_serialization</build_depend>
<build_depend>roslang</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<run_depend>cv_bridge</run_depend>
<build_depend>cv_bridge</build_depend>
<run_depend>message_runtime</run_depend>
<run_depend>roscpp_serialization</run_depend>
<run_depend>sensor_msgs</run_depend>
<build_depend>sensor_msgs</build_depend>
<run_depend>std_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>roscpp_serialization</run_depend>
<build_depend>roscpp_serialization</build_depend>
</package>
......
......@@ -10,16 +10,16 @@ project(or_nodes)
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
#set the default path for built executables to the "bin" directory
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
#set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
#set the default path for built libraries to the "lib" directory
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
set(CMAKE_BUILD_TYPE Release)
# TODO enable after robbie_architecture is removed
#SET(CMAKE_CXX_FLAGS "-std=c++0x")
find_package(catkin REQUIRED COMPONENTS message_generation roscpp_serialization roscpp cv_bridge tf or_msgs or_libs roslib)
find_package(catkin REQUIRED COMPONENTS message_generation roscpp_serialization roscpp cv_bridge tf or_msgs or_libs roslib robbie_architecture homer_nav_libs cmake_modules)
# find and activate OpenMP multicore processing standard
find_package(OpenMP)
......@@ -64,9 +64,6 @@ find_package( OpenCV REQUIRED )
include_directories(/usr/local/include ${CMAKE_CURRENT_BINARY_DIR}
${catkin_INCLUDE_DIRS}
src
$ENV{HOMER_DIR}
$ENV{HOMER_DIR}/catkin_ws/src/vision/
$ENV{HOMER_DIR}/catkin_ws/src/Libraries/robbie_architecture/src
)
##############################################################################
......
......@@ -5,32 +5,42 @@
</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
<maintainer email="raphael@uni-koblenz.de">Raphael Memmesheimer</maintainer>
<maintainer email="heuer@uni-koblenz.de">Gregor Heuer</maintainer>
<maintainer email="niyawe@uni-koblenz.de">Niklas Yann Wettengel</maintainer>
<version>0.0.2</version>
<author>Viktor Seib</author>
<license>BSD</license>
<url></url>
<build_depend>message_generation</build_depend>
<build_depend>genmsg</build_depend>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>genmsg</build_depend>
<build_depend>homer_nav_libs</build_depend>
<build_depend>message_generation</build_depend>
<build_depend>or_libs</build_depend>
<build_depend>or_msgs</build_depend>
<build_depend>robbie_architecture</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>roscpp_serialization</build_depend>
<build_depend>roslang</build_depend>
<build_depend>roslib</build_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>std_msgs</build_depend>
<run_depend>cv_bridge</run_depend>
<build_depend>cv_bridge</build_depend>
<run_depend>homer_nav_libs</run_depend>
<run_depend>message_runtime</run_depend>
<run_depend>sensor_msgs</run_depend>
<build_depend>sensor_msgs</build_depend>
<run_depend>std_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>roscpp_serialization</run_depend>
<build_depend>roscpp_serialization</build_depend>
<run_depend>or_libs</run_depend>
<build_depend>or_libs</build_depend>
<run_depend>or_msgs</run_depend>
<build_depend>or_msgs</build_depend>
<run_depend>robbie_architecture</run_depend>
<run_depend>roscpp_serialization</run_depend>
<run_depend>roslib</run_depend>
<build_depend>roslib</build_depend>
<run_depend>sensor_msgs</run_depend>
<run_depend>std_msgs</run_depend>
<run_depend>tf</run_depend>
<!--<run_depend>color_recognizer</run_depend>-->
<!--<build_depend>color_recognizer</build_depend>-->
......
......@@ -38,11 +38,8 @@ add_library(Modules ${Modules_SRC})
target_link_libraries(
Modules
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libObjectRecognition.so
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libSingleton.so
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libConfig.so
$ENV{HOMER_DIR}/catkin_ws/devel/lib/libString.so
${OpenCV_LIBRARIES}
${catkin_LIBRARIES}
flann
)
......
......@@ -16,7 +16,7 @@
#include <or_msgs/BoundingBox2D.h>
#include <or_msgs/ExtractKeyPoints.h>
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include "ORControlModule.h"
#include "ORMatchingModule.h"
......
......@@ -9,7 +9,7 @@
#include "ORFaceLearningModule.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include "ObjectRecognition/ObjectProperties.h"
#include <sstream>
......
......@@ -12,8 +12,8 @@
#include "ORMatchingModule.h"
#include "ORLoaderModule.h" // TODO temp remove
#include "Architecture/StateMachine/StateMachine.h"
#include "Workers/Math/Box2D.h"
#include <robbie_architecture/Architecture/StateMachine/StateMachine.h>
#include <robbie_architecture/Workers/Math/Box2D.h>
#include <std_msgs/Empty.h>
#include <std_msgs/String.h>
......
......@@ -20,7 +20,7 @@
#include <opencv2/highgui/highgui.hpp>
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/binary_oarchive.hpp>
......@@ -28,7 +28,7 @@
#include <boost/archive/text_oarchive.hpp>
//#include "Workers/ImageHelpers/ImageMaskCV.h"
#include "or_libs/src/KeyPointExtraction/ImageMaskCV.h"
#include "KeyPointExtraction/ImageMaskCV.h"
#include "ObjectRecognition/ObjectProperties.h"
#include "ObjectRecognition/ImagePropertiesCV.h"
......
......@@ -12,7 +12,7 @@
#include <string>
#include <map>
#include "ros/ros.h"
#include <ros/ros.h>
#include <or_msgs/OrLearnCommand.h>
#include <sensor_msgs/Image.h>
......@@ -21,7 +21,7 @@
#include <opencv2/imgproc/imgproc.hpp>
#include <opencv2/highgui/highgui.hpp>
#include "Architecture/StateMachine/StateMachine.h"
#include <robbie_architecture/Architecture/StateMachine/StateMachine.h>
class ObjectProperties;
class ImagePropertiesCV;
......
......@@ -10,16 +10,16 @@
#include "ORControlModule.h"
#include "ORMatchingModule.h"
#include "Architecture/Config/Config.h"
#include <robbie_architecture/Architecture/Config/Config.h>
#include "ObjectRecognition/ObjectProperties.h"
#include "Workers/String/String.h"
#include <robbie_architecture/Workers/String/String.h>
#include <sstream>
#include <fstream>
#include <ros/package.h>
#include "tools/loadRosConfig.h"
#include <homer_nav_libs/tools/loadRosConfig.h>