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

enable to compile on 20.04 for noetic #1

Closed
wants to merge 3 commits into from
Closed

enable to compile on 20.04 for noetic #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41bdf63
update qt4 to qt5 for 20.04(noetic)
k-okada Sep 11, 2021
4a61895
update qt4 to qt5 for 20.04(noetic)
k-okada Sep 11, 2021
97e6788
use CV::IMREAD_UNCHANGED https://stackoverflow.com/questions/28534070…
k-okada Sep 11, 2021
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
2 changes: 1 addition & 1 deletion baxter_sim_hardware/src/baxter_emulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ void baxter_emulator::publish(const std::string &img_path) {
// Read OpenCV Mat image and convert it to ROS message
cv_bridge::CvImagePtr cv_ptr(new cv_bridge::CvImage);
try {
cv_ptr->image = cv::imread(img_path, CV_LOAD_IMAGE_UNCHANGED);
cv_ptr->image = cv::imread(img_path, cv::IMREAD_UNCHANGED);
if (cv_ptr->image.data) {
cv_ptr->encoding = sensor_msgs::image_encodings::BGR8;
sleep(IMG_LOAD_ON_STARTUP_DELAY); // Wait for the model to load
Expand Down
13 changes: 7 additions & 6 deletions baxter_sim_io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ project(baxter_sim_io)
# qt_build provides the qt cmake glue, roscpp the comms for a default talker
#find_package(catkin REQUIRED COMPONENTS qt_build roscpp baxter_core_msgs)
find_package(catkin REQUIRED COMPONENTS roscpp baxter_core_msgs)
find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui)
find_package(Qt5Widgets)
include_directories(${catkin_INCLUDE_DIRS})
# Use this to define what the package will export (e.g. libs, headers).
# Since the default here is to produce only a binary, we don't worry about
Expand All @@ -38,16 +38,15 @@ include_directories(include
##############################################################################
# Sections
##############################################################################
include(${QT_USE_FILE})
include_directories(${CMAKE_CURRENT_BINARY_DIR})

file(GLOB QT_FORMS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ui/*.ui)
file(GLOB QT_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} resources/*.qrc)
file(GLOB_RECURSE QT_MOC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} FOLLOW_SYMLINKS include/baxter_sim_io/*.hpp)

QT4_ADD_RESOURCES(QT_RESOURCES_CPP ${QT_RESOURCES})
QT4_WRAP_UI(QT_FORMS_HPP ${QT_FORMS})
QT4_WRAP_CPP(QT_MOC_HPP ${QT_MOC})
QT5_ADD_RESOURCES(QT_RESOURCES_CPP ${QT_RESOURCES})
QT5_WRAP_UI(QT_FORMS_HPP ${QT_FORMS})
QT5_WRAP_CPP(QT_MOC_HPP ${QT_MOC})

##############################################################################
# Sources
Expand All @@ -60,7 +59,9 @@ file(GLOB_RECURSE QT_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} FOLLOW_SYMLINK
##############################################################################

add_executable(baxter_sim_io ${QT_SOURCES} ${QT_RESOURCES_CPP} ${QT_FORMS_HPP} ${QT_MOC_HPP})
target_link_libraries(baxter_sim_io ${QT_LIBRARIES} ${ROS_LIBRARIES} ${catkin_LIBRARIES})
target_link_libraries(baxter_sim_io ${ROS_LIBRARIES} ${catkin_LIBRARIES})

qt5_use_modules(baxter_sim_io Widgets)

add_dependencies(baxter_sim_io baxter_core_msgs_gencpp)

Expand Down
2 changes: 1 addition & 1 deletion baxter_sim_io/include/baxter_sim_io/baxter_io.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#ifndef BAXTER_SIM_IO_BAXTER_IO_H
#define BAXTER_SIM_IO_BAXTER_IO_H

#include <QtGui/QMainWindow>
#include <QtWidgets/QMainWindow>
#include <QBitmap>
#include <QPushButton>
#include "ui_baxter_io.h"
Expand Down
4 changes: 2 additions & 2 deletions baxter_sim_io/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<buildtool_depend>catkin</buildtool_depend>
<!--build_depend>qt_build</build_depend-->
<build_depend>roscpp</build_depend>
<build_depend>libqt4-dev</build_depend>
<build_depend>libqt5-dev</build_depend>
<build_depend>baxter_core_msgs</build_depend>
<!--run_depend>qt_build</run_depend-->
<run_depend>roscpp</run_depend>
<run_depend>libqt4-dev</run_depend>
<run_depend>libqt5-dev</run_depend>
<run_depend>baxter_core_msgs</run_depend>

</package>