Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
1e5b1c25
Commit
1e5b1c25
authored
Mar 26, 2020
by
Mathieu Tillet
Browse files
Add firsts steps for masking single pixels
parent
428ccf75
Changes
2
Hide whitespace changes
Inline
Side-by-side
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetMaskTab.h
View file @
1e5b1c25
...
...
@@ -165,6 +165,7 @@ protected:
QPushButton
*
m_rectangle
;
QPushButton
*
m_ring_ellipse
;
QPushButton
*
m_ring_rectangle
;
QPushButton
*
m_pixel
;
QPushButton
*
m_free_draw
;
QPushButton
*
m_applyToData
;
...
...
qt/widgets/instrumentview/src/InstrumentWidgetMaskTab.cpp
View file @
1e5b1c25
...
...
@@ -116,6 +116,12 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
m_rectangle
->
setToolTip
(
"Draw a rectangle (Ctrl+Alt+R)"
);
m_rectangle
->
setShortcut
(
QKeySequence
(
"Ctrl+Alt+R"
));
m_pixel
=
new
QPushButton
();
m_pixel
->
setCheckable
(
true
);
m_pixel
->
setAutoExclusive
(
true
);
m_pixel
->
setIcon
(
QIcon
(
":/PickTools/selection-pointer.png"
));
m_pixel
->
setToolTip
(
"Mask a pixel"
);
m_ring_ellipse
=
new
QPushButton
();
m_ring_ellipse
->
setCheckable
(
true
);
m_ring_ellipse
->
setAutoExclusive
(
true
);
...
...
@@ -145,6 +151,7 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
toolBox
->
addWidget
(
m_ring_ellipse
);
toolBox
->
addWidget
(
m_ring_rectangle
);
toolBox
->
addWidget
(
m_free_draw
);
toolBox
->
addWidget
(
m_pixel
);
toolBox
->
addStretch
();
toolBox
->
setSpacing
(
2
);
toolBox
->
setMargin
(
0
);
...
...
@@ -156,6 +163,7 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
connect
(
m_ring_ellipse
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
setActivity
()));
connect
(
m_ring_rectangle
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
setActivity
()));
connect
(
m_free_draw
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
setActivity
()));
connect
(
m_pixel
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
setActivity
()));
m_move
->
setChecked
(
true
);
auto
*
toolGroup
=
new
QFrame
();
toolGroup
->
setLayout
(
toolBox
);
...
...
@@ -351,6 +359,8 @@ InstrumentWidgetMaskTab::InstrumentWidgetMaskTab(InstrumentWidget *instrWidget)
* Initialize the tab when new projection surface is created.
*/
void
InstrumentWidgetMaskTab
::
initSurface
()
{
connect
(
m_instrWidget
->
getSurface
().
get
(),
SIGNAL
(
singlePixelPicked
(
size_t
)),
this
,
SLOT
(
singlePixelPicked
(
size_t
)));
connect
(
m_instrWidget
->
getSurface
().
get
(),
SIGNAL
(
shapeCreated
()),
this
,
SLOT
(
shapeCreated
()));
connect
(
m_instrWidget
->
getSurface
().
get
(),
SIGNAL
(
shapeSelected
()),
this
,
...
...
@@ -408,6 +418,9 @@ void InstrumentWidgetMaskTab::selectTool(Activity tool) {
case
DrawFree
:
m_free_draw
->
setChecked
(
true
);
break
;
case
Pixel
:
m_pixel
->
setChecked
(
true
);
break
;
default:
throw
std
::
invalid_argument
(
"Invalid tool type."
);
}
...
...
@@ -467,7 +480,11 @@ void InstrumentWidgetMaskTab::setActivity() {
m_instrWidget
->
getSurface
()
->
setInteractionMode
(
ProjectionSurface
::
DrawFreeMode
);
m_activeTool
->
setText
(
"Tool: Free draw. "
+
whatIsBeingSelected
);
}
}
else
if
(
m_pixel
->
isChecked
())
{
m_activity
=
Pixel
;
m_activeTool
->
setText
(
"Tool: Pixel selection. "
+
whatIsBeingSelected
);
}
m_instrWidget
->
updateInfoText
();
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment