Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
571e47d8
Commit
571e47d8
authored
9 years ago
by
Elliot Oram
Browse files
Options
Downloads
Patches
Plain Diff
Only ask about rebinning when shift is not used
Refs #14090
parent
5213ab2c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
+20
-15
20 additions, 15 deletions
...Qt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
with
20 additions
and
15 deletions
MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
+
20
−
15
View file @
571e47d8
...
...
@@ -94,21 +94,26 @@ void ContainerSubtraction::run() {
}
// Check for same binning across sample and container
if
(
!
checkWorkspaceBinningMatches
(
sampleWs
,
canCloneWs
))
{
QString
text
=
"Binning on sample and container does not match."
"Would you like to rebin the sample to match the container?"
;
int
result
=
QMessageBox
::
question
(
NULL
,
tr
(
"Rebin sample?"
),
tr
(
text
),
QMessageBox
::
Yes
,
QMessageBox
::
No
,
QMessageBox
::
NoButton
);
if
(
result
==
QMessageBox
::
Yes
)
{
addRebinStep
(
canCloneName
,
sampleWsName
);
}
else
{
m_batchAlgoRunner
->
clearQueue
();
g_log
.
error
(
"Cannot apply absorption corrections using a sample and "
"container with different binning."
);
return
;
if
(
m_uiForm
.
ckShiftCan
->
isChecked
())
{
addRebinStep
(
canCloneName
,
sampleWsName
);
}
else
{
if
(
!
checkWorkspaceBinningMatches
(
sampleWs
,
canCloneWs
))
{
QString
text
=
"Binning on sample and container does not match."
"Would you like to rebin the sample to match the container?"
;
int
result
=
QMessageBox
::
question
(
NULL
,
tr
(
"Rebin sample?"
),
tr
(
text
),
QMessageBox
::
Yes
,
QMessageBox
::
No
,
QMessageBox
::
NoButton
);
if
(
result
==
QMessageBox
::
Yes
)
{
addRebinStep
(
canCloneName
,
sampleWsName
);
}
else
{
m_batchAlgoRunner
->
clearQueue
();
g_log
.
error
(
"Cannot apply absorption corrections using a sample and "
"container with different binning."
);
return
;
}
}
}
...
...
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