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.

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

Update ROS interface etc. #49

Merged
merged 34 commits into from
Jul 4, 2019
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b4d309c
Update run_dope_docker so X11 works
mintar May 16, 2019
f50228f
Remove unnecessary executable bits
mintar Jun 5, 2019
735be4e
Reorganize source files, add ROS setup.py
mintar Jun 5, 2019
e8d3b59
Add some deps and install rules
mintar Jun 5, 2019
16beed4
Optimize imports
mintar Jun 5, 2019
01b7d14
Fix tab-indent
mintar Jun 5, 2019
c67b669
Strip rospy argv arguments
mintar Jun 6, 2019
8cfd615
pnp solver: Fix case where intrinsic matrix = None
mintar Jun 6, 2019
cda846b
Refactoring: Move methods into new class DopeNode
mintar Jun 6, 2019
2894d78
Refactoring: Move drawing functions into new class
mintar Jun 6, 2019
aeb89bb
Move processing to image callback
mintar Jun 6, 2019
a89aa71
Get rid of global variables
mintar Jun 6, 2019
ae387b5
Keep input message header for output
mintar Jun 6, 2019
a481e0a
Parse parameter "dimensions"
mintar Jun 6, 2019
39a16c3
Read camera matrix from camera_info topic
mintar Jun 6, 2019
110f214
Support unrectified input images
mintar Jun 7, 2019
6c5040d
Remove camera node
mintar Jun 7, 2019
ee57dcb
Downscale image if necessary
mintar Jun 7, 2019
5297028
Add vision_msgs publisher
mintar Jun 7, 2019
9ae8e39
Simplify Dockerfile, install deps from rosdep
mintar Jun 7, 2019
087b28c
Publish bbox + text markers
mintar Jun 7, 2019
ac61792
Publish mesh markers
mintar Jun 19, 2019
c63f92c
Use resource_retriever for weight files
mintar Jun 11, 2019
b4896d1
Optionally rotate object pose before publishing
mintar Jun 12, 2019
856f254
Dockerfile: copy package, source workspace setup.bash
mintar Jun 13, 2019
9ec7d14
Add .dockerignore
mintar Jun 13, 2019
3aec02a
Read params from ROS parameter server instead of file
mintar Jun 19, 2019
7940550
Fix phrasing in docker/readme.md
mintar Jun 20, 2019
bfc518f
Update README: use camera_frame_id as fixed frame
mintar Jun 26, 2019
e8750f5
Add camera_tutorial.md
mintar Jun 26, 2019
b6b8058
Add mesh_scale parameter
mintar Jun 26, 2019
f67148a
Resurrect camera node
mintar Jun 28, 2019
6235ac2
camera node: publish camera_info topic
mintar Jun 28, 2019
7f9e1fe
Update README
mintar Jul 1, 2019
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
Prev Previous commit
Next Next commit
Parse parameter "dimensions"
  • Loading branch information
mintar committed Jun 13, 2019
commit a481e0a136c3dc2c1e36bea26a7c7d06f8e74eb0
6 changes: 4 additions & 2 deletions nodes/dope
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ class Draw(object):
class DopeNode(object):
"""ROS node that listens to image topic, runs DOPE, and publishes DOPE results"""
def __init__(self, params):
self.params = params
self.pubs = {}
self.models = {}
self.pnp_solvers = {}
self.pub_dimension = {}
self.draw_colors = {}
self.dimensions = {}
self.cv_bridge = CvBridge()

# Initialize parameters
Expand Down Expand Up @@ -132,6 +132,8 @@ class DopeNode(object):

self.draw_colors[model] = \
tuple(params["draw_colors"][model])
self.dimensions[model] = \
tuple(params["dimensions"][model])
self.pnp_solvers[model] = \
CuboidPNPSolver(
model,
Expand Down Expand Up @@ -211,7 +213,7 @@ class DopeNode(object):

# Publish
self.pubs[m].publish(pose_msg)
self.pub_dimension[m].publish(str(self.params['dimensions'][m]))
self.pub_dimension[m].publish(str(self.dimensions[m]))

# Draw the cube
if None not in result['projected_points']:
Expand Down