Commit 4f47a3d4 authored 4 years ago by Fabian Reister

Merge branch 'armem/dev' of gitlab.com:ArmarX/RobotAPI into armem/dev

parents c0f13508 31c2e3fb

No related branches found

No related tags found

1 merge request!137Armem/dev

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/robots/Camera/Camera.xml 3 additions, 2 deletions

data/RobotAPI/robots/Camera/Camera.xml
source/RobotAPI/components/ArViz/Coin/VisualizationPointCloud.h 5 additions, 5 deletions

.../RobotAPI/components/ArViz/Coin/VisualizationPointCloud.h
source/RobotAPI/gui-plugins/DebugRobotUnitDataStreaming/DebugRobotUnitDataStreamingWidgetController.cpp 3 additions, 3 deletions

...Streaming/DebugRobotUnitDataStreamingWidgetController.cpp
source/RobotAPI/gui-plugins/DebugRobotUnitDataStreaming/DebugRobotUnitDataStreamingWidgetController.h 6 additions, 5 deletions

...taStreaming/DebugRobotUnitDataStreamingWidgetController.h
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 6 additions, 6 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
source/RobotAPI/libraries/ArmarXObjects/aron_conversions.cpp 1 addition, 1 deletion

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

source/RobotAPI/libraries/ArmarXObjects/aron_conversions.h
source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h 3 additions, 3 deletions

.../RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp 1 addition, 1 deletion

...otAPI/libraries/aron/converter/opencv/OpenCVConverter.cpp
source/RobotAPI/libraries/aron/converter/pcl/PCLConverter.h 1 addition, 1 deletion

source/RobotAPI/libraries/aron/converter/pcl/PCLConverter.h
source/RobotAPI/libraries/aron/core/codegenerator/ReaderInfo.h 10 additions, 10 deletions

...e/RobotAPI/libraries/aron/core/codegenerator/ReaderInfo.h
source/RobotAPI/libraries/aron/core/codegenerator/WriterInfo.h 10 additions, 10 deletions

...e/RobotAPI/libraries/aron/core/codegenerator/WriterInfo.h
source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/SerializerFactory.h 12 additions, 12 deletions

...degenerator/codeWriter/cpp/serializer/SerializerFactory.h
source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/primitive/Primitive.h 1 addition, 1 deletion

...generator/codeWriter/cpp/serializer/primitive/Primitive.h
source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/Reader.cpp 134 additions, 134 deletions

...braries/aron/core/codegenerator/typeReader/xml/Reader.cpp
source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/ReaderFactory.h 7 additions, 7 deletions

...es/aron/core/codegenerator/typeReader/xml/ReaderFactory.h
source/RobotAPI/libraries/aron/core/navigator/data/Navigator.cpp 70 additions, 70 deletions

...RobotAPI/libraries/aron/core/navigator/data/Navigator.cpp
source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.cpp 6 additions, 6 deletions

...I/libraries/aron/core/navigator/data/NavigatorFactory.cpp
source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.h 12 additions, 12 deletions

...API/libraries/aron/core/navigator/data/NavigatorFactory.h
source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp 6 additions, 6 deletions

...PI/libraries/aron/core/navigator/data/complex/NDArray.cpp

with 300 additions and 297 deletions

Please register or to comment