-
- Downloads
Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
# Conflicts: # source/RobotAPI/libraries/aron/aroncore/io/AronDataIO/classReaders/AronDataNavigatorReader/AronDataNavigatorReaderToken.h
Showing
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.cpp 28 additions, 39 deletions...llers/NJointHolonomicPlatformGlobalPositionController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h 11 additions, 5 deletions...rollers/NJointHolonomicPlatformGlobalPositionController.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui 288 additions, 288 deletions.../gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 14 additions, 46 deletions...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 2 additions, 0 deletions...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
- source/RobotAPI/libraries/armem/component/IceMemory.cpp 7 additions, 4 deletionssource/RobotAPI/libraries/armem/component/IceMemory.cpp
- source/RobotAPI/libraries/armem/component/IceMemory.h 1 addition, 0 deletionssource/RobotAPI/libraries/armem/component/IceMemory.h
- source/RobotAPI/libraries/armem/component/MemoryRemoteGui.cpp 1 addition, 1 deletion...ce/RobotAPI/libraries/armem/component/MemoryRemoteGui.cpp
- source/RobotAPI/libraries/armem/component/RemoteGuiAronDataVisitor.cpp 2 additions, 2 deletions...PI/libraries/armem/component/RemoteGuiAronDataVisitor.cpp
- source/RobotAPI/libraries/armem/memory/CoreSegment.cpp 7 additions, 5 deletionssource/RobotAPI/libraries/armem/memory/CoreSegment.cpp
- source/RobotAPI/libraries/armem/memory/Entity.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem/memory/Entity.cpp
- source/RobotAPI/libraries/armem/memory/EntityInstance.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/armem/memory/EntityInstance.cpp
- source/RobotAPI/libraries/armem/memory/Memory.cpp 4 additions, 4 deletionssource/RobotAPI/libraries/armem/memory/Memory.cpp
- source/RobotAPI/libraries/armem/memory/ProviderSegment.cpp 6 additions, 6 deletionssource/RobotAPI/libraries/armem/memory/ProviderSegment.cpp
- source/RobotAPI/libraries/armem_gui/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/armem_gui/CMakeLists.txt
- source/RobotAPI/libraries/armem_gui/InstanceTreeWidget.cpp 89 additions, 0 deletionssource/RobotAPI/libraries/armem_gui/InstanceTreeWidget.cpp
- source/RobotAPI/libraries/armem_gui/InstanceTreeWidget.h 50 additions, 0 deletionssource/RobotAPI/libraries/armem_gui/InstanceTreeWidget.h
- source/RobotAPI/libraries/armem_gui/MemoryTreeWidget.cpp 4 additions, 5 deletionssource/RobotAPI/libraries/armem_gui/MemoryTreeWidget.cpp
- source/RobotAPI/libraries/armem_gui/MemoryTreeWidget.h 3 additions, 5 deletionssource/RobotAPI/libraries/armem_gui/MemoryTreeWidget.h
- source/RobotAPI/libraries/armem_gui/QTreeWidgetAronDataVisitor.cpp 16 additions, 6 deletions...botAPI/libraries/armem_gui/QTreeWidgetAronDataVisitor.cpp
Loading
Please register or sign in to comment