diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index a8d4d3a..d8eebb6 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -28,11 +28,15 @@ const auto VERTICAL_ZOOM_MODIFIER = Qt::ControlModifier; struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate { - explicit VisualizationGraphWidgetPrivate() - : m_DoAcquisition{true}, m_IsCalibration{false}, m_RenderingDelegate{nullptr} + explicit VisualizationGraphWidgetPrivate(const QString &name) + : m_Name{name}, + m_DoAcquisition{true}, + m_IsCalibration{false}, + m_RenderingDelegate{nullptr} { } + QString m_Name; // 1 variable -> n qcpplot std::map, PlottablesMap> m_VariableToPlotMultiMap; bool m_DoAcquisition; @@ -45,19 +49,12 @@ struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate { VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent) : QWidget{parent}, ui{new Ui::VisualizationGraphWidget}, - impl{spimpl::make_unique_impl()} + impl{spimpl::make_unique_impl(name)} { ui->setupUi(this); - // The delegate must be initialized after the ui as it uses the plot - impl->m_RenderingDelegate = std::make_unique(*ui->widget); - - 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 @@ -65,6 +62,9 @@ VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom); ui->widget->axisRect()->setRangeDrag(Qt::Horizontal); + // The delegate must be initialized after the ui as it uses the plot + impl->m_RenderingDelegate = std::make_unique(*this); + connect(ui->widget, &QCustomPlot::mousePress, this, &VisualizationGraphWidget::onMousePress); connect(ui->widget, &QCustomPlot::mouseRelease, this, &VisualizationGraphWidget::onMouseRelease); @@ -201,7 +201,7 @@ bool VisualizationGraphWidget::contains(const Variable &variable) const QString VisualizationGraphWidget::name() const { - return ui->graphNameLabel->text(); + return impl->m_Name; } void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept diff --git a/gui/ui/Visualization/VisualizationGraphWidget.ui b/gui/ui/Visualization/VisualizationGraphWidget.ui index 35d7bd2..453c9c4 100644 --- a/gui/ui/Visualization/VisualizationGraphWidget.ui +++ b/gui/ui/Visualization/VisualizationGraphWidget.ui @@ -27,50 +27,6 @@ 0 - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - font: 75 9pt "MS Shell Dlg 2"; - - - TextLabel - - - Qt::AutoText - - - Qt::AlignCenter - - - - - - - background-color: transparent; - - - Close - - - - - - -