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
0ed7bb59
Commit
0ed7bb59
authored
2 years ago
by
Rainer Kartmann
Browse files
Options
Downloads
Patches
Plain Diff
Use armarx::core::time::dto::DateTime in ice types
parent
86445bac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!228
Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/interface/armem/commit.ice
+3
-3
3 additions, 3 deletions
source/RobotAPI/interface/armem/commit.ice
source/RobotAPI/interface/armem/memory.ice
+7
-5
7 additions, 5 deletions
source/RobotAPI/interface/armem/memory.ice
with
10 additions
and
8 deletions
source/RobotAPI/interface/armem/commit.ice
+
3
−
3
View file @
0ed7bb59
...
...
@@ -34,10 +34,10 @@ module armarx
{
armem
::
data
::
MemoryID
entityID
;
aron
::
data
::
dto
::
AronDictSeq
instancesData
;
long
timeCreatedMicroSeconds
;
armarx
::
core
::
time
::
dto
::
DateTime
timeCreated
;
float
confidence
=
1
.
0
;
long
timeSentMicroSeconds
=
-
1
;
armarx
::
core
::
time
::
dto
::
DateTime
timeSent
;
};
sequence
<
EntityUpdate
>
EntityUpdateList
;
...
...
@@ -46,7 +46,7 @@ module armarx
bool
success
=
false
;
armem
::
data
::
MemoryID
snapshotID
;
long
timeArrivedMicroSeconds
;
armarx
::
core
::
time
::
dto
::
DateTime
timeArrived
;
string
errorMessage
;
};
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/interface/armem/memory.ice
+
7
−
5
View file @
0ed7bb59
#pragma once
#include
<ArmarXCore/interface/core/time.ice>
#include
<RobotAPI/interface/aron.ice>
...
...
@@ -15,7 +17,7 @@ module armarx
string
coreSegmentName
=
""
;
string
providerSegmentName
=
""
;
string
entityName
=
""
;
long
timestampMicroSeconds
=
-
1
;
armarx
::
core
::
time
::
dto
::
DateTime
timestamp
;
int
instanceIndex
=
-
1
;
}
...
...
@@ -36,9 +38,9 @@ module armarx
/// Ice Twin of `armarx::armem::EntityInstanceMetadata`.
class
EntityInstanceMetadata
{
long
timeCreatedMicroSeconds
;
long
timeSentMicroSeconds
;
long
timeArrivedMicroSeconds
;
armarx
::
core
::
time
::
dto
::
DateTime
timeCreated
;
armarx
::
core
::
time
::
dto
::
DateTime
timeSent
;
armarx
::
core
::
time
::
dto
::
DateTime
timeArrived
;
float
confidence
=
1
.
0
;
};
...
...
@@ -57,7 +59,7 @@ module armarx
{
EntityInstanceSeq
instances
;
};
dictionary
<
long
,
EntitySnapshot
>
EntityHistory
;
dictionary
<
armarx
::
core
::
time
::
dto
::
DateTime
,
EntitySnapshot
>
EntityHistory
;
/// Ice Twin of `armarx::armem::Entity`.
...
...
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