Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

f9f57d48

Commit f9f57d48 authored 2 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into prediction-improvements

parents a11f9c18 87eff69d

No related branches found

No related tags found

1 merge request!244Improve armem prediction interface

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/predictions.cpp 2 additions, 11 deletions

source/RobotAPI/libraries/ArmarXObjects/predictions.cpp
source/RobotAPI/libraries/ArmarXObjects/predictions.h 9 additions, 5 deletions

source/RobotAPI/libraries/ArmarXObjects/predictions.h
source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp 21 additions, 6 deletions

...ibraries/armem_objects/server/instance/SegmentAdapter.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 2 additions, 5 deletions

...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp

with 34 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment