From 7a2695cdaeeab35b06e29477da1b1d368cb48cba 2017-06-22 08:33:05 From: Alexandre Leroux Date: 2017-06-22 08:33:05 Subject: [PATCH] Adds a name for a zone - The name is displayed in a new information bar of the zone - It will also be used to be displayed in menus related to a variable --- diff --git a/gui/include/Visualization/VisualizationZoneWidget.h b/gui/include/Visualization/VisualizationZoneWidget.h index bdb08bf..0e03195 100644 --- a/gui/include/Visualization/VisualizationZoneWidget.h +++ b/gui/include/Visualization/VisualizationZoneWidget.h @@ -3,19 +3,19 @@ #include "Visualization/IVisualizationWidget.h" -class VisualizationGraphWidget; - #include namespace Ui { class VisualizationZoneWidget; } // Ui +class VisualizationGraphWidget; + class VisualizationZoneWidget : public QWidget, public IVisualizationWidget { Q_OBJECT public: - explicit VisualizationZoneWidget(QWidget *parent = 0); + explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0); virtual ~VisualizationZoneWidget(); /// Add a graph widget diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp index ba4aa14..f3e4a29 100644 --- a/gui/src/Visualization/VisualizationZoneWidget.cpp +++ b/gui/src/Visualization/VisualizationZoneWidget.cpp @@ -3,10 +3,12 @@ #include "Visualization/VisualizationGraphWidget.h" -VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) +VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} { ui->setupUi(this); + + ui->zoneNameLabel->setText(name); } VisualizationZoneWidget::~VisualizationZoneWidget() @@ -44,5 +46,5 @@ void VisualizationZoneWidget::close() QString VisualizationZoneWidget::name() const { - return QStringLiteral("MainView"); + return ui->zoneNameLabel->text(); } diff --git a/gui/ui/Visualization/VisualizationZoneWidget.ui b/gui/ui/Visualization/VisualizationZoneWidget.ui index fc42eb5..1c2920e 100644 --- a/gui/ui/Visualization/VisualizationZoneWidget.ui +++ b/gui/ui/Visualization/VisualizationZoneWidget.ui @@ -14,23 +14,49 @@ Form - - 3 - - - 0 - - - 0 - - - 0 - - - 0 - + + + + + 0 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + color: rgb(127, 127, 127); + + + + TextLabel + + + + + + + + + 0 + 0 + + QFrame::Box