Commit 9b261dbd authored 7 years ago by Cedric Seehausen

Merge branch 'master' into ScenarioManagerIceExecuting

parents 1431f00b 5efdb545

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 1 addition, 1 deletion

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.h 1 addition, 0 deletions

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

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 1 addition, 1 deletion

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/ArmarXManagerModel.cpp 42 additions, 26 deletions

...i-plugins/SystemStateMonitorPlugin/ArmarXManagerModel.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp 52 additions, 2 deletions

...ins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp
source/ArmarXGui/interface/CMakeLists.txt 1 addition, 0 deletions

source/ArmarXGui/interface/CMakeLists.txt
source/ArmarXGui/interface/WidgetDescription.ice 127 additions, 0 deletions

source/ArmarXGui/interface/WidgetDescription.ice
source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc 11 additions, 2 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc
source/ArmarXGui/libraries/ArmarXGuiBase/icons/Blank.svg 41 additions, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/icons/Blank.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleBlackDown.svg 58 additions, 0 deletions

...rXGui/libraries/ArmarXGuiBase/icons/TriangleBlackDown.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleBlackLeft.svg 58 additions, 0 deletions

...rXGui/libraries/ArmarXGuiBase/icons/TriangleBlackLeft.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleBlackRight.svg 58 additions, 0 deletions

...XGui/libraries/ArmarXGuiBase/icons/TriangleBlackRight.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleBlackUp.svg 58 additions, 0 deletions

...marXGui/libraries/ArmarXGuiBase/icons/TriangleBlackUp.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleGrayDown.svg 58 additions, 0 deletions

...arXGui/libraries/ArmarXGuiBase/icons/TriangleGrayDown.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleGrayLeft.svg 58 additions, 0 deletions

...arXGui/libraries/ArmarXGuiBase/icons/TriangleGrayLeft.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleGrayRight.svg 58 additions, 0 deletions

...rXGui/libraries/ArmarXGuiBase/icons/TriangleGrayRight.svg
source/ArmarXGui/libraries/ArmarXGuiBase/icons/TriangleGrayUp.svg 58 additions, 0 deletions

...rmarXGui/libraries/ArmarXGuiBase/icons/TriangleGrayUp.svg
source/ArmarXGui/libraries/CMakeLists.txt 3 additions, 0 deletions

source/ArmarXGui/libraries/CMakeLists.txt
source/ArmarXGui/libraries/PlotterController/PlotterController.cpp 17 additions, 17 deletions

...marXGui/libraries/PlotterController/PlotterController.cpp

with 776 additions and 57 deletions

Please register or to comment