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

fix for error when using opencv3 #1357

Closed
wants to merge 6 commits into from
Closed

fix for error when using opencv3 #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0355231
[jsk_topic_tools] Set property is_initialized
wkentaro Feb 16, 2016
e5b38e1
CATKIN_INCLUDE_DIRS -> catkin_INCLUDE_DIRS
wkentaro Mar 8, 2016
7087b7d
Add include_dirs for multi_map_server
wkentaro Mar 8, 2016
9cb89e3
remove dynamic_reconfigure.parameter_generator, which only used for r…
k-okada Mar 10, 2016
132b4e5
Fix header of screenrectangle topic to include frame_id
wkentaro Mar 2, 2016
1f3f6e5
fix for error when using opencv3 with correct indentation
iKrishneel Mar 15, 2016
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
8 changes: 1 addition & 7 deletions jsk_coordination_system/dynamic_tf_publisher/cfg/TfParameter.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
# set up parameters that we care about
PACKAGE = 'dynamic_tf_publisher'

try:
import imp
imp.find_module(PACKAGE)
from dynamic_reconfigure.parameter_generator_catkin import *;
except:
import roslib; roslib.load_manifest(PACKAGE)
from dynamic_reconfigure.parameter_generator import *;
from dynamic_reconfigure.parameter_generator_catkin import *;

from math import pi

Expand Down
8 changes: 1 addition & 7 deletions jsk_network_tools/cfg/SilverhammerHighspeedStreamer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
# set up parameters that we care about
PACKAGE = 'jsk_network_tools'

try:
import imp
imp.find_module(PACKAGE)
from dynamic_reconfigure.parameter_generator_catkin import *;
except:
import roslib; roslib.load_manifest(PACKAGE)
from dynamic_reconfigure.parameter_generator import *;
from dynamic_reconfigure.parameter_generator_catkin import *;

from math import pi

Expand Down
8 changes: 1 addition & 7 deletions jsk_ros_patch/image_view2/cfg/ImageView2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,7 @@
# set up parameters that we care about
PACKAGE = 'image_view2'

try:
import imp
imp.find_module(PACKAGE)
from dynamic_reconfigure.parameter_generator_catkin import *;
except:
import roslib; roslib.load_manifest(PACKAGE)
from dynamic_reconfigure.parameter_generator import *;
from dynamic_reconfigure.parameter_generator_catkin import *;

from math import pi

Expand Down
4 changes: 2 additions & 2 deletions jsk_ros_patch/image_view2/image_view2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ namespace image_view2{
screen_msg.polygon.points[0].y = window_selection_.y * resize_y_;
screen_msg.polygon.points[1].x = (window_selection_.x + window_selection_.width) * resize_x_;
screen_msg.polygon.points[1].y = (window_selection_.y + window_selection_.height) * resize_y_;
screen_msg.header.stamp = last_msg_->header.stamp;
screen_msg.header = last_msg_->header;
ROS_INFO("Publish rectangle point %s (%f %f %f %f)", rectangle_pub_.getTopic().c_str(),
screen_msg.polygon.points[0].x, screen_msg.polygon.points[0].y,
screen_msg.polygon.points[1].x, screen_msg.polygon.points[1].y);
Expand Down Expand Up @@ -1697,8 +1697,8 @@ namespace image_view2{
{
if (use_window) {
if (!window_initialized_) {
cv::setMouseCallback(window_name_.c_str(), &ImageView2::mouseCb, this);
cv::namedWindow(window_name_.c_str(), autosize_ ? CV_WINDOW_AUTOSIZE : 0);
cv::setMouseCallback(window_name_.c_str(), &ImageView2::mouseCb, this);
window_initialized_ = false;
}
if(!image_.empty()) {
Expand Down
4 changes: 2 additions & 2 deletions jsk_ros_patch/image_view2/image_view2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#ifndef IMAGE_VIEW2_H_
#define IMAGE_VIEW2_H_

#include <opencv/cv.h>
#include <opencv/highgui.h>
#include <opencv2/opencv.hpp>
#include <opencv2/highgui/highgui.hpp>

#include <ros/ros.h>
#include <sensor_msgs/Image.h>
Expand Down
1 change: 1 addition & 0 deletions jsk_ros_patch/multi_map_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ catkin_package(
LIBRARIES
)

include_directories(${catkin_INCLUDE_DIRS})
add_executable(multi_map_server src/main.cpp)
target_link_libraries(multi_map_server ${catkin_LIBRARIES} SDL SDL_image yaml-cpp)

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


find_package(Eigen REQUIRED)
include_directories(${Eigen_INCLUDE_DIRS} ${CATKIN_INCLUDE_DIRS})
include_directories(${Eigen_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

generate_dynamic_reconfigure_options(
cfg/DynamixelTiltController.cfg
Expand Down
2 changes: 2 additions & 0 deletions jsk_topic_tools/src/jsk_topic_tools/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ class ConnectionBasedTransport(rospy.SubscribeListener):

def __init__(self):
super(ConnectionBasedTransport, self).__init__()
self.is_initialized = False
self._publishers = []
self._ever_subscribed = False
self._connection_status = NOT_SUBSCRIBED
rospy.Timer(rospy.Duration(5),
self._warn_never_subscribed_cb, oneshot=True)

def _post_init(self):
self.is_initialized = True
if rospy.get_param('~always_subscribe', False):
self.subscribe()
self._connection_status = SUBSCRIBED
Expand Down