GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1094:f391b1d9fb19

Fix the close button on the graphs and multi selection in the same graph

trabillard -

r1094:f391b1d9fb19

parent child

Context file:

r1094:f391b1d9fb19

gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp +6 -7

                     initClosePixmapStyle(*m_ClosePixmap);
                     // Connects pixmap selection to graph widget closing
-                    QObject::connect(m_ClosePixmap, &QCPItemPixmap::selectionChanged,
+                    QObject::connect(&m_Plot, &QCustomPlot::itemClick,
-                                     [&graphWidget](bool selected) {
+                                     [&graphWidget, this](auto item, auto mouseEvent) {
-                                         if (selected) {
+                                         if (item == m_ClosePixmap) {
                                              graphWidget.close();
                                          }
                                      });
                     initXAxisPixmapStyle(*m_XAxisPixmap);
                     // Connects pixmap selection to graph x-axis showing/hiding
-                    QObject::connect(m_XAxisPixmap, &QCPItemPixmap::selectionChanged, [this]() {
+                    QObject::connect(&m_Plot, &QCustomPlot::itemClick, [this](auto item, auto mouseEvent) {
-                        if (m_XAxisPixmap->selected()) {
+                        if (m_XAxisPixmap == item) {
                             // Changes the selection state and refreshes the x-axis
                             m_ShowXAxis = !m_ShowXAxis;
-                            updateXAxisState();
+                            this->updateXAxisState();
                             m_Plot.layer(AXES_LAYER)->replot();
                             // Deselects the x-axis pixmap and updates icon
-                            m_XAxisPixmap->setSelected(false);
                             m_XAxisPixmap->setPixmap(
                                 pixmap(m_ShowXAxis ? HIDE_AXIS_ICON_PATH : SHOW_AXIS_ICON_PATH));
                             m_Plot.layer(OVERLAY_LAYER)->replot();

gui/src/Visualization/VisualizationGraphWidget.cpp +1 -1

                 // Set qcpplot properties :
                 // - zoom is enabled
                 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
-                ui->widget->setInteractions(QCP::iRangeZoom | QCP::iSelectItems);
+                ui->widget->setInteractions(QCP::iRangeZoom);
                 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal | Qt::Vertical);
                 // The delegate must be initialized after the ui as it uses the plot

General Comments 3

trabillard

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages