From 8680885eaef2c9eefae6ef316bb12d019f3203b0 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 12 Aug 2021 07:45:40 +0200
Subject: [PATCH] Rename widget builders
---
.../libraries/armem_gui/memory/TreeWidget.cpp | 52 +++++++++----------
.../libraries/armem_gui/memory/TreeWidget.h | 12 ++---
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
index 29c137093..49c9b9807 100644
--- a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
+++ b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
@@ -51,12 +51,12 @@ namespace armarx::armem::gui::memory
void TreeWidget::initBuilders()
{
- workingmemoryBuilder.setExpand(true);
- workingmemoryBuilder.setMakeItemFn([this](const std::string & name, const wm::Memory * memory)
+ memoryBuilder.setExpand(true);
+ memoryBuilder.setMakeItemFn([this](const std::string & name, const wm::Memory * memory)
{
return makeItem(name, *memory);
});
- workingmemoryBuilder.setUpdateItemFn([this](const std::string&, const wm::Memory * memory, QTreeWidgetItem * memoryItem)
+ memoryBuilder.setUpdateItemFn([this](const std::string&, const wm::Memory * memory, QTreeWidgetItem * memoryItem)
{
updateContainerItem(*memory, memoryItem);
if (memoryItem)
@@ -71,26 +71,26 @@ namespace armarx::armem::gui::memory
return element.name();
};
- workingmemoryCoreSegmentBuilder.setExpand(true);
- workingmemoryCoreSegmentBuilder.setNameFn(nameFn, int(Columns::KEY));
- workingmemoryCoreSegmentBuilder.setMakeItemFn([this](const wm::CoreSegment & coreSeg)
+ coreSegmentBuilder.setExpand(true);
+ coreSegmentBuilder.setNameFn(nameFn, int(Columns::KEY));
+ coreSegmentBuilder.setMakeItemFn([this](const wm::CoreSegment & coreSeg)
{
return makeItem(coreSeg.name(), coreSeg);
});
- workingmemoryCoreSegmentBuilder.setUpdateItemFn([this](const wm::CoreSegment & coreSeg, QTreeWidgetItem * coreSegItem)
+ coreSegmentBuilder.setUpdateItemFn([this](const wm::CoreSegment & coreSeg, QTreeWidgetItem * coreSegItem)
{
updateContainerItem(coreSeg, coreSegItem);
updateChildren(coreSeg, coreSegItem);
return true;
});
- workingmemoryProvSegmentBuilder.setExpand(true);
- workingmemoryProvSegmentBuilder.setNameFn(nameFn, int(Columns::KEY));
- workingmemoryProvSegmentBuilder.setMakeItemFn([this](const wm::ProviderSegment & provSeg)
+ provSegmentBuilder.setExpand(true);
+ provSegmentBuilder.setNameFn(nameFn, int(Columns::KEY));
+ provSegmentBuilder.setMakeItemFn([this](const wm::ProviderSegment & provSeg)
{
return makeItem(provSeg.name(), provSeg);
});
- workingmemoryProvSegmentBuilder.setUpdateItemFn([this](const wm::ProviderSegment & provSeg, QTreeWidgetItem * provSegItem)
+ provSegmentBuilder.setUpdateItemFn([this](const wm::ProviderSegment & provSeg, QTreeWidgetItem * provSegItem)
{
updateContainerItem(provSeg, provSegItem);
updateChildren(provSeg, provSegItem);
@@ -98,46 +98,46 @@ namespace armarx::armem::gui::memory
});
// entityBuilder.setExpand(true);
- workingmemoryEntityBuilder.setNameFn(nameFn, int(Columns::KEY));
- workingmemoryEntityBuilder.setMakeItemFn([this](const wm::Entity & entity)
+ entityBuilder.setNameFn(nameFn, int(Columns::KEY));
+ entityBuilder.setMakeItemFn([this](const wm::Entity & entity)
{
return makeItem(entity.name(), entity);
});
- workingmemoryEntityBuilder.setUpdateItemFn([this](const wm::Entity & entity, QTreeWidgetItem * entityItem)
+ entityBuilder.setUpdateItemFn([this](const wm::Entity & entity, QTreeWidgetItem * entityItem)
{
updateContainerItem(entity, entityItem);
updateChildren(entity, entityItem);
return true;
});
- workingmemorySnapshotBuilder.setMakeItemFn([this](const wm::EntitySnapshot & snapshot)
+ 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())));
return item;
});
- workingmemorySnapshotBuilder.setCompareFn([](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * item)
+ snapshotBuilder.setCompareFn([](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * item)
{
return armarx::detail::compare(static_cast<qlonglong>(snapshot.time().toMicroSeconds()),
item->data(int(Columns::KEY), Qt::ItemDataRole::UserRole).toLongLong());
});
- workingmemorySnapshotBuilder.setUpdateItemFn([this](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * snapshotItem)
+ snapshotBuilder.setUpdateItemFn([this](const wm::EntitySnapshot & snapshot, QTreeWidgetItem * snapshotItem)
{
updateContainerItem(snapshot, snapshotItem);
updateChildren(snapshot, snapshotItem);
return true;
});
- workingmemoryInstanceBuilder.setMakeItemFn([this](const wm::EntityInstance & instance)
+ instanceBuilder.setMakeItemFn([this](const wm::EntityInstance & instance)
{
QTreeWidgetItem* item = makeItem("", instance);
return item;
});
- workingmemoryInstanceBuilder.setCompareFn([](const wm::EntityInstance & lhs, QTreeWidgetItem * rhsItem)
+ instanceBuilder.setCompareFn([](const wm::EntityInstance & lhs, QTreeWidgetItem * rhsItem)
{
return armarx::detail::compare(lhs.index(), rhsItem->text(0).toInt());
});
- workingmemoryInstanceBuilder.setUpdateItemFn([this](const wm::EntityInstance & instance, QTreeWidgetItem * instanceItem)
+ instanceBuilder.setUpdateItemFn([this](const wm::EntityInstance & instance, QTreeWidgetItem * instanceItem)
{
updateItemItem(instance, instanceItem);
updateChildren(instance, instanceItem);
@@ -237,33 +237,33 @@ namespace armarx::armem::gui::memory
void TreeWidget::updateChildren(const std::map<std::string, const armem::wm::Memory*>& memories, QTreeWidget* tree)
{
- workingmemoryBuilder.updateTree(tree, memories);
+ memoryBuilder.updateTree(tree, memories);
}
void TreeWidget::updateChildren(const armem::wm::Memory& memory, QTreeWidgetItem* memoryItem)
{
- workingmemoryCoreSegmentBuilder.updateTreeWithIterator(memoryItem, makeIteratorFn(memory));
+ coreSegmentBuilder.updateTreeWithIterator(memoryItem, makeIteratorFn(memory));
}
void TreeWidget::updateChildren(const armem::wm::CoreSegment& coreSeg, QTreeWidgetItem* coreSegItem)
{
- workingmemoryProvSegmentBuilder.updateTreeWithIterator(coreSegItem, makeIteratorFn(coreSeg));
+ provSegmentBuilder.updateTreeWithIterator(coreSegItem, makeIteratorFn(coreSeg));
}
void TreeWidget::updateChildren(const armem::wm::ProviderSegment& provSeg, QTreeWidgetItem* provSegItem)
{
- workingmemoryEntityBuilder.updateTreeWithIterator(provSegItem, makeIteratorFn(provSeg));
+ entityBuilder.updateTreeWithIterator(provSegItem, makeIteratorFn(provSeg));
}
void TreeWidget::updateChildren(const armem::wm::Entity& entity, QTreeWidgetItem* entityItem)
{
- workingmemorySnapshotBuilder.updateTreeWithIterator(entityItem, makeIteratorFn(entity));
+ snapshotBuilder.updateTreeWithIterator(entityItem, makeIteratorFn(entity));
}
void TreeWidget::updateChildren(const armem::wm::EntitySnapshot& snapshot, QTreeWidgetItem* snapshotItem)
{
- workingmemoryInstanceBuilder.updateTreeWithIterator(snapshotItem, makeIteratorFn(snapshot));
+ instanceBuilder.updateTreeWithIterator(snapshotItem, makeIteratorFn(snapshot));
}
void TreeWidget::updateChildren(const armem::wm::EntityInstance& data, QTreeWidgetItem* dataItem)
diff --git a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.h b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.h
index d44867d24..94b1f6a4e 100644
--- a/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.h
+++ b/source/RobotAPI/libraries/armem_gui/memory/TreeWidget.h
@@ -77,12 +77,12 @@ namespace armarx::armem::gui::memory
private:
- MapTreeWidgetBuilder<std::string, const wm::Memory*> workingmemoryBuilder;
- TreeWidgetBuilder<wm::CoreSegment> workingmemoryCoreSegmentBuilder;
- TreeWidgetBuilder<wm::ProviderSegment> workingmemoryProvSegmentBuilder;
- TreeWidgetBuilder<wm::Entity> workingmemoryEntityBuilder;
- TreeWidgetBuilder<wm::EntitySnapshot> workingmemorySnapshotBuilder;
- TreeWidgetBuilder<wm::EntityInstance> workingmemoryInstanceBuilder;
+ MapTreeWidgetBuilder<std::string, const wm::Memory*> memoryBuilder;
+ TreeWidgetBuilder<wm::CoreSegment> coreSegmentBuilder;
+ TreeWidgetBuilder<wm::ProviderSegment> provSegmentBuilder;
+ TreeWidgetBuilder<wm::Entity> entityBuilder;
+ TreeWidgetBuilder<wm::EntitySnapshot> snapshotBuilder;
+ TreeWidgetBuilder<wm::EntityInstance> instanceBuilder;
std::optional<MemoryID> _selectedID;
/// While this is false, do not handle selection updates.
--
GitLab