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
28eaa029
Commit
28eaa029
authored
2 years ago
by
Fabian Tërnava
Browse files
Options
Downloads
Patches
Plain Diff
also rename strings in gui and constantes
parent
e53f8714
No related branches found
No related tags found
1 merge request
!330
Rename time created
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
+1
-1
1 addition, 1 deletion
...RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
+4
-4
4 additions, 4 deletions
source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
with
5 additions
and
5 deletions
source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp
+
1
−
1
View file @
28eaa029
...
...
@@ -16,7 +16,7 @@ namespace armarx::armem::base
std
::
ostream
&
armarx
::
armem
::
base
::
operator
<<
(
std
::
ostream
&
os
,
const
EntityInstanceMetadata
&
d
)
{
os
<<
"EntityInstanceMetadata: "
<<
"
\n
- t_
c
re
ate
=
\t
"
<<
armem
::
toStringMicroSeconds
(
d
.
referencedTime
)
<<
" us"
<<
"
\n
- t_re
ferenced
=
\t
"
<<
armem
::
toStringMicroSeconds
(
d
.
referencedTime
)
<<
" us"
<<
"
\n
- t_sent =
\t
"
<<
armem
::
toStringMicroSeconds
(
d
.
sentTime
)
<<
" us"
<<
"
\n
- t_arrived =
\t
"
<<
armem
::
toStringMicroSeconds
(
d
.
arrivedTime
)
<<
" us"
<<
"
\n
- confidence =
\t
"
<<
d
.
confidence
<<
" us"
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/armem/core/wm/aron_conversions.cpp
+
4
−
4
View file @
28eaa029
...
...
@@ -6,7 +6,7 @@
namespace
armarx
::
armem
{
constexpr
const
char
*
DATA_WRAPPER_TIME_STORED_FIELD
=
"__WRITER_METADATA__TIME_STORED"
;
constexpr
const
char
*
DATA_WRAPPER_TIME_
CREAT
ED_FIELD
=
"__ENTITY_METADATA__TIME_
CREAT
ED"
;
constexpr
const
char
*
DATA_WRAPPER_TIME_
REFERENC
ED_FIELD
=
"__ENTITY_METADATA__TIME_
REFERENC
ED"
;
constexpr
const
char
*
DATA_WRAPPER_TIME_SENT_FIELD
=
"__ENTITY_METADATA__TIME_SENT"
;
constexpr
const
char
*
DATA_WRAPPER_TIME_ARRIVED_FIELD
=
"__ENTITY_METADATA__TIME_ARRIVED"
;
constexpr
const
char
*
DATA_WRAPPER_CONFIDENCE_FIELD
=
"__ENTITY_METADATA__CONFIDENCE"
;
...
...
@@ -22,7 +22,7 @@ void armarx::armem::from_aron(const aron::data::DictPtr& metadata, const aron::d
e
.
data
()
=
data
;
auto
referencedTime
=
aron
::
data
::
Long
::
DynamicCastAndCheck
(
metadata
->
getElement
(
DATA_WRAPPER_TIME_
CREAT
ED_FIELD
));
auto
referencedTime
=
aron
::
data
::
Long
::
DynamicCastAndCheck
(
metadata
->
getElement
(
DATA_WRAPPER_TIME_
REFERENC
ED_FIELD
));
m
.
referencedTime
=
Time
(
Duration
::
MicroSeconds
(
referencedTime
->
toAronLongDTO
()
->
value
));
auto
timeSent
=
aron
::
data
::
Long
::
DynamicCastAndCheck
(
metadata
->
getElement
(
DATA_WRAPPER_TIME_SENT_FIELD
));
...
...
@@ -46,9 +46,9 @@ void armarx::armem::to_aron(aron::data::DictPtr& metadata, aron::data::DictPtr&
metadata
->
addElement
(
DATA_WRAPPER_TIME_STORED_FIELD
,
timeWrapped
);
const
wm
::
EntityInstanceMetadata
&
m
=
e
.
metadata
();
auto
referencedTime
=
std
::
make_shared
<
aron
::
data
::
Long
>
(
armarx
::
aron
::
Path
(
std
::
vector
<
std
::
string
>
{
DATA_WRAPPER_TIME_
CREAT
ED_FIELD
}));
auto
referencedTime
=
std
::
make_shared
<
aron
::
data
::
Long
>
(
armarx
::
aron
::
Path
(
std
::
vector
<
std
::
string
>
{
DATA_WRAPPER_TIME_
REFERENC
ED_FIELD
}));
referencedTime
->
setValue
(
m
.
referencedTime
.
toMicroSecondsSinceEpoch
());
metadata
->
addElement
(
DATA_WRAPPER_TIME_
CREAT
ED_FIELD
,
referencedTime
);
metadata
->
addElement
(
DATA_WRAPPER_TIME_
REFERENC
ED_FIELD
,
referencedTime
);
auto
timeSent
=
std
::
make_shared
<
aron
::
data
::
Long
>
(
armarx
::
aron
::
Path
(
std
::
vector
<
std
::
string
>
{
DATA_WRAPPER_TIME_SENT_FIELD
}));
timeSent
->
setValue
(
m
.
sentTime
.
toMicroSecondsSinceEpoch
());
...
...
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