Skip to content
Snippets Groups Projects
Commit cb8b672b authored by Clemens Wallrath's avatar Clemens Wallrath
Browse files

Makes ArmarXPlotter follow Timeserver time

Notably it won't continue scrolling when the time is stopped
parent e6fe0c78
No related branches found
No related tags found
1 merge request!4Timeserver
...@@ -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 = IceUtil::Time::now(); IceUtil::Time curTime = TimeUtil::GetTime();
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 = IceUtil::Time::now(); auto now = TimeUtil::GetTime();
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 = IceUtil::Time::now(); IceUtil::Time time = TimeUtil::GetTime();
map<string, DataFieldIdentifierBaseList >::iterator it = channelsSplittedByObserver.begin(); map<string, DataFieldIdentifierBaseList >::iterator it = channelsSplittedByObserver.begin();
try try
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment