Commit 81b6b19a authored 3 years ago by Fabian Reister

Merge remote-tracking branch 'origin/armem/dev' into feature/armem-articulated-object-localizer

parents a12d2f3c d919ba26

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 28 additions, 45 deletions

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 15 additions, 10 deletions

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 2 additions, 0 deletions

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
source/RobotAPI/interface/armem/query.ice 51 additions, 0 deletions

source/RobotAPI/interface/armem/query.ice
source/RobotAPI/libraries/armem/client/query/query_fns.h 31 additions, 1 deletion

source/RobotAPI/libraries/armem/client/query/query_fns.h
source/RobotAPI/libraries/armem/client/query/selectors.cpp 26 additions, 0 deletions

source/RobotAPI/libraries/armem/client/query/selectors.cpp
source/RobotAPI/libraries/armem/client/query/selectors.h 4 additions, 0 deletions

source/RobotAPI/libraries/armem/client/query/selectors.h
source/RobotAPI/libraries/armem/core/Time.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem/core/Time.h
source/RobotAPI/libraries/armem/server/query_proc/base/EntityQueryProcessorBase.h 140 additions, 2 deletions

...s/armem/server/query_proc/base/EntityQueryProcessorBase.h
source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 1 addition, 1 deletion

...raries/armem_objects/client/articulated_object/Reader.cpp
source/RobotAPI/libraries/armem_objects/server/articulated_object_instance/Visu.cpp 1 addition, 1 deletion

...armem_objects/server/articulated_object_instance/Visu.cpp
source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp 2 additions, 2 deletions

...RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp 4 additions, 4 deletions

...armem_robot_state/client/localization/TransformReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.h 1 addition, 1 deletion

...s/armem_robot_state/client/localization/TransformReader.h
source/RobotAPI/libraries/armem_robot_state/client/localization/TransformWriter.cpp 5 additions, 3 deletions

...armem_robot_state/client/localization/TransformWriter.cpp
source/RobotAPI/libraries/armem_robot_state/client/localization/interfaces.h 1 addition, 1 deletion

...raries/armem_robot_state/client/localization/interfaces.h
source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.cpp 141 additions, 116 deletions

...armem_robot_state/common/localization/TransformHelper.cpp
source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.h 13 additions, 13 deletions

...s/armem_robot_state/common/localization/TransformHelper.h
source/RobotAPI/libraries/armem_robot_state/server/description/Segment.cpp 1 addition, 1 deletion

...ibraries/armem_robot_state/server/description/Segment.cpp
source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp 3 additions, 3 deletions

...braries/armem_robot_state/server/localization/Segment.cpp

with 471 additions and 205 deletions

Please register or to comment