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
5811bc46
Commit
5811bc46
authored
9 years ago
by
Elliot Oram
Browse files
Options
Downloads
Patches
Plain Diff
Fix compiler warnings in ConvFit
Refs #13636
parent
ff4228e8
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+3
-9
3 additions, 9 deletions
...Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
with
3 additions
and
9 deletions
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+
3
−
9
View file @
5811bc46
...
...
@@ -299,7 +299,7 @@ void ConvFit::algorithmComplete(bool error) {
disconnect
(
m_batchAlgoRunner
,
SIGNAL
(
batchComplete
(
bool
)),
this
,
SLOT
(
algorithmComplete
(
bool
)));
std
::
string
resultName
=
m_baseName
+
"_Result"
;
std
::
string
resultName
=
m_baseName
.
toStdString
()
+
"_Result"
;
MatrixWorkspace_sptr
resultWs
=
AnalysisDataService
::
Instance
().
retrieveWS
<
MatrixWorkspace
>
(
resultName
);
...
...
@@ -342,14 +342,8 @@ void ConvFit::algorithmComplete(bool error) {
}
if
(
temp
!=
0.0
)
{
// Obtain Spectra Min/Max
std
::
string
specMin
=
m_uiForm
.
spSpectraMin
->
text
().
toStdString
();
std
::
string
specMax
=
m_uiForm
.
spSpectraMax
->
text
().
toStdString
();
const
int
minSpec
=
boost
::
lexical_cast
<
int
>
(
specMin
);
const
int
maxSpec
=
boost
::
lexical_cast
<
int
>
(
specMax
)
+
1
;
// Obtain WorkspaceGroup from ADS
std
::
string
groupName
=
m_baseName
+
"_Workspaces"
;
std
::
string
groupName
=
m_baseName
.
toStdString
()
+
"_Workspaces"
;
WorkspaceGroup_sptr
groupWs
=
AnalysisDataService
::
Instance
().
retrieveWS
<
WorkspaceGroup
>
(
groupName
);
...
...
@@ -1613,7 +1607,7 @@ QString ConvFit::convertFuncToShort(const QString &original) {
return
"SFT"
;
}
auto
pos
=
original
.
find
(
"Circle"
);
if
(
pos
!=
std
::
string
::
npos
)
{
if
(
pos
!=
-
1
)
{
result
+=
"DC"
;
}
else
{
result
+=
"DS"
;
...
...
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