Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

915d4373

Commit 915d4373 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

Conflicts:
	source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp

parents 05bea5d9 be615840

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 29 additions, 10 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h 4 additions, 10 deletions

.../gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp 3 additions, 4 deletions

.../SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h 12 additions, 0 deletions

...e/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h 4 additions, 0 deletions

...ce/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h 5 additions, 3 deletions

...obotAPI/libraries/core/observerfilters/PoseMedianFilter.h
source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp 6 additions, 4 deletions

...libraries/core/observerfilters/PoseMedianOffsetFilter.cpp

with 63 additions and 31 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