From 13b601436473139d0659cfada6e00ceb42a7b556 Mon Sep 17 00:00:00 2001 From: Rainer Kartmann <rainer.kartmann@kit.edu> Date: Tue, 14 Jun 2022 11:18:18 +0200 Subject: [PATCH] Use forward declaration, use fromString() instead of constructor --- .../armem_gui/prediction_widget/PredictionWidget.cpp | 7 +++++-- .../armem_gui/prediction_widget/PredictionWidget.h | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp index cfd7e524e..0856ff1d2 100644 --- a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp +++ b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp @@ -30,6 +30,9 @@ #include <QSpinBox> #include <QVBoxLayout> +#include "TimestampInput.h" + + namespace armarx::armem::gui { PredictionWidget::PredictionWidget(GetEntityInfoFn&& entityInfoRetriever) : @@ -101,7 +104,7 @@ namespace armarx::armem::gui void PredictionWidget::updateCurrentEntity() { - MemoryID entityID(memoryEntity->text().toStdString()); + MemoryID entityID = MemoryID::fromString(memoryEntity->text().toStdString()); predictionEngineSelector->clear(); if (!entityID.hasGap() && entityID.hasEntityName()) { @@ -123,7 +126,7 @@ namespace armarx::armem::gui void PredictionWidget::startPrediction() { - MemoryID entityID(memoryEntity->text().toStdString()); + MemoryID entityID = MemoryID::fromString(memoryEntity->text().toStdString()); armarx::DateTime timestamp; for (const auto& [inputKey, input] : timestampInputs) { diff --git a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.h b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.h index 460a1e94f..c853a9bb4 100644 --- a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.h +++ b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.h @@ -31,7 +31,6 @@ #include <RobotAPI/libraries/armem/core/Prediction.h> #include <RobotAPI/libraries/aron/core/type/variant/forward_declarations.h> -#include "TimestampInput.h" class QComboBox; class QHBoxLayout; @@ -39,14 +38,17 @@ class QLineEdit; class QPushButton; class QSpinBox; + namespace armarx::armem::gui { + class TimestampInput; + + class PredictionWidget : public QWidget { Q_OBJECT // NOLINT public: - struct EntityInfo { aron::type::ObjectPtr type = nullptr; -- GitLab