diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp index 56f207e7e966a89f2c572b75d25e67ce41c22eca..a2cabd58bd92564c68374f0bf61ab06ef5990135 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp +++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.cpp @@ -5,7 +5,7 @@ namespace armarx::armem::base { void EntityInstanceMetadata::access() const { - accessed++; + numAccessed++; lastAccessedTime = armarx::core::time::DateTime::Now(); } @@ -25,7 +25,7 @@ std::ostream& armarx::armem::base::operator<<(std::ostream& os, const EntityInst << "\n - t_referenced = \t" << armem::toStringMicroSeconds(d.referencedTime) << " us" << "\n - t_sent = \t" << armem::toStringMicroSeconds(d.sentTime) << " us" << "\n - t_arrived = \t" << armem::toStringMicroSeconds(d.arrivedTime) << " us" - << "\n - t_accessed = \t" << armem::toStringMicroSeconds(d.lastAccessedTime) << " us (" << d.accessed << ")" + << "\n - t_accessed = \t" << armem::toStringMicroSeconds(d.lastAccessedTime) << " us (" << d.numAccessed << ")" << "\n - confidence = \t" << d.confidence << " us" ; return os; diff --git a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h index 9e9fbdbc9b93f8b23f5f48662b75fe2a14d5aca8..5839641f89ddedf8c6748a448a5dce9e22ee911d 100644 --- a/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h +++ b/source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h @@ -62,11 +62,11 @@ namespace armarx::armem::base /// An optional confidence, may be used for things like decay. float confidence = 1.0; - /// An optional value indicating the last access + /// An optional value indicating the time of last access. mutable Time lastAccessedTime = Time::Invalid(); - /// A counter how often the instance has been accessed - mutable unsigned long accessed = 0; + /// A counter how often the instance has been accessed. + mutable unsigned long numAccessed = 0; virtual ~EntityInstanceMetadata() = default; diff --git a/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp b/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp index af2dfbcfa6aff25134093eca04f1c7d9d235793e..42620f2d928b91f7941600315a9970b16111618c 100644 --- a/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp +++ b/source/RobotAPI/libraries/armem/core/base/ice_conversions.cpp @@ -60,7 +60,7 @@ namespace armarx::armem toIce(ice.referencedTime, metadata.referencedTime); toIce(ice.sentTime, metadata.sentTime); toIce(ice.lastAccessedTime, metadata.lastAccessedTime); - ice.accessed = metadata.accessed; + ice.accessed = metadata.numAccessed; } void base::fromIce(const data::EntityInstanceMetadata& ice, EntityInstanceMetadata& metadata) { @@ -69,7 +69,7 @@ namespace armarx::armem fromIce(ice.referencedTime, metadata.referencedTime); fromIce(ice.sentTime, metadata.sentTime); fromIce(ice.lastAccessedTime, metadata.lastAccessedTime); - metadata.accessed = ice.accessed; + metadata.numAccessed = ice.accessed; } diff --git a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp index 025eb36ccea276b870ea88605bccbd655c46428c..1c7a40faed6b57b15bcd0a4ddd8677b103e8670d 100644 --- a/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp +++ b/source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp @@ -114,7 +114,7 @@ namespace armarx::armem::gui::instance armem::toDateTimeMilliSeconds(metadata.referencedTime), armem::toDateTimeMilliSeconds(metadata.sentTime), armem::toDateTimeMilliSeconds(metadata.arrivedTime), - armem::toDateTimeMilliSeconds(metadata.lastAccessedTime) + " (" + std::to_string(metadata.accessed) + " times total)" + armem::toDateTimeMilliSeconds(metadata.lastAccessedTime) + " (" + std::to_string(metadata.numAccessed) + " times total)" }; ARMARX_CHECK_EQUAL(static_cast<size_t>(treeItemMetadata->childCount()), items.size()); int i = 0;