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
cb8b672b
Commit
cb8b672b
authored
9 years ago
by
Clemens Wallrath
Browse files
Options
Downloads
Patches
Plain Diff
Makes ArmarXPlotter follow Timeserver time
Notably it won't continue scrolling when the time is stopped
parent
e6fe0c78
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!4
Timeserver
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
+6
-5
6 additions, 5 deletions
.../SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
with
6 additions
and
5 deletions
source/RobotAPI/gui-plugins/SensorActorWidgetsPlugin/ArmarXPlotter/ArmarXPlotter.cpp
+
6
−
5
View file @
cb8b672b
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#include
"ArmarXPlotter.h"
#include
"ArmarXPlotter.h"
#include
"ArmarXPlotterDialog.h"
#include
"ArmarXPlotterDialog.h"
#include
<ArmarXCore/core/time/TimeUtil.h>
#include
<ArmarXCore/observers/ObserverObjectFactories.h>
#include
<ArmarXCore/observers/ObserverObjectFactories.h>
#include
<ArmarXCore/observers/variant/DataFieldIdentifier.h>
#include
<ArmarXCore/observers/variant/DataFieldIdentifier.h>
#include
<ArmarXCore/observers/exceptions/local/InvalidChannelException.h>
#include
<ArmarXCore/observers/exceptions/local/InvalidChannelException.h>
...
@@ -293,7 +294,7 @@ namespace armarx
...
@@ -293,7 +294,7 @@ namespace armarx
// int size = shownInterval*1000/updateInterval;
// int size = shownInterval*1000/updateInterval;
GraphDataMap
::
iterator
it
=
dataMap
.
begin
();
GraphDataMap
::
iterator
it
=
dataMap
.
begin
();
IceUtil
::
Time
curTime
=
Ic
eUtil
::
Time
::
now
();
IceUtil
::
Time
curTime
=
Tim
eUtil
::
Get
Time
();
for
(;
it
!=
dataMap
.
end
();
++
it
)
for
(;
it
!=
dataMap
.
end
();
++
it
)
{
{
...
@@ -452,7 +453,7 @@ namespace armarx
...
@@ -452,7 +453,7 @@ namespace armarx
}
}
else
else
{
{
pollingTask
=
new
PeriodicTask
<
ArmarXPlotter
>
(
this
,
&
ArmarXPlotter
::
pollingExec
,
pollingInterval
,
false
,
"DataPollingTask"
);
pollingTask
=
new
PeriodicTask
<
ArmarXPlotter
>
(
this
,
&
ArmarXPlotter
::
pollingExec
,
pollingInterval
,
false
,
"DataPollingTask"
,
false
);
pollingTask
->
start
();
pollingTask
->
start
();
timer
->
start
();
timer
->
start
();
}
}
...
@@ -585,7 +586,7 @@ namespace armarx
...
@@ -585,7 +586,7 @@ namespace armarx
pollingTask
->
stop
();
pollingTask
->
stop
();
}
}
pollingTask
=
new
PeriodicTask
<
ArmarXPlotter
>
(
this
,
&
ArmarXPlotter
::
pollingExec
,
pollingInterval
,
false
,
"DataPollingTask"
);
pollingTask
=
new
PeriodicTask
<
ArmarXPlotter
>
(
this
,
&
ArmarXPlotter
::
pollingExec
,
pollingInterval
,
false
,
"DataPollingTask"
,
false
);
pollingTask
->
start
();
pollingTask
->
start
();
}
}
...
@@ -618,7 +619,7 @@ namespace armarx
...
@@ -618,7 +619,7 @@ namespace armarx
std
::
map
<
std
::
string
,
VariantPtr
>
newData
;
std
::
map
<
std
::
string
,
VariantPtr
>
newData
;
// first clear to old entries
// first clear to old entries
auto
now
=
Ic
eUtil
::
Time
::
now
();
auto
now
=
Tim
eUtil
::
Get
Time
();
GraphDataMap
::
iterator
itmap
=
dataMaptoAppend
.
begin
();
GraphDataMap
::
iterator
itmap
=
dataMaptoAppend
.
begin
();
for
(;
itmap
!=
dataMaptoAppend
.
end
();
++
itmap
)
for
(;
itmap
!=
dataMaptoAppend
.
end
();
++
itmap
)
...
@@ -664,7 +665,7 @@ namespace armarx
...
@@ -664,7 +665,7 @@ namespace armarx
}
}
// now get new data
// now get new data
IceUtil
::
Time
time
=
Ic
eUtil
::
Time
::
now
();
IceUtil
::
Time
time
=
Tim
eUtil
::
Get
Time
();
map
<
string
,
DataFieldIdentifierBaseList
>::
iterator
it
=
channelsSplittedByObserver
.
begin
();
map
<
string
,
DataFieldIdentifierBaseList
>::
iterator
it
=
channelsSplittedByObserver
.
begin
();
try
try
...
...
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