From 6fa6dfa46fdac4bc4d1c21021be358d4ec6c534f Mon Sep 17 00:00:00 2001
From: Adrian Knobloch <adrian.knobloch@student.kit.edu>
Date: Fri, 9 Sep 2016 16:16:28 +0200
Subject: [PATCH] Revert "Fix clearing outdated values in history"
This reverts commit 5c96056d9d061a399da689b8c607e9147704afaf.
Changes done in wrong method.
---
.../KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index f741eefd0..a847c5f16 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -1190,18 +1190,15 @@ void KinematicUnitWidgetController::reportJointMotorTemperatures(const NameValue
void KinematicUnitWidgetController::reportJointStatuses(const NameStatusMap& jointStatuses, Ice::Long timestamp, bool aValueChanged, const Ice::Current&)
{
- boost::recursive_mutex::scoped_lock lock(mutexNodeSet);
- if (aValueChanged && jointCurrents.size() > 0)
+ if (!aValueChanged && reportedJointStatuses.size() > 0)
{
- jointCurrentHistory.push_back(std::pair<Ice::Long, NameValueMap>(timestamp, jointCurrents));
+ return;
}
- while (jointCurrentHistory.back().first - jointCurrentHistory.front().first > historyTime && jointCurrentHistory.size() > 1)
- {
- jointCurrentHistory.pop_front();
- }
+ boost::recursive_mutex::scoped_lock lock(mutexNodeSet);
+ reportedJointStatuses = jointStatuses;
- emit jointCurrentsReported();
+ emit jointStatusesReported();
}
--
GitLab