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

Feature/buildfix #269

Open
wants to merge 2 commits into
base: catkin
Choose a base branch
from
Open

Feature/buildfix #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff34b77
Update build for kinetic
Aug 1, 2017
2f7daa2
Change type of qt variables.
atomoclast Aug 1, 2017
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
7 changes: 5 additions & 2 deletions lsd_slam_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ find_package(catkin REQUIRED COMPONENTS
image_transport
roscpp
rosbag
cmake_modules
lsd_slam_viewer
)

find_package(Eigen REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(X11 REQUIRED)
include(cmake/FindG2O.cmake)
include(cmake/FindSuiteParse.cmake)
Expand Down Expand Up @@ -92,12 +94,13 @@ include_directories(
${PROJECT_SOURCE_DIR}/thirdparty/Sophus
${CSPARSE_INCLUDE_DIR} #Has been set by SuiteParse
${CHOLMOD_INCLUDE_DIR} #Has been set by SuiteParse
${catkin_INCLUDE_DIRS}
)


# build shared library.
add_library(lsdslam SHARED ${SOURCE_FILES})
target_link_libraries(lsdslam ${FABMAP_LIB} ${G2O_LIBRARIES} ${catkin_LIBRARIES} csparse cxsparse )
target_link_libraries(lsdslam ${FABMAP_LIB} ${G2O_LIBRARIES} ${catkin_LIBRARIES} csparse cxsparse X11)
#rosbuild_link_boost(lsdslam thread)


Expand Down
2 changes: 2 additions & 0 deletions lsd_slam_core/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<url>http://vision.in.tum.de/lsdslam</url>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>dynamic_reconfigure</build_depend>
<build_depend>sensor_msgs</build_depend>
Expand All @@ -22,6 +23,7 @@
<build_depend>suitesparse</build_depend>
<build_depend>libg2o</build_depend>

<run_depend>cmake_modules</run_depend>
<run_depend>cv_bridge</run_depend>
<run_depend>dynamic_reconfigure</run_depend>
<run_depend>sensor_msgs</run_depend>
Expand Down
2 changes: 2 additions & 0 deletions lsd_slam_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
rosbag
message_generation
roslib
cmake_modules
)

find_package(OpenGL REQUIRED)
Expand Down Expand Up @@ -48,6 +49,7 @@ generate_dynamic_reconfigure_options(
cfg/LSDSLAMViewerParams.cfg
)

catkin_package()

# Sources files
set(SOURCE_FILES
Expand Down
2 changes: 2 additions & 0 deletions lsd_slam_viewer/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<url>http://vision.in.tum.de/lsdslam</url>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>dynamic_reconfigure</build_depend>
<build_depend>sensor_msgs</build_depend>
Expand All @@ -20,6 +21,7 @@
<build_depend>rosbag</build_depend>
<build_depend>message_generation</build_depend>

<run_depend>cmake_modules</run_depend>
<run_depend>cv_bridge</run_depend>
<run_depend>dynamic_reconfigure</run_depend>
<run_depend>sensor_msgs</run_depend>
Expand Down
2 changes: 1 addition & 1 deletion lsd_slam_viewer/src/KeyFrameDisplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <GL/gl.h>
#include <GL/glu.h>

#include "opencv2/opencv.hpp"
// #include "opencv2/opencv.hpp"

#include "ros/package.h"

Expand Down
2 changes: 1 addition & 1 deletion lsd_slam_viewer/src/PointCloudViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ void PointCloudViewer::keyPressEvent(QKeyEvent *e)
meddleMutex.lock();


float x,y,z;
qreal x,y,z; // was float
camera()->frame()->getPosition(x,y,z);
animationList.push_back(AnimationObject(false, lastAnimTime, 2, qglviewer::Frame(qglviewer::Vec(0,0,0), camera()->frame()->orientation())));
animationList.back().frame.setPosition(x,y,z);
Expand Down
2 changes: 1 addition & 1 deletion lsd_slam_viewer/src/PointCloudViewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class AnimationObject
int showCurrentCam_i = showCurrentCam;
int isFix_i = isFix;

float x,y,z;
qreal x,y,z; //float x,y,z;
frame.getPosition(x,y,z);

snprintf(buf, 1000, "Animation: %d at %lf (dur %lf) S: %f %f %d %d %d %d %d Frame: %lf %lf %lf %lf %f %f %f %d",
Expand Down