Commit d391c336 authored 3 years ago by alissa

Renamed ObjectTypeEnum in objpose to ObjectType and deleted redundant ObjectTypeEnum in grasping

parent ef6cc349

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/ArmemGraspMemory/config/GraspProviderExample.cfg 0 additions, 8 deletions

scenarios/ArmemGraspMemory/config/GraspProviderExample.cfg
source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp 2 additions, 2 deletions

...s/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp
source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.cpp 0 additions, 1 deletion

...rmem/client/GraspProviderExample/GraspProviderExample.cpp
source/RobotAPI/components/units/GraspCandidateObserver.cpp 6 additions, 5 deletions

source/RobotAPI/components/units/GraspCandidateObserver.cpp
source/RobotAPI/components/units/GraspCandidateObserver.h 1 addition, 1 deletion

source/RobotAPI/components/units/GraspCandidateObserver.h
source/RobotAPI/gui-plugins/GraspCandidateViewer/GraspCandidateViewerWidgetController.cpp 3 additions, 3 deletions

...pCandidateViewer/GraspCandidateViewerWidgetController.cpp
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 1 addition, 1 deletion

...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
source/RobotAPI/interface/objectpose/ObjectPoseProvider.ice 1 addition, 1 deletion

source/RobotAPI/interface/objectpose/ObjectPoseProvider.ice
source/RobotAPI/interface/objectpose/object_pose_types.ice 6 additions, 3 deletions

source/RobotAPI/interface/objectpose/object_pose_types.ice
source/RobotAPI/interface/observers/GraspCandidateObserverInterface.ice 1 addition, 1 deletion

...I/interface/observers/GraspCandidateObserverInterface.ice
source/RobotAPI/interface/units/GraspCandidateProviderInterface.ice 8 additions, 5 deletions

...otAPI/interface/units/GraspCandidateProviderInterface.ice
source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 1 addition, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
source/RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp 8 additions, 8 deletions

...tAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp
source/RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.h 2 additions, 2 deletions

...botAPI/libraries/ArmarXObjects/aron_conversions/objpose.h
source/RobotAPI/libraries/ArmarXObjects/ice_conversions.cpp 4 additions, 4 deletions

source/RobotAPI/libraries/ArmarXObjects/ice_conversions.cpp
source/RobotAPI/libraries/ArmarXObjects/ice_conversions.h 1 addition, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ice_conversions.h
source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 2 additions, 2 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
source/RobotAPI/libraries/GraspingUtility/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/libraries/GraspingUtility/CMakeLists.txt
source/RobotAPI/libraries/GraspingUtility/GraspCandidateWriter.cpp 0 additions, 2 deletions

...botAPI/libraries/GraspingUtility/GraspCandidateWriter.cpp
source/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp 0 additions, 38 deletions

...e/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp

with 48 additions and 89 deletions

Please register or to comment