Commit b6addcda authored 4 years ago by Rainer Kartmann

Merge branch 'master' into armem/dev

parents 90c308c7 10d4cb9d

No related branches found

No related tags found

1 merge request!120armem/dev

Expand all Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json 18 additions, 18 deletions

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt 4 additions, 0 deletions

source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 296 additions, 244 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 52 additions, 39 deletions

...botAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
source/RobotAPI/components/ObjectPoseObserver/detail/ObjectPoseDecay.cpp 133 additions, 0 deletions

.../components/ObjectPoseObserver/detail/ObjectPoseDecay.cpp
source/RobotAPI/components/ObjectPoseObserver/detail/ObjectPoseDecay.h 72 additions, 0 deletions

...PI/components/ObjectPoseObserver/detail/ObjectPoseDecay.h
source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.cpp 100 additions, 0 deletions

...omponents/ObjectPoseObserver/detail/RobotHeadMovement.cpp
source/RobotAPI/components/ObjectPoseObserver/detail/RobotHeadMovement.h 58 additions, 0 deletions

.../components/ObjectPoseObserver/detail/RobotHeadMovement.h
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp 77 additions, 11 deletions

...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h 8 additions, 0 deletions

...stacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.h
source/RobotAPI/gui-plugins/ArViz/LayerInfoTree.cpp 23 additions, 35 deletions

source/RobotAPI/gui-plugins/ArViz/LayerInfoTree.cpp
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 4 additions, 2 deletions

...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice 3 additions, 1 deletion

source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp 48 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 15 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
source/RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.cpp 10 additions, 12 deletions

...botAPI/libraries/GraspingUtility/GraspCandidateHelper.cpp
source/RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.h 0 additions, 2 deletions

...RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.cpp 131 additions, 25 deletions

...tStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.h 64 additions, 11 deletions

...botStatechartHelpers/ObstacleAvoidingPlatformUnitHelper.h
source/RobotAPI/libraries/armem/core/io/DiskReader/DiskReader.cpp 1 addition, 1 deletion

...obotAPI/libraries/armem/core/io/DiskReader/DiskReader.cpp

with 1117 additions and 401 deletions

Please register or to comment