Memory structure changes, query_proc structure changes (Base classes / templated) (!136) · Merge requests · Software / ArmarX / RobotAPI

Merged Fabian Tërnava requested to merge feature/diskMemory into armem/dev 3 years ago

Apr 27, 2021
- Add test code · d8d6f8b6
  Rainer Kartmann authored 3 years ago
  
  d8d6f8b6
- Update usages of id() and aronType() · 08228568
  Rainer Kartmann authored 3 years ago
  
  08228568
- Fix names in MemoryToIceAdapter · 5a65fd97
  Rainer Kartmann authored 3 years ago
  
  5a65fd97
- Make id and container protected (like before), make class-typedefs consistent · eef51d59
  Rainer Kartmann authored 3 years ago
  
  Move code from MemoryID to cpp Make spacing nicer and consistent Make Entity derive from MaxHistorySize
  eef51d59
- Use non-underscored typenames · d43c3ba1
  Rainer Kartmann authored 3 years ago
  
  d43c3ba1
- Autoformatting · 25756dec
  Rainer Kartmann authored 3 years ago
  
  25756dec
- Merge branch 'armem/dev' into feature/diskMemory · 6fc0f91b
  Rainer Kartmann authored 3 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp # source/RobotAPI/libraries/aron/core/CMakeLists.txt
  6fc0f91b
Apr 26, 2021
- fixed building error with templates · 2fc95883
  Fabian Tërnava authored 3 years ago
  
  2fc95883
- added cpp files for header only classes · 57edd372
  Fabian Tërnava authored 3 years ago
  
  57edd372
- renamed stuff, added namespaces to base classes, shortened namespaces of... · f19c2286
  Fabian Tërnava authored 3 years ago
  
  renamed stuff, added namespaces to base classes, shortened namespaces of memories, fixed robotsensormemory memory name
  f19c2286
Apr 23, 2021
- fixed build error · c2c34065
  Fabian Tërnava authored 3 years ago
  
  c2c34065
- memory export at file system · 9cb51b58
  Fabian Tërnava authored 3 years ago
  
  9cb51b58
Apr 22, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory · 6b35aab7
  Fabian Tërnava authored 3 years ago
  
  # Conflicts: # source/RobotAPI/libraries/aron/core/CMakeLists.txt
  6b35aab7
- fixes button "store in LTM" error · 715e6727
  Fabian Tërnava authored 3 years ago
  
  715e6727
- changes to query proc · cd45220d
  Fabian Tërnava authored 3 years ago
  
  cd45220d
Apr 21, 2021
- fixes build issues with new memory · fb4a3bfa
  Fabian Tërnava authored 3 years ago
  
  fb4a3bfa
Apr 19, 2021
- WOrking Memory updates, new namespaces for wm and ltm, updated scenarios,... · 4c162bdb
  Fabian Tërnava authored 3 years ago
  
  WOrking Memory updates, new namespaces for wm and ltm, updated scenarios, adapted all dependent code. First compiling version
  4c162bdb
Apr 15, 2021

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory · 24e9d738

Fabian Tërnava authored 3 years ago

# Conflicts:
#	source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/complex/NDArray.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/container/Dict.cpp
#	source/RobotAPI/libraries/aron/core/navigator/data/container/List.cpp
#	source/RobotAPI/libraries/aron/core/navigator/type/NavigatorFactory.cpp

24e9d738

Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory · e3997593
Fabian Tërnava authored 3 years ago

e3997593

Mar 30, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory · d94f19a5
  Fabian Tërnava authored 4 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp # source/RobotAPI/libraries/armem_gui/MemoryViewer.h
  d94f19a5
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into feature/diskMemory · 7cfe05a1
  Fabian Tërnava authored 4 years ago
  
  7cfe05a1
Mar 22, 2021

implemented diskMemory (better version than before), switched to enum class... · de66029d

Fabian Tërnava authored 4 years ago

implemented diskMemory (better version than before), switched to enum class for aron descriptors, added ltm controls to memory viewer gui

de66029d

Memory structure changes, query_proc structure changes (Base classes / templated)

Merge request reports

Activity