Skip to content
Snippets Groups Projects
Commit 25808b88 authored by armar4-demo's avatar armar4-demo
Browse files

fixed plotter deadlock

parent 8b0ed802
No related branches found
No related tags found
No related merge requests found
......@@ -243,7 +243,7 @@ namespace armarx
{
logstream << "Timestamp";
for (auto & channel : selectedChannels)
for (auto& channel : selectedChannels)
{
logstream << "," << channel.toStdString();
}
......@@ -448,7 +448,7 @@ namespace armarx
void ArmarXPlotter::plottingPaused(bool toggled)
{
ScopedLock lock(dataMutex);
//ScopedLock lock(dataMutex);
__plottingPaused = toggled;
if (pollingTask)
......@@ -718,7 +718,7 @@ namespace armarx
// ARMARX_IMPORTANT << id;
auto dict = JSONObject::ConvertToBasicVariantMap(json, var);
for (const auto & e : dict)
for (const auto& e : dict)
{
std::string key = id + "." + e.first;
// ARMARX_INFO << key << ": " << *VariantPtr::dynamicCast(e.second);
......@@ -762,7 +762,7 @@ namespace armarx
{
logstream << (time - logStartTime).toMilliSecondsDouble() << ",";
for (auto & channel : selectedChannels)
for (auto& channel : selectedChannels)
{
logstream << dataMaptoAppend.at(channel.toStdString())->Variant::getOutputValueOnly();
if (!selectedChannels.endsWith(channel))
......
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