diff --git a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp index 1547c9a8b2fdfab063cf7f739bef36d9b6dd0cfb..fecc53ee6646f080a02cd0d20d796db921e3509e 100644 --- a/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp +++ b/source/RobotAPI/libraries/armem_gui/prediction_widget/PredictionWidget.cpp @@ -40,29 +40,31 @@ namespace armarx::armem::gui timestampLayout(new QHBoxLayout()), instanceSpinner(new QSpinBox()), predictionEngineSelector(new QComboBox()), - predictButton(new QPushButton("Copy prediction to clipboard")), + predictButton(new QPushButton("Make prediction")), entityInfoRetriever(std::move(entityInfoRetriever)) { auto* vlayout = new QVBoxLayout(); - // memoryEntity->editingFinished() auto* hlayout = new QHBoxLayout(); - hlayout->addWidget(memoryEntity); hlayout->addWidget(new QLabel("Entity ID")); + hlayout->addWidget(memoryEntity); vlayout->addLayout(hlayout); timestampInputSelector->addItems({"Absolute", "Relative to now"}); + timestampLayout->addWidget(new QLabel("Prediction time")); timestampLayout->addWidget(timestampInputSelector); vlayout->addLayout(timestampLayout); hlayout = new QHBoxLayout(); - hlayout->addWidget(predictionEngineSelector); hlayout->addWidget(new QLabel("Prediction engine")); + hlayout->addWidget(predictionEngineSelector); + hlayout->addStretch(); vlayout->addLayout(hlayout); vlayout->addWidget(predictButton); addTimestampInputMethod("Absolute", new AbsoluteTimestampInput()); addTimestampInputMethod("Relative to now", new RelativeTimestampInput()); + timestampLayout->addStretch(); setLayout(vlayout); diff --git a/source/RobotAPI/libraries/armem_gui/prediction_widget/TimestampInput.cpp b/source/RobotAPI/libraries/armem_gui/prediction_widget/TimestampInput.cpp index 4124c10b7b51eeec4b8ae00277e4e1c2e81a2d5d..cb24c31d72b9f019afa88ce22408daecaf7b9e2d 100644 --- a/source/RobotAPI/libraries/armem_gui/prediction_widget/TimestampInput.cpp +++ b/source/RobotAPI/libraries/armem_gui/prediction_widget/TimestampInput.cpp @@ -24,6 +24,7 @@ #include <QDateTimeEdit> #include <QHBoxLayout> +#include <QLabel> #include <RobotAPI/libraries/armem_gui/gui_utils.h> @@ -41,7 +42,9 @@ namespace armarx::armem::gui static_cast<int>((QDateTime::currentMSecsSinceEpoch() % 1000) * 1000)); auto* hlayout = new QHBoxLayout(); + hlayout->addWidget(new QLabel("Time")); hlayout->addWidget(dateTime); + hlayout->addWidget(new QLabel("µs")); hlayout->addWidget(microseconds); setLayout(hlayout); } @@ -60,6 +63,7 @@ namespace armarx::armem::gui seconds->setValue(0); auto* hlayout = new QHBoxLayout(); + hlayout->addWidget(new QLabel("Seconds")); hlayout->addWidget(seconds); setLayout(hlayout); }