Merge branch 'master' into fix/emergency_stop_button
No related branches found
No related tags found
Checking pipeline status
Showing
- .gitlab-ci.yml 182 additions, 0 deletions.gitlab-ci.yml
- .gitlab/CODEOWNERS 0 additions, 0 deletions.gitlab/CODEOWNERS
- .gitlab/ci/armarx-workspace.json 17 additions, 0 deletions.gitlab/ci/armarx-workspace.json
- docker/armarx-workspace.json 14 additions, 0 deletionsdocker/armarx-workspace.json
- docker/bionic 20 additions, 0 deletionsdocker/bionic
- docker/jammy 20 additions, 0 deletionsdocker/jammy
- etc/cmake/Findqwt.cmake 12 additions, 10 deletionsetc/cmake/Findqwt.cmake
- etc/cmake/latest/add_qt_targets.cmake 3 additions, 0 deletionsetc/cmake/latest/add_qt_targets.cmake
- etc/doxygen/mainpage.dox 0 additions, 12 deletionsetc/doxygen/mainpage.dox
- etc/doxygen/mainpage.md 7 additions, 0 deletionsetc/doxygen/mainpage.md
- etc/doxygen/pages/Tutorials.dox 0 additions, 11 deletionsetc/doxygen/pages/Tutorials.dox
- etc/doxygen/pages/Tutorials.md 10 additions, 0 deletionsetc/doxygen/pages/Tutorials.md
- source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 109 additions, 58 deletionssource/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 414 additions, 276 deletionssource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 33 additions, 25 deletionssource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
- source/ArmarXGui/applications/ArmarXGui/Widgets/GuiUseCaseSelector.cpp 1 addition, 1 deletion...Gui/applications/ArmarXGui/Widgets/GuiUseCaseSelector.cpp
- source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp 2 additions, 1 deletion...ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
- source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h 1 addition, 0 deletions...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
- source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogTable.cpp 67 additions, 51 deletions...ui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogTable.cpp
- source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.ui 3 additions, 1 deletion...ui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.ui
Loading
Please register or sign in to comment