Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
af0341c3
Commit
af0341c3
authored
3 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Update include to ComponentPlugin.h
parent
13731bc4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!185
Clean up interfaces and unneeded code in memory core classes
,
!178
Draft: Make RobotStateMemory ready
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+7
-4
7 additions, 4 deletions
source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+4
-2
4 additions, 2 deletions
source/RobotAPI/libraries/armem/server/ComponentPlugin.h
with
11 additions
and
6 deletions
source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+
7
−
4
View file @
af0341c3
#include
"ComponentPlugin.h"
#include
<ArmarXCore/core/Component.h>
#include
<ArmarXCore/core/exceptions/local/ExpressionException.h>
#include
<RobotAPI/libraries/armem/core/error.h>
...
...
@@ -11,8 +12,7 @@
namespace
armarx
::
armem
::
server
::
plugins
{
ComponentPlugin
::~
ComponentPlugin
()
{}
ComponentPlugin
::~
ComponentPlugin
()
=
default
;
void
ComponentPlugin
::
postCreatePropertyDefinitions
(
PropertyDefinitionsPtr
&
properties
)
...
...
@@ -118,6 +118,8 @@ namespace armarx::armem::server
addPlugin
(
plugin
);
}
ComponentPluginUser
::~
ComponentPluginUser
()
=
default
;
// WRITING
data
::
AddSegmentsResult
ComponentPluginUser
::
addSegments
(
const
data
::
AddSegmentsInput
&
input
,
const
Ice
::
Current
&
)
...
...
@@ -148,7 +150,8 @@ namespace armarx::armem::server
return
iceMemory
.
query
(
input
);
}
// LTM LOADING
// LTM STORING
data
::
StoreResult
ComponentPluginUser
::
store
(
const
data
::
StoreInput
&
input
,
const
Ice
::
Current
&
)
{
std
::
scoped_lock
lock
(
workingMemoryMutex
,
longtermMemoryMutex
);
...
...
@@ -156,7 +159,7 @@ namespace armarx::armem::server
}
// LTM
STOR
ING
// LTM
LOAD
ING
armem
::
query
::
data
::
Result
ComponentPluginUser
::
load
(
const
armem
::
query
::
data
::
Input
&
input
,
const
Ice
::
Current
&
)
{
std
::
scoped_lock
lock
(
longtermMemoryMutex
);
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+
4
−
2
View file @
af0341c3
...
...
@@ -2,7 +2,7 @@
#include
<mutex>
#include
<ArmarXCore/core/Component.h>
#include
<ArmarXCore/core/Component
Plugin
.h>
#include
<RobotAPI/interface/armem/server/MemoryInterface.h>
#include
<RobotAPI/interface/armem/client/MemoryListenerInterface.h>
...
...
@@ -73,7 +73,7 @@ namespace armarx::armem::server
public:
ComponentPluginUser
();
virtual
~
ComponentPluginUser
()
override
=
default
;
virtual
~
ComponentPluginUser
()
override
;
// WritingInterface interface
...
...
@@ -96,6 +96,7 @@ namespace armarx::armem::server
public:
/// The actual memory.
wm
::
Memory
workingMemory
;
std
::
mutex
workingMemoryMutex
;
...
...
@@ -112,6 +113,7 @@ namespace armarx::armem::server
private
:
plugins
::
ComponentPlugin
*
plugin
=
nullptr
;
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment