Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

b75807c3

Commit b75807c3 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into armem/dev

parents a8150ed1 c3ba2976

No related branches found

No related tags found

1 merge request!188ArMem Updates

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.cpp 4 additions, 0 deletions

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.cpp
source/RobotAPI/components/ArViz/Coin/ElementVisualizer.h 6 additions, 5 deletions

source/RobotAPI/components/ArViz/Coin/ElementVisualizer.h
source/RobotAPI/components/ArViz/Coin/VisualizationCylindroid.h 2 additions, 0 deletions

.../RobotAPI/components/ArViz/Coin/VisualizationCylindroid.h
source/RobotAPI/components/ArViz/Coin/VisualizationPath.cpp 2 additions, 1 deletion

source/RobotAPI/components/ArViz/Coin/VisualizationPath.cpp
source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 12 additions, 18 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp
source/RobotAPI/components/ArViz/Coin/Visualizer.h 2 additions, 0 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.h
source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 1 addition, 5 deletions

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h 0 additions, 2 deletions

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp 3 additions, 3 deletions

...plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.cpp

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