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
ff7058bd
Commit
ff7058bd
authored
7 years ago
by
Nick Draper
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #20852 from mantidproject/20844_sequentialFitBrowser
sequential fit bug
parents
aef33d89
ba7f75d8
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
qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
+16
-1
16 additions, 1 deletion
qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
with
16 additions
and
1 deletion
qt/scientific_interfaces/Muon/MuonSequentialFitDialog.cpp
+
16
−
1
View file @
ff7058bd
...
...
@@ -20,6 +20,21 @@ using MantidQt::MantidWidgets::MuonFitPropertyBrowser;
namespace
{
Logger
g_log
(
"MuonSequentialFitDialog"
);
std
::
string
removePath
(
const
std
::
string
&
labelIn
)
{
size_t
path
=
labelIn
.
find_last_of
(
"/"
);
if
(
path
==
std
::
string
::
npos
)
{
path
=
labelIn
.
find_last_of
(
'\\'
);
}
std
::
string
useThisLabel
=
labelIn
;
if
(
path
!=
std
::
string
::
npos
)
{
path
=
path
+
1
;
size_t
end
=
labelIn
.
find_last_of
(
"."
);
useThisLabel
=
labelIn
.
substr
(
path
);
useThisLabel
=
useThisLabel
.
substr
(
0
,
end
-
path
);
auto
test
=
useThisLabel
;
}
return
useThisLabel
;
}
}
const
std
::
string
MuonSequentialFitDialog
::
SEQUENTIAL_PREFIX
(
"MuonSeqFit_"
);
...
...
@@ -328,7 +343,7 @@ void MuonSequentialFitDialog::continueFit() {
// Get names of workspaces to fit
const
auto
wsNames
=
m_dataPresenter
->
generateWorkspaceNames
(
m_ui
.
runs
->
getInstrumentOverride
().
toStdString
(),
m_ui
.
runs
->
getText
().
toStdString
(),
false
);
removePath
(
m_ui
.
runs
->
getText
().
toStdString
()
)
,
false
);
if
(
wsNames
.
size
()
==
0
)
{
QMessageBox
::
critical
(
this
,
"No data to fit"
,
...
...
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