Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
3e8df631
Commit
3e8df631
authored
4 months ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
mask tools only for experimental data
parent
f17191ec
No related branches found
No related tags found
1 merge request
!2763
Fix axes and add hide mask-related actions from sim/job
Pipeline
#173497
passed
4 months ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/View/Frame/Plot2DFrame.cpp
+1
-1
1 addition, 1 deletion
GUI/View/Frame/Plot2DFrame.cpp
GUI/View/Setup/Data2DToolbar.cpp
+84
-81
84 additions, 81 deletions
GUI/View/Setup/Data2DToolbar.cpp
GUI/View/Setup/Data2DToolbar.h
+1
-1
1 addition, 1 deletion
GUI/View/Setup/Data2DToolbar.h
with
86 additions
and
83 deletions
GUI/View/Frame/Plot2DFrame.cpp
+
1
−
1
View file @
3e8df631
...
...
@@ -73,7 +73,7 @@ Plot2DFrame::Plot2DFrame(std::unique_ptr<DataSource>&& data_source)
panels
->
addTab
(
prjns_panel
,
"Prjns"
);
panels
->
setTabToolTip
(
tabIndex
++
,
"Projections panel"
);
auto
*
toolbar
=
new
Data2DToolbar
;
auto
*
toolbar
=
new
Data2DToolbar
(
m_data_source
->
isFromData
())
;
layout
->
addWidget
(
toolbar
);
//... Connections
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Setup/Data2DToolbar.cpp
+
84
−
81
View file @
3e8df631
...
...
@@ -18,7 +18,7 @@
#include
<QLabel>
#include
<QToolButton>
Data2DToolbar
::
Data2DToolbar
()
Data2DToolbar
::
Data2DToolbar
(
bool
mask_tools
)
:
m_activity_button_group
(
new
QButtonGroup
)
{
//... Frame tools
...
...
@@ -71,86 +71,89 @@ Data2DToolbar::Data2DToolbar()
addSeparator
();
//... Shape creation tools
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* 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.");
// 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
());
});
addSeparator
();
//... Modifier and inspector tools
auto
*
raise_button
=
new
QToolButton
;
addWidget
(
raise_button
);
raise_button
->
setDefaultAction
(
actions
()
->
raise_mask
);
auto
*
lower_button
=
new
QToolButton
;
addWidget
(
lower_button
);
lower_button
->
setDefaultAction
(
actions
()
->
lower_mask
);
addSeparator
();
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
(
mask_display_button
,
&
QToolButton
::
pressed
,
[
this
]
{
emit
requestMaskDisplay
(
true
);
});
connect
(
mask_display_button
,
&
QToolButton
::
released
,
[
this
]
{
emit
requestMaskDisplay
(
false
);
});
addSeparator
();
if
(
mask_tools
)
{
//... Shape creation tools
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* 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.");
// 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
());
});
addSeparator
();
//... Modifier and inspector tools
auto
*
raise_button
=
new
QToolButton
;
addWidget
(
raise_button
);
raise_button
->
setDefaultAction
(
actions
()
->
raise_mask
);
auto
*
lower_button
=
new
QToolButton
;
addWidget
(
lower_button
);
lower_button
->
setDefaultAction
(
actions
()
->
lower_mask
);
addSeparator
();
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
(
mask_display_button
,
&
QToolButton
::
pressed
,
[
this
]
{
emit
requestMaskDisplay
(
true
);
});
connect
(
mask_display_button
,
&
QToolButton
::
released
,
[
this
]
{
emit
requestMaskDisplay
(
false
);
});
addSeparator
();
}
auto
*
plot2D_button
=
new
QToolButton
;
plot2D_button
->
setDefaultAction
(
actions
()
->
save_plot
);
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Setup/Data2DToolbar.h
+
1
−
1
View file @
3e8df631
...
...
@@ -26,7 +26,7 @@ class FrameActions;
class
Data2DToolbar
:
public
DataToolbar
{
Q_OBJECT
public:
Data2DToolbar
();
Data2DToolbar
(
bool
mask_tools
);
public
slots
:
void
onChangeActivityRequest
(
Canvas2DMode
::
Flag
mode
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment