Skip to content
Snippets Groups Projects
Commit 3e8df631 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

mask tools only for experimental data

parent f17191ec
No related branches found
No related tags found
1 merge request!2763Fix axes and add hide mask-related actions from sim/job
Pipeline #173497 passed
...@@ -73,7 +73,7 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source) ...@@ -73,7 +73,7 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source)
panels->addTab(prjns_panel, "Prjns"); panels->addTab(prjns_panel, "Prjns");
panels->setTabToolTip(tabIndex++, "Projections panel"); panels->setTabToolTip(tabIndex++, "Projections panel");
auto* toolbar = new Data2DToolbar; auto* toolbar = new Data2DToolbar(m_data_source->isFromData());
layout->addWidget(toolbar); layout->addWidget(toolbar);
//... Connections //... Connections
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <QLabel> #include <QLabel>
#include <QToolButton> #include <QToolButton>
Data2DToolbar::Data2DToolbar() Data2DToolbar::Data2DToolbar(bool mask_tools)
: m_activity_button_group(new QButtonGroup) : m_activity_button_group(new QButtonGroup)
{ {
//... Frame tools //... Frame tools
...@@ -71,86 +71,89 @@ Data2DToolbar::Data2DToolbar() ...@@ -71,86 +71,89 @@ Data2DToolbar::Data2DToolbar()
addSeparator(); addSeparator();
//... Shape creation tools if (mask_tools) {
//... Shape creation tools
auto* roi_button = new QToolButton;
roi_button->setIcon(QIcon(":/images/mask/roi.svg")); auto* roi_button = new QToolButton;
roi_button->setToolTip("Create region of interest"); roi_button->setIcon(QIcon(":/images/mask/roi.svg"));
roi_button->setCheckable(true); roi_button->setToolTip("Create region of interest");
m_activity_button_group->addButton(roi_button, Canvas2DMode::ROI); roi_button->setCheckable(true);
addWidget(roi_button); m_activity_button_group->addButton(roi_button, Canvas2DMode::ROI);
addWidget(roi_button);
// auto* maskAll_button = new QToolButton;
// maskAll_button->setIcon(QIcon(":/images/mask/maskall.svg")); // auto* maskAll_button = new QToolButton;
// maskAll_button->setToolTip("Create masked area covering whole detector plane\n" // maskAll_button->setIcon(QIcon(":/images/mask/maskall.svg"));
// "Will be placed beneath all masks. Only one instance is // maskAll_button->setToolTip("Create masked area covering whole detector plane\n"
// allowed."); // "Will be placed beneath all masks. Only one instance is
// maskAll_button->setCheckable(true); // allowed.");
// m_activity_button_group->addButton(maskAll_button, Canvas2DMode::MASKALL); // maskAll_button->setCheckable(true);
// addWidget(maskAll_button); // 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")); auto* rectangle_button = new QToolButton;
rectangle_button->setToolTip("Create rectangle mask"); rectangle_button->setIcon(QIcon(":/images/mask/rectangle.svg"));
rectangle_button->setCheckable(true); rectangle_button->setToolTip("Create rectangle mask");
m_activity_button_group->addButton(rectangle_button, Canvas2DMode::RECTANGLE); rectangle_button->setCheckable(true);
addWidget(rectangle_button); 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")); auto* polygon_button = new QToolButton;
polygon_button->setToolTip("Create polygon mask"); polygon_button->setIcon(QIcon(":/images/mask/polygon.svg"));
m_activity_button_group->addButton(polygon_button, Canvas2DMode::POLYGON); polygon_button->setToolTip("Create polygon mask");
polygon_button->setCheckable(true); m_activity_button_group->addButton(polygon_button, Canvas2DMode::POLYGON);
addWidget(polygon_button); polygon_button->setCheckable(true);
addWidget(polygon_button);
auto* ellipse_button = new QToolButton;
ellipse_button->setIcon(QIcon(":/images/mask/ellipse.svg")); auto* ellipse_button = new QToolButton;
ellipse_button->setToolTip("Create ellipse mask"); ellipse_button->setIcon(QIcon(":/images/mask/ellipse.svg"));
ellipse_button->setCheckable(true); ellipse_button->setToolTip("Create ellipse mask");
m_activity_button_group->addButton(ellipse_button, Canvas2DMode::ELLIPSE); ellipse_button->setCheckable(true);
addWidget(ellipse_button); 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")); auto* horizontal_mask_button = new QToolButton;
horizontal_mask_button->setToolTip("Create horizontal line mask"); horizontal_mask_button->setIcon(QIcon(":/images/mask/horizontalline.svg"));
horizontal_mask_button->setCheckable(true); horizontal_mask_button->setToolTip("Create horizontal line mask");
m_activity_button_group->addButton(horizontal_mask_button, Canvas2DMode::HORIZONTAL_MASK); horizontal_mask_button->setCheckable(true);
addWidget(horizontal_mask_button); 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")); auto* vertical_mask_button = new QToolButton;
vertical_mask_button->setToolTip("Create vertical line mask"); vertical_mask_button->setIcon(QIcon(":/images/mask/verticalline.svg"));
vertical_mask_button->setCheckable(true); vertical_mask_button->setToolTip("Create vertical line mask");
m_activity_button_group->addButton(vertical_mask_button, Canvas2DMode::VERTICAL_MASK); vertical_mask_button->setCheckable(true);
addWidget(vertical_mask_button); 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()); }); connect(m_activity_button_group, &QButtonGroup::idClicked,
[this] { emit activityChanged(currentActivity()); });
addSeparator();
addSeparator();
//... Modifier and inspector tools
//... Modifier and inspector tools
auto* raise_button = new QToolButton;
addWidget(raise_button); auto* raise_button = new QToolButton;
raise_button->setDefaultAction(actions()->raise_mask); addWidget(raise_button);
raise_button->setDefaultAction(actions()->raise_mask);
auto* lower_button = new QToolButton;
addWidget(lower_button); auto* lower_button = new QToolButton;
lower_button->setDefaultAction(actions()->lower_mask); addWidget(lower_button);
lower_button->setDefaultAction(actions()->lower_mask);
addSeparator();
addSeparator();
auto* mask_display_button = new QToolButton;
mask_display_button->setIcon(QIcon(":/images/mask/lightbulb.svg")); auto* mask_display_button = new QToolButton;
mask_display_button->setToolTip("Press and hold to see mask results."); mask_display_button->setIcon(QIcon(":/images/mask/lightbulb.svg"));
addWidget(mask_display_button); mask_display_button->setToolTip("Press and hold to see mask results.");
addWidget(mask_display_button);
connect(mask_display_button, &QToolButton::pressed, [this] { emit requestMaskDisplay(true); });
connect(mask_display_button, &QToolButton::released, connect(mask_display_button, &QToolButton::pressed,
[this] { emit requestMaskDisplay(false); }); [this] { emit requestMaskDisplay(true); });
connect(mask_display_button, &QToolButton::released,
addSeparator(); [this] { emit requestMaskDisplay(false); });
addSeparator();
}
auto* plot2D_button = new QToolButton; auto* plot2D_button = new QToolButton;
plot2D_button->setDefaultAction(actions()->save_plot); plot2D_button->setDefaultAction(actions()->save_plot);
......
...@@ -26,7 +26,7 @@ class FrameActions; ...@@ -26,7 +26,7 @@ class FrameActions;
class Data2DToolbar : public DataToolbar { class Data2DToolbar : public DataToolbar {
Q_OBJECT Q_OBJECT
public: public:
Data2DToolbar(); Data2DToolbar(bool mask_tools);
public slots: public slots:
void onChangeActivityRequest(Canvas2DMode::Flag mode); void onChangeActivityRequest(Canvas2DMode::Flag mode);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment