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
Merge requests
!228
Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time"
84-use-armarx-time-as-armem-time-instead-of-iceutil-time
into
master
Overview
16
Commits
24
Pipelines
0
Changes
7
All threads resolved!
Hide all comments
Merged
Rainer Kartmann
requested to merge
84-use-armarx-time-as-armem-time-instead-of-iceutil-time
into
master
3 years ago
Overview
16
Commits
24
Pipelines
0
Changes
7
All threads resolved!
Hide all comments
Expand
Closes
#84 (closed)
Edited
3 years ago
by
Rainer Kartmann
0
0
Merge request reports
Viewing commit
414f1ac2
Prev
Next
Show latest version
7 files
+
14
−
14
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
7
Search (e.g. *.vue) (Ctrl+P)
414f1ac2
Update usage of time in armem_gui
· 414f1ac2
Rainer Kartmann
authored
3 years ago
source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
+
1
−
1
Options
@@ -87,7 +87,7 @@ namespace armarx::aron
void
TypedDataDisplayVisitor
::
visitTime
(
const
data
::
VariantPtr
&
data
,
const
type
::
VariantPtr
&
type
)
{
auto
l
=
data
::
Long
::
DynamicCastAndCheck
(
data
);
armem
::
Time
time
=
armem
::
Time
::
m
icroSeconds
(
l
->
getValue
());
armem
::
Time
time
{
armem
::
Duration
::
M
icroSeconds
(
l
->
getValue
())
}
;
value
<<
armem
::
toDateTimeMilliSeconds
(
time
);
}
Loading