Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

4fdf1587

Commit 4fdf1587 authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'armem_gui/allow_load_inactive_memories_ltm' into 'master'

Allow loading of LTM exports to the Viewer, although the memory servers have not been started

See merge request !326

parents e2fc243b 532a6412

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/core/base/MemoryBase.h 10 additions, 15 deletions

source/RobotAPI/libraries/armem/core/base/MemoryBase.h
source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp 5 additions, 0 deletions

...API/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h 1 addition, 0 deletions

...otAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
source/RobotAPI/libraries/armem/server/plugins/Plugin.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem/server/plugins/Plugin.h
source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp 34 additions, 19 deletions

source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
source/RobotAPI/libraries/armem_gui/MemoryViewer.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem_gui/MemoryViewer.h
source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp 8 additions, 7 deletions

source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
source/RobotAPI/libraries/armem_gui/disk/ControlWidget.h 3 additions, 2 deletions

source/RobotAPI/libraries/armem_gui/disk/ControlWidget.h
source/RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.cpp 28 additions, 1 deletion

...obotAPI/libraries/armem_gui/query_widgets/QueryWidget.cpp
source/RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.h 10 additions, 1 deletion

.../RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.h

with 101 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment