Commit e8bd802e authored 1 year ago by Fabian Tërnava

Merge branch 'feature/objectReater' into 'master'

Arn/dev and ObjectReader

See merge request !362

parents c06a1aec a0ff550c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/applications/AronCodeGenerator/CMakeLists.txt 1 addition, 1 deletion

...ce/RobotAPI/applications/AronCodeGenerator/CMakeLists.txt
source/RobotAPI/interface/aron/Aron.ice 25 additions, 17 deletions

source/RobotAPI/interface/aron/Aron.ice
source/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp 109 additions, 59 deletions

...e/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp
source/RobotAPI/libraries/PriorKnowledge/core/FinderBase.h 34 additions, 24 deletions

source/RobotAPI/libraries/PriorKnowledge/core/FinderBase.h
source/RobotAPI/libraries/PriorKnowledge/core/FinderInfoBase.h 49 additions, 28 deletions

...e/RobotAPI/libraries/PriorKnowledge/core/FinderInfoBase.h
source/RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.cpp 165 additions, 4 deletions

...obotAPI/libraries/PriorKnowledge/objects/ObjectFinder.cpp
source/RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.h 26 additions, 15 deletions

.../RobotAPI/libraries/PriorKnowledge/objects/ObjectFinder.h
source/RobotAPI/libraries/armem_gui/instance/display_visitors/DataDisplayVisitor.cpp 1 addition, 1 deletion

...rmem_gui/instance/display_visitors/DataDisplayVisitor.cpp
source/RobotAPI/libraries/armem_objects/aron_conversions.cpp 9 additions, 12 deletions

source/RobotAPI/libraries/armem_objects/aron_conversions.cpp
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp 88 additions, 93 deletions

.../libraries/armem_objects/client/instance/ObjectReader.cpp
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.h 19 additions, 123 deletions

...PI/libraries/armem_objects/client/instance/ObjectReader.h
source/RobotAPI/libraries/armem_objects/types.cpp 9 additions, 5 deletions

source/RobotAPI/libraries/armem_objects/types.cpp
source/RobotAPI/libraries/aron/CMakeLists.txt 3 additions, 1 deletion

source/RobotAPI/libraries/aron/CMakeLists.txt
source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt 7 additions, 4 deletions

source/RobotAPI/libraries/aron/codegeneration/CMakeLists.txt
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/container/Object.cpp 63 additions, 45 deletions

...degenerator/codewriter/cpp/generator/container/Object.cpp
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp 34 additions, 60 deletions

...codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Quaternion.cpp 27 additions, 25 deletions

...generator/codewriter/cpp/generator/ndarray/Quaternion.cpp
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Bool.cpp 12 additions, 5 deletions

...codegenerator/codewriter/cpp/generator/primitive/Bool.cpp
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Double.cpp 12 additions, 5 deletions

...degenerator/codewriter/cpp/generator/primitive/Double.cpp
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/primitive/Float.cpp 12 additions, 5 deletions

...odegenerator/codewriter/cpp/generator/primitive/Float.cpp

with 705 additions and 532 deletions

Please register or to comment