[j.0] restore functionality of "lightbulb" button: display masked pixels...

[j.0] restore functionality of "lightbulb" button: display masked pixels instead of geometric representation ()

Merging branch 'j.0'  into 'main'.

See merge request !2625

GUI/View/Canvas/MaskEditorCanvas.cpp

@@ -128,7 +128,7 @@ void MaskEditorCanvas::updateCanvas(Data2DItem* data_item)
     m_scene->onActivityChanged(m_current_activity); // TODO call no longer needed ?
 }
 
-void MaskEditorCanvas::onPresentationChange(bool pixelized)
+void MaskEditorCanvas::changeMaskDisplay(bool pixelized)
 {
     m_scene->clearSelection(); // important to avoid crash (unsubscribe while calling subscribers)
 

GUI/View/Canvas/MaskEditorCanvas.h

@@ -47,7 +47,7 @@ signals:
 public slots:
     void onResetViewRequest();
     void exportPlot() const;
-    void onPresentationChange(bool pixelized);
+    void changeMaskDisplay(bool pixelized);
     void setCanvasMode(Canvas2DMode::Flag mode);
 
 private slots:

GUI/View/Frame/Plot2DFrame.cpp

@@ -90,6 +90,9 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source)
     connect(toolbar, &Data2DToolbar::activityChanged, m_canvas1D,
             &ProjectedGraphsCanvas::onActivityChanged);
 
+    connect(toolbar, &Data2DToolbar::requestMaskDisplay, m_canvas2D,
+            &MaskEditorCanvas::changeMaskDisplay);
+
     connect(m_canvas2D, &MaskEditorCanvas::changeActivityRequest, toolbar,
             &Data2DToolbar::onChangeActivityRequest);
 

GUI/View/Setup/Data2DToolbar.cpp

@@ -30,106 +30,106 @@ Data2DToolbar::Data2DToolbar()
 
     //... Frame tools
 
-    auto* propertyPanelButton = new QToolButton;
-    propertyPanelButton->setDefaultAction(actions()->toggle_properties_panel);
-    addWidget(propertyPanelButton);
+    auto* propertyPanel_button = new QToolButton;
+    propertyPanel_button->setDefaultAction(actions()->toggle_properties_panel);
+    addWidget(propertyPanel_button);
 
     addSeparator();
 
     //... Selection / zoom mode
 
-    auto* selectionButton = new QToolButton;
-    selectionButton->setIcon(QIcon(":/images/mask/arrow.svg"));
-    selectionButton->setToolTip("Select/modify mask");
-    selectionButton->setCheckable(true);
-    selectionButton->setChecked(true);
-    addWidget(selectionButton);
-    m_activity_button_group->addButton(selectionButton, Canvas2DMode::SELECTION);
-
-    auto* panButton = new QToolButton;
-    panButton->setIcon(QIcon(":/images/hand-right.svg"));
-    panButton->setToolTip("Pan/zoom mode (space)\n"
-                          "Drag axes with the mouse, use mouse wheel to zoom in/out");
-    panButton->setCheckable(true);
-    addWidget(panButton);
-    m_activity_button_group->addButton(panButton, Canvas2DMode::PAN_ZOOM);
-
-    auto* resetViewButton = new QToolButton;
-    resetViewButton->setDefaultAction(actions()->reset_view);
-    addWidget(resetViewButton);
+    auto* selection_button = new QToolButton;
+    selection_button->setIcon(QIcon(":/images/mask/arrow.svg"));
+    selection_button->setToolTip("Select/modify mask");
+    selection_button->setCheckable(true);
+    selection_button->setChecked(true);
+    addWidget(selection_button);
+    m_activity_button_group->addButton(selection_button, Canvas2DMode::SELECTION);
+
+    auto* pan_button = new QToolButton;
+    pan_button->setIcon(QIcon(":/images/hand-right.svg"));
+    pan_button->setToolTip("Pan/zoom mode (space)\n"
+                           "Drag axes with the mouse, use mouse wheel to zoom in/out");
+    pan_button->setCheckable(true);
+    addWidget(pan_button);
+    m_activity_button_group->addButton(pan_button, Canvas2DMode::PAN_ZOOM);
+
+    auto* resetView_button = new QToolButton;
+    resetView_button->setDefaultAction(actions()->reset_view);
+    addWidget(resetView_button);
 
     addSeparator();
 
     //... Projection tools
 
-    auto* horizontalPrjnButton = new QToolButton;
-    horizontalPrjnButton->setIcon(QIcon(":/images/mask/horizontalline.svg"));
-    horizontalPrjnButton->setToolTip("Create horizontal projection");
-    horizontalPrjnButton->setCheckable(true);
-    m_activity_button_group->addButton(horizontalPrjnButton, Canvas2DMode::HORIZONTAL_PRJN);
-    addWidget(horizontalPrjnButton);
+    auto* horizontal_prjn_button = new QToolButton;
+    horizontal_prjn_button->setIcon(QIcon(":/images/mask/horizontalline.svg"));
+    horizontal_prjn_button->setToolTip("Create horizontal projection");
+    horizontal_prjn_button->setCheckable(true);
+    m_activity_button_group->addButton(horizontal_prjn_button, Canvas2DMode::HORIZONTAL_PRJN);
+    addWidget(horizontal_prjn_button);
 
-    auto* verticalPrjnButton = new QToolButton;
-    verticalPrjnButton->setIcon(QIcon(":/images/mask/verticalline.svg"));
-    verticalPrjnButton->setToolTip("Create vertical projection");
-    verticalPrjnButton->setCheckable(true);
-    m_activity_button_group->addButton(verticalPrjnButton, Canvas2DMode::VERTICAL_PRJN);
-    addWidget(verticalPrjnButton);
+    auto* vertical_prjn_button = new QToolButton;
+    vertical_prjn_button->setIcon(QIcon(":/images/mask/verticalline.svg"));
+    vertical_prjn_button->setToolTip("Create vertical projection");
+    vertical_prjn_button->setCheckable(true);
+    m_activity_button_group->addButton(vertical_prjn_button, Canvas2DMode::VERTICAL_PRJN);
+    addWidget(vertical_prjn_button);
 
     addSeparator();
 
     //... Shape creation tools
 
-    auto* roiButton = new QToolButton;
-    roiButton->setIcon(QIcon(":/images/mask/roi.svg"));
-    roiButton->setToolTip("Create region of interest");
-    roiButton->setCheckable(true);
-    m_activity_button_group->addButton(roiButton, Canvas2DMode::ROI);
-    addWidget(roiButton);
+    auto* roi_button = new QToolButton;
+    roi_button->setIcon(QIcon(":/images/mask/roi.svg"));
+    roi_button->setToolTip("Create region of interest");
+    roi_button->setCheckable(true);
+    m_activity_button_group->addButton(roi_button, Canvas2DMode::ROI);
+    addWidget(roi_button);
 
-    //    auto* maskAllButton = new QToolButton;
-    //    maskAllButton->setIcon(QIcon(":/images/mask/maskall.svg"));
-    //    maskAllButton->setToolTip("Create masked area covering whole detector plane\n"
+    //    auto* maskAll_button = new QToolButton;
+    //    maskAll_button->setIcon(QIcon(":/images/mask/maskall.svg"));
+    //    maskAll_button->setToolTip("Create masked area covering whole detector plane\n"
     //                              "Will be placed beneath all masks. Only one instance is
     //                              allowed.");
-    //    maskAllButton->setCheckable(true);
-    //    m_activity_button_group->addButton(maskAllButton, Canvas2DMode::MASKALL);
-    //    addWidget(maskAllButton);
-
-    auto* rectangleButton = new QToolButton;
-    rectangleButton->setIcon(QIcon(":/images/mask/rectangle.svg"));
-    rectangleButton->setToolTip("Create rectangle mask");
-    rectangleButton->setCheckable(true);
-    m_activity_button_group->addButton(rectangleButton, Canvas2DMode::RECTANGLE);
-    addWidget(rectangleButton);
-
-    auto* polygonButton = new QToolButton;
-    polygonButton->setIcon(QIcon(":/images/mask/polygon.svg"));
-    polygonButton->setToolTip("Create polygon mask");
-    m_activity_button_group->addButton(polygonButton, Canvas2DMode::POLYGON);
-    polygonButton->setCheckable(true);
-    addWidget(polygonButton);
-
-    auto* ellipseButton = new QToolButton;
-    ellipseButton->setIcon(QIcon(":/images/mask/ellipse.svg"));
-    ellipseButton->setToolTip("Create ellipse mask");
-    ellipseButton->setCheckable(true);
-    m_activity_button_group->addButton(ellipseButton, Canvas2DMode::ELLIPSE);
-    addWidget(ellipseButton);
-
-    auto* horizontalMaskButton = new QToolButton;
-    horizontalMaskButton->setIcon(QIcon(":/images/mask/horizontalline.svg"));
-    horizontalMaskButton->setToolTip("Create horizontal line mask");
-    horizontalMaskButton->setCheckable(true);
-    m_activity_button_group->addButton(horizontalMaskButton, Canvas2DMode::HORIZONTAL_MASK);
-    addWidget(horizontalMaskButton);
-
-    auto* verticalMaskButton = new QToolButton;
-    verticalMaskButton->setIcon(QIcon(":/images/mask/verticalline.svg"));
-    verticalMaskButton->setToolTip("Create vertical line mask");
-    verticalMaskButton->setCheckable(true);
-    m_activity_button_group->addButton(verticalMaskButton, Canvas2DMode::VERTICAL_MASK);
-    addWidget(verticalMaskButton);
+    //    maskAll_button->setCheckable(true);
+    //    m_activity_button_group->addButton(maskAll_button, Canvas2DMode::MASKALL);
+    //    addWidget(maskAll_button);
+
+    auto* rectangle_button = new QToolButton;
+    rectangle_button->setIcon(QIcon(":/images/mask/rectangle.svg"));
+    rectangle_button->setToolTip("Create rectangle mask");
+    rectangle_button->setCheckable(true);
+    m_activity_button_group->addButton(rectangle_button, Canvas2DMode::RECTANGLE);
+    addWidget(rectangle_button);
+
+    auto* polygon_button = new QToolButton;
+    polygon_button->setIcon(QIcon(":/images/mask/polygon.svg"));
+    polygon_button->setToolTip("Create polygon mask");
+    m_activity_button_group->addButton(polygon_button, Canvas2DMode::POLYGON);
+    polygon_button->setCheckable(true);
+    addWidget(polygon_button);
+
+    auto* ellipse_button = new QToolButton;
+    ellipse_button->setIcon(QIcon(":/images/mask/ellipse.svg"));
+    ellipse_button->setToolTip("Create ellipse mask");
+    ellipse_button->setCheckable(true);
+    m_activity_button_group->addButton(ellipse_button, Canvas2DMode::ELLIPSE);
+    addWidget(ellipse_button);
+
+    auto* horizontal_mask_button = new QToolButton;
+    horizontal_mask_button->setIcon(QIcon(":/images/mask/horizontalline.svg"));
+    horizontal_mask_button->setToolTip("Create horizontal line mask");
+    horizontal_mask_button->setCheckable(true);
+    m_activity_button_group->addButton(horizontal_mask_button, Canvas2DMode::HORIZONTAL_MASK);
+    addWidget(horizontal_mask_button);
+
+    auto* vertical_mask_button = new QToolButton;
+    vertical_mask_button->setIcon(QIcon(":/images/mask/verticalline.svg"));
+    vertical_mask_button->setToolTip("Create vertical line mask");
+    vertical_mask_button->setCheckable(true);
+    m_activity_button_group->addButton(vertical_mask_button, Canvas2DMode::VERTICAL_MASK);
+    addWidget(vertical_mask_button);
 
     connect(m_activity_button_group, &QButtonGroup::idClicked,
             [this] { emit activityChanged(currentActivity()); });
@@ -138,33 +138,34 @@ Data2DToolbar::Data2DToolbar()
 
     //... Modifier and inspector tools
 
-    auto* raiseButton = new QToolButton;
-    addWidget(raiseButton);
-    raiseButton->setDefaultAction(actions()->raise_mask);
+    auto* raise_button = new QToolButton;
+    addWidget(raise_button);
+    raise_button->setDefaultAction(actions()->raise_mask);
 
-    auto* lowerButton = new QToolButton;
-    addWidget(lowerButton);
-    lowerButton->setDefaultAction(actions()->lower_mask);
+    auto* lower_button = new QToolButton;
+    addWidget(lower_button);
+    lower_button->setDefaultAction(actions()->lower_mask);
 
     addSeparator();
 
-    auto* presentationButton = new QToolButton;
-    presentationButton->setIcon(QIcon(":/images/mask/lightbulb.svg"));
-    presentationButton->setToolTip("Press and hold to see mask results.");
-    addWidget(presentationButton);
+    auto* mask_display_button = new QToolButton;
+    mask_display_button->setIcon(QIcon(":/images/mask/lightbulb.svg"));
+    mask_display_button->setToolTip("Press and hold to see mask results.");
+    addWidget(mask_display_button);
 
-    connect(presentationButton, &QToolButton::pressed, [this] { emit presentationChange(true); });
-    connect(presentationButton, &QToolButton::released, [this] { emit presentationChange(false); });
+    connect(mask_display_button, &QToolButton::pressed, [this] { emit requestMaskDisplay(true); });
+    connect(mask_display_button, &QToolButton::released,
+            [this] { emit requestMaskDisplay(false); });
 
     addSeparator();
 
-    auto* plot2DButton = new QToolButton;
-    plot2DButton->setDefaultAction(actions()->save_plot);
-    addWidget(plot2DButton);
+    auto* plot2D_button = new QToolButton;
+    plot2D_button->setDefaultAction(actions()->save_plot);
+    addWidget(plot2D_button);
 
-    auto* saveButton = new QToolButton;
-    saveButton->setDefaultAction(actions()->save_projections);
-    addWidget(saveButton);
+    auto* save_button = new QToolButton;
+    save_button->setDefaultAction(actions()->save_projections);
+    addWidget(save_button);
 }
 
 void Data2DToolbar::onChangeActivityRequest(Canvas2DMode::Flag mode)

GUI/View/Setup/Data2DToolbar.h

@@ -34,7 +34,7 @@ public slots:
 
 signals:
     void activityChanged(Canvas2DMode::Flag);
-    void presentationChange(bool);
+    void requestMaskDisplay(bool);
 
 private:
     Canvas2DMode::Flag currentActivity() const;