Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

2f60e22f

Commit 2f60e22f authored 4 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev

parents f06d92e4 80a258ad

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 128 additions, 12 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 23 additions, 0 deletions

...botAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidget.ui 17 additions, 0 deletions

...anWaypointControlGui/CartesianWaypointControlGuiWidget.ui
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 46 additions, 20 deletions

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.h 1 addition, 0 deletions

...tControlGui/CartesianWaypointControlGuiWidgetController.h

with 215 additions and 32 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