From 3de8fdd6eccbb66f19f27bf3f4728124b8ad1308 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Mon, 16 Aug 2021 10:51:12 +0200
Subject: [PATCH] Rename "MemoryControlWidget" to "disk::ControlWidget"
---
.../ArMemMemoryViewerWidget.ui | 2 +-
.../ArMemMemoryViewerWidgetController.cpp | 3 ++-
.../libraries/armem_gui/CMakeLists.txt | 6 ++++--
.../libraries/armem_gui/MemoryViewer.cpp | 18 +++++++++---------
.../libraries/armem_gui/MemoryViewer.h | 10 +++++-----
.../ControlWidget.cpp} | 13 ++++++++-----
.../ControlWidget.h} | 15 +++++++++++----
7 files changed, 40 insertions(+), 27 deletions(-)
rename source/RobotAPI/libraries/armem_gui/{MemoryControlWidget.cpp => disk/ControlWidget.cpp} (90%)
rename source/RobotAPI/libraries/armem_gui/{MemoryControlWidget.h => disk/ControlWidget.h} (77%)
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
index 819331b5f..58bead75f 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
@@ -34,7 +34,7 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="ltmControlWidgetLayout">
+ <layout class="QHBoxLayout" name="diskControlWidgetLayout">
<property name="spacing">
<number>6</number>
</property>
diff --git a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
index 83d1d8743..780dec62f 100644
--- a/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
@@ -43,7 +43,6 @@ namespace armarx
viewer = std::make_unique<MemoryViewer>(
widget.updateWidgetLayout,
- widget.ltmControlWidgetLayout,
widget.memoryGroupBox,
widget.treesLayout,
@@ -51,6 +50,8 @@ namespace armarx
widget.instanceGroupBox,
widget.treesLayout,
+ widget.diskControlWidgetLayout,
+
widget.statusLabel
);
viewer->setLogTag(getName());
diff --git a/source/RobotAPI/libraries/armem_gui/CMakeLists.txt b/source/RobotAPI/libraries/armem_gui/CMakeLists.txt
index 696c6db77..2a781dd39 100644
--- a/source/RobotAPI/libraries/armem_gui/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem_gui/CMakeLists.txt
@@ -18,10 +18,11 @@ set(SOURCES
gui_utils.cpp
lifecycle.cpp
- MemoryControlWidget.cpp
MemoryViewer.cpp
PeriodicUpdateWidget.cpp
+ disk/ControlWidget.cpp
+
instance/GroupBox.cpp
instance/ImageView.cpp
instance/InstanceView.cpp
@@ -53,7 +54,6 @@ set(HEADERS
gui_utils.h
lifecycle.h
- MemoryControlWidget.h
MemoryViewer.h
PeriodicUpdateWidget.h
TreeWidgetBuilder.h
@@ -61,6 +61,8 @@ set(HEADERS
PeriodicUpdateWidget.h
TreeWidgetBuilder.h
+ disk/ControlWidget.h
+
instance/GroupBox.h
instance/ImageView.h
instance/InstanceView.h
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index ffb9165de..1e4d307d0 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -33,9 +33,9 @@ namespace armarx::armem::gui
{
MemoryViewer::MemoryViewer(
QBoxLayout* updateWidgetLayout,
- QBoxLayout* memoryControlWidgetLayout,
QGroupBox* memoryGroupBox, QLayout* memoryGroupBoxParentLayout,
QGroupBox* instanceGroupBox, QLayout* instanceGroupBoxParentLayout,
+ QBoxLayout* diskControlWidgetLayout,
QLabel* statusLabel
)
{
@@ -62,11 +62,11 @@ namespace armarx::armem::gui
updateWidgetLayout->insertWidget(0, updateWidget);
// LTM Control
- if (memoryControlWidgetLayout)
+ if (diskControlWidgetLayout)
{
- this->memoryControlWidgetLayout = memoryControlWidgetLayout;
- memoryControlWidget = new armem::gui::MemoryControlWidget();
- memoryControlWidgetLayout->addWidget(memoryControlWidget);
+ this->diskControlLayout = diskControlWidgetLayout;
+ diskControl = new armem::gui::disk::ControlWidget();
+ diskControlWidgetLayout->addWidget(diskControl);
}
// Memory View
@@ -83,8 +83,8 @@ namespace armarx::armem::gui
// Connections
//connect(this, &This::connected, this, &This::updateMemory);
- connect(memoryControlWidget, &armem::gui::MemoryControlWidget::storeOnDisk, this, &This::storeOnDisk);
- connect(memoryControlWidget, &armem::gui::MemoryControlWidget::loadFromDisk, this, &This::loadFromDisk);
+ connect(diskControl, &armem::gui::disk::ControlWidget::storeOnDisk, this, &This::storeOnDisk);
+ connect(diskControl, &armem::gui::disk::ControlWidget::loadFromDisk, this, &This::loadFromDisk);
connect(this, &This::connected, this, &This::updateMemories);
connect(updateWidget, &armem::gui::PeriodicUpdateWidget::update, this, &This::updateMemories);
@@ -185,7 +185,7 @@ namespace armarx::armem::gui
void MemoryViewer::storeOnDisk()
{
TIMING_START(MemoryExport);
- QString qs = memoryControlWidget->getEnteredPath();
+ QString qs = diskControl->getEnteredPath();
std::string utf8_text = qs.toUtf8().constData();
if (not utf8_text.empty())
@@ -228,7 +228,7 @@ namespace armarx::armem::gui
{
armem::client::QueryInput input = memoryGroup->queryWidget()->queryInput();
- QString qs = memoryControlWidget->getEnteredPath();
+ QString qs = diskControl->getEnteredPath();
std::string utf8_text = qs.toUtf8().constData();
std::filesystem::path p(utf8_text);
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.h b/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
index 2153efb73..d46dc8fe9 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.h
@@ -10,11 +10,11 @@
#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
#include <RobotAPI/libraries/armem/client/MemoryNameSystem.h>
#include <RobotAPI/libraries/armem/client/Reader.h>
+#include <RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h>
#include <RobotAPI/libraries/armem_gui/lifecycle.h>
#include <RobotAPI/libraries/armem_gui/instance/GroupBox.h>
#include <RobotAPI/libraries/armem_gui/memory/GroupBox.h>
-#include <RobotAPI/libraries/armem_gui/PeriodicUpdateWidget.h>
-#include <RobotAPI/libraries/armem_gui/MemoryControlWidget.h>
+#include <RobotAPI/libraries/armem_gui/disk/ControlWidget.h>
class QBoxLayout;
@@ -47,9 +47,9 @@ namespace armarx::armem::gui
MemoryViewer(
QBoxLayout* updateWidgetLayout,
- QBoxLayout* ltmControlWidgetLayout,
QGroupBox* memoryGroupBox, QLayout* memoryGroupBoxParentLayout,
QGroupBox* instanceGroupBox, QLayout* instanceGroupBoxParentLayout,
+ QBoxLayout* diskControlWidgetLayout,
QLabel* statusLabel
);
@@ -118,8 +118,8 @@ namespace armarx::armem::gui
QLayout* updateWidgetLayout = nullptr;
armem::gui::PeriodicUpdateWidget* updateWidget = nullptr;
- QLayout* memoryControlWidgetLayout = nullptr;
- armem::gui::MemoryControlWidget* memoryControlWidget = nullptr;
+ QLayout* diskControlLayout = nullptr;
+ armem::gui::disk::ControlWidget* diskControl = nullptr;
armem::gui::MemoryGroupBox* memoryGroup = nullptr;
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryControlWidget.cpp b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
similarity index 90%
rename from source/RobotAPI/libraries/armem_gui/MemoryControlWidget.cpp
rename to source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
index 273b19711..b7d4a163f 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryControlWidget.cpp
+++ b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
@@ -1,4 +1,4 @@
-#include "MemoryControlWidget.h"
+#include "ControlWidget.h"
#include <QPushButton>
#include <QLineEdit>
@@ -9,10 +9,10 @@
#include <cmath>
-namespace armarx::armem::gui
+namespace armarx::armem::gui::disk
{
- MemoryControlWidget::MemoryControlWidget()
+ ControlWidget::ControlWidget()
{
setSizePolicy(QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Fixed);
@@ -52,7 +52,8 @@ namespace armarx::armem::gui
connect(_storeOnDiskButton, &QPushButton::pressed, this, &This::storeOnDisk);
}
- void MemoryControlWidget::openFileBrowser()
+
+ void ControlWidget::openFileBrowser()
{
QFileDialog dialog;
dialog.setFileMode(QFileDialog::DirectoryOnly);
@@ -63,9 +64,11 @@ namespace armarx::armem::gui
_lineEdit->setText(open);
}
- QString MemoryControlWidget::getEnteredPath()
+
+ QString ControlWidget::getEnteredPath()
{
return _lineEdit->text();
}
+
}
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryControlWidget.h b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.h
similarity index 77%
rename from source/RobotAPI/libraries/armem_gui/MemoryControlWidget.h
rename to source/RobotAPI/libraries/armem_gui/disk/ControlWidget.h
index d0c3ef2e8..4ba8f91d5 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryControlWidget.h
+++ b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.h
@@ -1,34 +1,40 @@
#pragma once
#include <QWidget>
+#include <QString>
class QPushButton;
class QLineEdit;
class QFileDialog;
-namespace armarx::armem::gui
+
+namespace armarx::armem::gui::disk
{
- class MemoryControlWidget : public QWidget
+ class ControlWidget : public QWidget
{
Q_OBJECT
- using This = MemoryControlWidget;
+ using This = ControlWidget;
public:
- MemoryControlWidget();
+ ControlWidget();
+
QString getEnteredPath();
+
public slots:
void openFileBrowser();
+
signals:
void loadFromDisk();
void storeOnDisk();
+
private slots:
@@ -45,6 +51,7 @@ namespace armarx::armem::gui
QPushButton* _storeOnDiskButton;
QPushButton* _loadFromDiskButton;
+
};
}
--
GitLab