diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index 14fe8b7..3279f8b 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -37,9 +37,12 @@ VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget { ui->setupUi(this); - // qcpplot title - ui->widget->plotLayout()->insertRow(0); - ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name}); + ui->graphNameLabel->setText(name); + + // 'Close' options : widget is deleted when closed + setAttribute(Qt::WA_DeleteOnClose); + connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationGraphWidget::close); + ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton)); // Set qcpplot properties : // - Drag (on x-axis) and zoom are enabled @@ -90,12 +93,7 @@ bool VisualizationGraphWidget::canDrop(const Variable &variable) const QString VisualizationGraphWidget::name() const { - if (auto title = dynamic_cast(ui->widget->plotLayout()->elementAt(0))) { - return title->text(); - } - else { - return QString{}; - } + return ui->graphNameLabel->text(); } void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2) diff --git a/gui/ui/Visualization/VisualizationGraphWidget.ui b/gui/ui/Visualization/VisualizationGraphWidget.ui index bcecbc4..69df1b0 100644 --- a/gui/ui/Visualization/VisualizationGraphWidget.ui +++ b/gui/ui/Visualization/VisualizationGraphWidget.ui @@ -15,7 +15,58 @@ - + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + font: 75 9pt "MS Shell Dlg 2"; + + + TextLabel + + + Qt::AutoText + + + Qt::AlignCenter + + + + + + + background-color: transparent; + + + Close + + + + + + + + + + + 0 + 0 + + +