Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

8ded58aa

Commit 8ded58aa authored 5 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'arviz/fix-reconnect' into 'master'

ArViz Introspection: Fix error on reconnect

See merge request ArmarX/RobotAPI!65

parents 2efd1cf7 3d17bae8

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
scenarios/ArVizExample/config/ArVizExample.cfg 1 addition, 1 deletion

scenarios/ArVizExample/config/ArVizExample.cfg
source/RobotAPI/components/ArViz/Example/ArVizExample.cpp 16 additions, 2 deletions

source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
source/RobotAPI/components/ArViz/Example/ArVizExample.h 16 additions, 5 deletions

source/RobotAPI/components/ArViz/Example/ArVizExample.h
source/RobotAPI/components/ArViz/Example/CMakeLists.txt 5 additions, 4 deletions

source/RobotAPI/components/ArViz/Example/CMakeLists.txt
source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 1 addition, 3 deletions

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
source/RobotAPI/gui-plugins/ArViz/LayerInfoTree.cpp 8 additions, 4 deletions

source/RobotAPI/gui-plugins/ArViz/LayerInfoTree.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.cpp 5 additions, 0 deletions

...braries/RobotAPIComponentPlugins/ArVizComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h 16 additions, 0 deletions

...libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h

with 70 additions and 19 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