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
1b203568
Commit
1b203568
authored
2 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Update usage of deprecated functions
parent
c6f9cbe2
Branches
deprecate-functions
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!232
Armar3 wrl obj meshes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/armem/client/Query.cpp
+13
-7
13 additions, 7 deletions
source/RobotAPI/libraries/armem/client/Query.cpp
source/RobotAPI/libraries/armem/client/query/selectors.cpp
+3
-0
3 additions, 0 deletions
source/RobotAPI/libraries/armem/client/query/selectors.cpp
with
16 additions
and
7 deletions
source/RobotAPI/libraries/armem/client/Query.cpp
+
13
−
7
View file @
1b203568
#include
"Query.h"
#include
<ArmarXCore/core/ice_conversions.h>
#include
<RobotAPI/libraries/armem/core/wm/ice_conversions.h>
#include
<RobotAPI/libraries/armem/core/ice_conversions_templates.h>
namespace
armarx
::
armem
::
client
{
using
armarx
::
fromIce
;
using
armarx
::
toIce
;
QueryInput
QueryInput
::
fromIce
(
const
armem
::
query
::
data
::
Input
&
ice
)
{
return
arm
em
::
fromIce
<
QueryInput
>
(
ice
);
return
arm
arx
::
fromIce
<
QueryInput
>
(
ice
);
}
armem
::
query
::
data
::
Input
QueryInput
::
toIce
()
const
{
return
arm
em
::
toIce
<
armem
::
query
::
data
::
Input
>
(
*
this
);
return
arm
arx
::
toIce
<
armem
::
query
::
data
::
Input
>
(
*
this
);
}
QueryResult
QueryResult
::
fromIce
(
const
armem
::
query
::
data
::
Result
&
ice
)
{
return
arm
em
::
fromIce
<
QueryResult
>
(
ice
);
return
arm
arx
::
fromIce
<
QueryResult
>
(
ice
);
}
armem
::
query
::
data
::
Result
QueryResult
::
toIce
()
const
{
return
arm
em
::
toIce
<
armem
::
query
::
data
::
Result
>
(
*
this
);
return
arm
arx
::
toIce
<
armem
::
query
::
data
::
Result
>
(
*
this
);
}
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
QueryResult
&
rhs
)
...
...
@@ -41,7 +47,7 @@ namespace armarx::armem
void
client
::
toIce
(
armem
::
query
::
data
::
Input
&
ice
,
const
QueryInput
&
input
)
{
ice
.
memoryQueries
=
input
.
memoryQueries
;
ice
.
withData
=
(
input
.
dataMode
==
DataMode
::
WithData
);
toIce
(
ice
.
withData
,
(
input
.
dataMode
==
DataMode
::
WithData
)
)
;
}
void
client
::
fromIce
(
const
armem
::
query
::
data
::
Input
&
ice
,
QueryInput
&
input
)
...
...
@@ -53,13 +59,13 @@ namespace armarx::armem
void
client
::
toIce
(
armem
::
query
::
data
::
Result
&
ice
,
const
QueryResult
&
result
)
{
toIce
(
ice
,
dynamic_cast
<
const
detail
::
SuccessHeader
&>
(
result
));
armarx
::
armem
::
toIce
(
ice
.
memory
,
result
.
memory
);
toIce
(
ice
.
memory
,
result
.
memory
);
}
void
client
::
fromIce
(
const
armem
::
query
::
data
::
Result
&
ice
,
QueryResult
&
result
)
{
fromIce
(
ice
,
dynamic_cast
<
detail
::
SuccessHeader
&>
(
result
));
armarx
::
armem
::
fromIce
(
ice
.
memory
,
result
.
memory
);
fromIce
(
ice
.
memory
,
result
.
memory
);
}
}
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem/client/query/selectors.cpp
+
3
−
0
View file @
1b203568
#include
"selectors.h"
#include
<ArmarXCore/core/ice_conversions.h>
#include
<ArmarXCore/core/time/ice_conversions.h>
#include
<RobotAPI/libraries/armem/core/ice_conversions.h>
...
...
@@ -74,6 +75,8 @@ namespace armarx::armem::client::query
SnapshotSelector
&
SnapshotSelector
::
beforeTime
(
Time
timestamp
,
long
maxEntries
)
{
using
armarx
::
toIce
;
auto
&
q
=
_addQuery
<
dq
::
entity
::
BeforeTime
>
();
toIce
(
q
.
timestamp
,
timestamp
);
toIce
(
q
.
maxEntries
,
maxEntries
);
...
...
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