Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

56214975

Commit 56214975 authored 1 year ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

parents 1dd3524c 5abd29cf

No related merge requests found

Pipeline #15858 passed 1 year ago

Stage: build-and-test

Stage: deploy

Stage: post-deploy-test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 6 additions, 4 deletions

...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 132 additions, 67 deletions

...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 15 additions, 33 deletions

...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 3 additions, 0 deletions

.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.cpp 72 additions, 0 deletions

...rPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.h 27 additions, 0 deletions

...gerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.h
source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp 81 additions, 39 deletions

...API/libraries/aron_component_config/RemoteGuiVisitors.cpp

with 336 additions and 143 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