Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kalibr_bagcreater can now handle short filenames. #13

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

kalibr_bagcreater can now handle short filenames. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87df29a
CMake finds correct Eigen config in Ubuntu 14.04.
Aug 13, 2014
e80faaa
kalibr_bagcreater can now handle short filenames.
Sep 3, 2014
4ddcf2d
Merge branches 'indigo-compatibility' and 'eigen-ubuntu' of github.co…
Sep 3, 2014
2c209c1
Grayscale images sometimes problem in calibration.
Sep 9, 2014
e4d3db2
Merge branch 'kalibr_target_extractor'
Sep 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Schweizer-Messer/numpy_eigen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ project(numpy_eigen)
find_package(catkin REQUIRED COMPONENTS python_module)
include_directories(${catkin_INCLUDE_DIRS})
find_package(Boost REQUIRED COMPONENTS system)
find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)

catkin_python_setup()

add_definitions(${EIGEN_DEFINITIONS})
include_directories(include ${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
include_directories(include ${EIGEN3_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})
include_directories("${PROJECT_SOURCE_DIR}/include/numpy_eigen")

catkin_package(
Expand Down
6 changes: 3 additions & 3 deletions Schweizer-Messer/sm_eigen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ project(sm_eigen)
find_package(catkin REQUIRED COMPONENTS sm_common sm_random)
include_directories(${catkin_INCLUDE_DIRS})
find_package(Boost REQUIRED COMPONENTS system serialization)
find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)

include_directories(include ${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
include_directories(include ${EIGEN3_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

catkin_package(
INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIR}
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS
DEPENDS
Expand Down
1 change: 1 addition & 0 deletions Schweizer-Messer/sm_eigen/include/sm/eigen/random.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#ifndef SM_EIGEN_RANDOM_HPP
#define SM_EIGEN_RANDOM_HPP
#include <eigen3/Eigen/Dense>
#include <Eigen/Core>

namespace sm {
Expand Down
4 changes: 2 additions & 2 deletions Schweizer-Messer/sm_kinematics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ include_directories(${catkin_INCLUDE_DIRS})
find_package(Boost REQUIRED COMPONENTS system serialization filesystem)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
find_package(Eigen REQUIRED)
include_directories(${EIGEN_INCLUDE_DIRS})
find_package(Eigen3 REQUIRED)
include_directories(${EIGEN3_INCLUDE_DIR})
add_definitions(${EIGEN_DEFINITIONS})

SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x")
Expand Down
4 changes: 2 additions & 2 deletions Schweizer-Messer/sm_matrix_archive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ find_package(catkin REQUIRED COMPONENTS sm_common)
include_directories(${catkin_INCLUDE_DIRS})
find_package(Boost REQUIRED COMPONENTS system filesystem)

find_package(Eigen REQUIRED)
include_directories(include ${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
find_package(Eigen3 REQUIRED)
include_directories(include ${EIGEN3_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

catkin_package(
INCLUDE_DIRS include ${catkin_INCLUDE_DIRS}
Expand Down
4 changes: 2 additions & 2 deletions Schweizer-Messer/sm_python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ find_package(catkin REQUIRED COMPONENTS sm_common numpy_eigen sm_kinematics
sm_timing sm_logging sm_matrix_archive
sm_property_tree python_module)
include_directories(${catkin_INCLUDE_DIRS})
find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)

include_directories(include ${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
include_directories(include ${EIGEN3_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})


catkin_package(
Expand Down
2 changes: 1 addition & 1 deletion aslam_cv/aslam_cameras_april/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ catkin_simple()
find_package(OpenCV REQUIRED)

ADD_DEFINITIONS(-DASLAM_USE_ROS )
include_directories(${Eigen_INCLUDE_DIRS})
include_directories(${EIGEN3_INCLUDE_DIR})


cs_add_library(${PROJECT_NAME}
Expand Down
2 changes: 1 addition & 1 deletion aslam_cv/aslam_imgproc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ catkin_simple()

find_package(Boost REQUIRED COMPONENTS system)

include_directories(${Eigen_INCLUDE_DIRS})
include_directories(${EIGEN3_INCLUDE_DIR})
cs_add_library(${PROJECT_NAME} src/UndistorterBase.cpp)


Expand Down
8 changes: 4 additions & 4 deletions aslam_offline_calibration/ethz_apriltag2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ project(ethz_apriltag2)
find_package(catkin)
include_directories(${catkin_INCLUDE_DIRS})

find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)

catkin_package(
DEPENDS eigen opencv
INCLUDE_DIRS include ${Eigen_INCLUDE_DIRS}
INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIR}
LIBRARIES ${PROJECT_NAME}
)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake/)

find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(OpenCV REQUIRED)

add_definitions(-fPIC -O3)
include_directories(include ${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
include_directories(include ${EIGEN3_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})

if(NOT APPLE)
# The clang compiler (on osx) is somehow much more strict
Expand Down
7 changes: 6 additions & 1 deletion aslam_offline_calibration/kalibr/python/kalibr_bagcreater
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ def loadImageToRosMsg(filename):
image_np = cv2.imread(filename, cv2.IMREAD_GRAYSCALE)

timestamp_nsecs = os.path.splitext(os.path.basename(filename))[0]
timestamp = rospy.Time( secs=int(timestamp_nsecs[0:-9]), nsecs=int(timestamp_nsecs[-9:]) )
secs = timestamp_nsecs[0:-9]
if len(secs):
secs = int(secs)
else:
secs = 0
timestamp = rospy.Time( secs=secs, nsecs=int(timestamp_nsecs[-9:]) )

rosimage = Image()
rosimage.header.stamp = timestamp
Expand Down
1 change: 1 addition & 0 deletions aslam_offline_calibration/kalibr/python/kalibr_common/TargetExtractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def multicoreExtractionWrapper(detector, taskq, resultq, clearImages, noTransfor
stamp = task[1]
image = task[2]

image = image.reshape(filter(lambda dim: dim != 1, image.shape))
if noTransformation:
success, obs = detector.findTargetNoTransformation(stamp, np.array(image))
else:
Expand Down
2 changes: 1 addition & 1 deletion aslam_optimizer/aslam_backend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ catkin_simple()

find_package(Boost REQUIRED COMPONENTS system thread)

include_directories(${Eigen_INCLUDE_DIRS})
include_directories(${EIGEN3_INCLUDE_DIR})

#add_definitions( -fPIC -msse2 -mssse3 -march=nocona -Wextra -Winit-self -Woverloaded-virtual -Wnon-virtual-dtor -Wsign-promo -Wno-long-long -std=c++0x -O3)

Expand Down
2 changes: 1 addition & 1 deletion aslam_optimizer/aslam_backend_expressions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(catkin_simple REQUIRED)

catkin_simple()

include_directories(${EIGEN_INCLUDE_DIRS})
include_directories(${EIGEN3_INCLUDE_DIR})

find_package(Boost REQUIRED COMPONENTS system)

Expand Down