From 414f1ac2e7322211c45273cec12454187b26c32d Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 22 Mar 2022 14:14:34 +0100
Subject: [PATCH] Update usage of time in armem_gui
---
.../RobotAPI/libraries/armem_gui/MemoryViewer.cpp | 2 +-
.../armem_gui/instance/MemoryIDTreeWidgetItem.cpp | 2 +-
.../display_visitors/TypedDataDisplayVisitor.cpp | 2 +-
.../tree_visitors/TreeTypedDataVisitor.cpp | 2 +-
.../tree_visitors/TreeTypedJSONConverter.cpp | 2 +-
.../libraries/armem_gui/memory/TreeWidget.cpp | 4 ++--
.../armem_gui/query_widgets/SnapshotForm.cpp | 14 +++++++-------
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index 318329d8e..41a66a012 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -234,7 +234,7 @@ namespace armarx::armem::gui
void MemoryViewer::commit()
{
TIMING_START(Commit);
- auto now = armem::Time::now();
+ auto now = armem::Time::Now();
const std::string memoryIDStr = memoryGroup->commitWidget()->getMemoryID();
const std::string aronJSONStr = memoryGroup->commitWidget()->getAronJSON();
diff --git a/source/RobotAPI/libraries/armem_gui/instance/MemoryIDTreeWidgetItem.cpp b/source/RobotAPI/libraries/armem_gui/instance/MemoryIDTreeWidgetItem.cpp
index ebb4473bb..5cde16500 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/MemoryIDTreeWidgetItem.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/MemoryIDTreeWidgetItem.cpp
@@ -36,7 +36,7 @@ namespace armarx::armem::gui::instance
static const char* mu = "\u03BC";
std::stringstream ss;
ss << toDateTimeMilliSeconds(id.timestamp)
- << " (" << id.timestamp.toMicroSeconds() << " " << mu << "s)";
+ << " (" << id.timestamp.toMicroSecondsSinceEpoch() << " " << mu << "s)";
child(4)->setText(valueColumn, QString::fromStdString(ss.str()));
}
}
diff --git a/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp b/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
index 6a132629b..eed9bb9ef 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/display_visitors/TypedDataDisplayVisitor.cpp
@@ -87,7 +87,7 @@ namespace armarx::aron
void TypedDataDisplayVisitor::visitTime(const data::VariantPtr& data, const type::VariantPtr& type)
{
auto l = data::Long::DynamicCastAndCheck(data);
- armem::Time time = armem::Time::microSeconds(l->getValue());
+ armem::Time time { armem::Duration::MicroSeconds(l->getValue()) };
value << armem::toDateTimeMilliSeconds(time);
}
diff --git a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedDataVisitor.cpp b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedDataVisitor.cpp
index 3a3a3b4d6..bc8c27104 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedDataVisitor.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedDataVisitor.cpp
@@ -24,7 +24,7 @@ namespace armarx::armem::gui::instance
void TreeTypedDataVisitor::streamValueText(const aron::data::Long& data, const aron::type::Time& type, std::stringstream& ss) const
{
(void) type;
- armem::Time time = armem::Time::microSeconds(data.getValue());
+ armem::Time time { armem::Duration::MicroSeconds(data.getValue()) };
armem::toDateTimeMilliSeconds(time);
ss << armem::toDateTimeMilliSeconds(time);
}
diff --git a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp
index f80717342..950f034f8 100644
--- a/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp
+++ b/source/RobotAPI/libraries/armem_gui/instance/tree_visitors/TreeTypedJSONConverter.cpp
@@ -275,7 +275,7 @@ namespace armarx::armem::gui::instance
{
const std::string key = elementData->getPath().getLastElement();
int64_t l = *aron::data::Long::DynamicCastAndCheck(elementData);
- armem::Time time = armem::Time::microSeconds(l);
+ armem::Time time { armem::Duration::MicroSeconds(l) };
insertIntoJSON(key, l);
if (!jsonStack.top().second.is_array())
{
diff --git a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
index 858c932bd..f5ec0c913 100644
--- a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
+++ b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
@@ -116,12 +116,12 @@ namespace armarx::armem::gui::memory
snapshotBuilder.setMakeItemFn([this](const wm::EntitySnapshot & snapshot)
{
QTreeWidgetItem* item = makeItem(toDateTimeMilliSeconds(snapshot.time()), snapshot);
- item->setData(int(Columns::KEY), Qt::ItemDataRole::UserRole, QVariant(static_cast<qlonglong>(snapshot.time().toMicroSeconds())));
+ item->setData(int(Columns::KEY), Qt::ItemDataRole::UserRole, QVariant(static_cast<qlonglong>(snapshot.time().toMicroSecondsSinceEpoch())));
return item;
});
snapshotBuilder.setCompareFn([](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * item)
{
- return armarx::detail::compare(static_cast<qlonglong>(snapshot.time().toMicroSeconds()),
+ return armarx::detail::compare(static_cast<qlonglong>(snapshot.time().toMicroSecondsSinceEpoch()),
item->data(int(Columns::KEY), Qt::ItemDataRole::UserRole).toLongLong());
});
snapshotBuilder.setUpdateItemFn([this](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * snapshotItem)
diff --git a/source/RobotAPI/libraries/armem_gui/query_widgets/SnapshotForm.cpp b/source/RobotAPI/libraries/armem_gui/query_widgets/SnapshotForm.cpp
index 1d6c0cff3..e6ed6aaaf 100644
--- a/source/RobotAPI/libraries/armem_gui/query_widgets/SnapshotForm.cpp
+++ b/source/RobotAPI/libraries/armem_gui/query_widgets/SnapshotForm.cpp
@@ -99,9 +99,9 @@ namespace armarx::armem::gui
void SnapshotFormSingle::fillEntitySelector(client::query::SnapshotSelector& selector)
{
const Time time = latest->isChecked()
- ? Time::microSeconds(-1)
- : (Time::seconds(dateTime->dateTime().toSecsSinceEpoch()))
- + Time::microSeconds(microseconds->value());
+ ? Time::Invalid()
+ : (Time(Duration::Seconds(dateTime->dateTime().toSecsSinceEpoch()))
+ + Duration::MicroSeconds(microseconds->value()));
selector.atTime(time);
}
@@ -152,17 +152,17 @@ namespace armarx::armem::gui
void SnapshotFormTimeRange::fillEntitySelector(client::query::SnapshotSelector& selector)
{
- Time defaults = Time::microSeconds(-1);
+ Time defaults = Time::Invalid();
Time min = defaults, max = defaults;
if (!fromBegin->isChecked())
{
- min = Time::milliSeconds(fromDateTime->dateTime().toMSecsSinceEpoch());
+ min = Time(Duration::MilliSeconds(fromDateTime->dateTime().toMSecsSinceEpoch()));
}
if (!toEnd->isChecked())
{
- max = Time::milliSeconds(toDateTime->dateTime().toMSecsSinceEpoch())
- + Time::microSeconds(int(1e6) - 1);
+ max = Time(Duration::MilliSeconds(toDateTime->dateTime().toMSecsSinceEpoch()))
+ + Duration::MicroSeconds(int(1e6) - 1);
}
selector.timeRange(min, max);
--
GitLab