Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

eaa9fdc9

Commit eaa9fdc9 authored 5 years ago by Adrian Knobloch

Downloads
- Plain Diff

Merge branch 'ViewerWidgetConfigurationDialog' into 'Ice3.7'

Viewer widget configuration dialog

See merge request ArmarX/ArmarXGui!61

parents c74295f5 c22ce53b

No related branches found

No related tags found

1 merge request!61Viewer widget configuration dialog

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 2 additions, 2 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 8 additions, 2 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp 41 additions, 8 deletions

...ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h 6 additions, 2 deletions

...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
source/ArmarXGui/libraries/ArmarXGuiBase/ArmarXWidgetController.cpp 5 additions, 0 deletions

...arXGui/libraries/ArmarXGuiBase/ArmarXWidgetController.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/ArmarXWidgetController.h 7 additions, 0 deletions

...rmarXGui/libraries/ArmarXGuiBase/ArmarXWidgetController.h

with 69 additions and 14 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