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
116d65a0
Commit
116d65a0
authored
4 years ago
by
Robert Applin
Browse files
Options
Downloads
Patches
Plain Diff
Refs #30918. Remove unwanted code.
parent
d7abaaaa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
qt/widgets/common/inc/MantidQtWidgets/Common/BasicFitOptionsBrowser.h
+0
-71
0 additions, 71 deletions
...ommon/inc/MantidQtWidgets/Common/BasicFitOptionsBrowser.h
qt/widgets/common/src/BasicFitOptionsBrowser.cpp
+24
-641
24 additions, 641 deletions
qt/widgets/common/src/BasicFitOptionsBrowser.cpp
with
24 additions
and
712 deletions
qt/widgets/common/inc/MantidQtWidgets/Common/BasicFitOptionsBrowser.h
+
0
−
71
View file @
116d65a0
...
...
@@ -46,47 +46,23 @@ public:
BasicFitOptionsBrowser
(
QWidget
*
parent
=
nullptr
,
FittingMode
fitType
=
FittingMode
::
SIMULTANEOUS
);
~
BasicFitOptionsBrowser
();
QString
getProperty
(
const
QString
&
name
)
const
;
void
setProperty
(
const
QString
&
name
,
const
QString
&
value
);
void
copyPropertiesToAlgorithm
(
Mantid
::
API
::
IAlgorithm
&
fit
)
const
;
void
saveSettings
(
QSettings
&
settings
)
const
;
void
loadSettings
(
const
QSettings
&
settings
);
FittingMode
getCurrentFittingType
()
const
;
void
setCurrentFittingType
(
FittingMode
fitType
);
void
lockCurrentFittingType
(
FittingMode
fitType
);
void
unlockCurrentFittingType
();
void
setLogNames
(
const
QStringList
&
logNames
);
void
setParameterNamesForPlotting
(
const
QStringList
&
parNames
);
QString
getParameterToPlot
()
const
;
bool
addPropertyToBlacklist
(
const
QString
&
);
signals:
void
changedToSequentialFitting
();
void
changedToSimultaneousFitting
();
// emitted when m_doubleManager reports a change
void
doublePropertyChanged
(
const
QString
&
propertyName
);
protected:
QtProperty
*
addDoubleProperty
(
const
QString
&
propertyName
);
void
displayProperty
(
const
QString
&
propertyName
,
bool
show
=
true
);
void
displaySequentialFitProperties
();
private
slots
:
void
enumChanged
(
QtProperty
*
/*prop*/
);
void
doubleChanged
(
QtProperty
*
property
);
private:
void
createBrowser
();
void
initFittingTypeProp
();
void
createProperties
();
void
createCommonProperties
();
void
createSimultaneousFitProperties
();
void
createSequentialFitProperties
();
void
updateMinimizer
();
void
switchFitType
();
void
displayNormalFitProperties
();
QtProperty
*
createPropertyProperty
(
Mantid
::
Kernel
::
Property
*
prop
);
void
addProperty
(
const
QString
&
name
,
QtProperty
*
prop
,
QString
(
BasicFitOptionsBrowser
::*
getter
)(
QtProperty
*
)
...
...
@@ -94,42 +70,18 @@ private:
void
(
BasicFitOptionsBrowser
::*
setter
)(
QtProperty
*
,
const
QString
&
));
void
removeProperty
(
const
QString
&
name
);
// Setters and getters
QString
getMinimizer
(
QtProperty
*
/*unused*/
)
const
;
void
setMinimizer
(
QtProperty
*
/*unused*/
,
const
QString
&
/*value*/
);
QString
getIntProperty
(
QtProperty
*
/*prop*/
)
const
;
void
setIntProperty
(
QtProperty
*
/*prop*/
,
const
QString
&
/*value*/
);
QString
getDoubleProperty
(
QtProperty
*
/*prop*/
)
const
;
void
setDoubleProperty
(
QtProperty
*
/*prop*/
,
const
QString
&
/*value*/
);
QString
getBoolProperty
(
QtProperty
*
/*prop*/
)
const
;
void
setBoolProperty
(
QtProperty
*
/*prop*/
,
const
QString
&
/*value*/
);
QString
getStringEnumProperty
(
QtProperty
*
/*prop*/
)
const
;
void
setStringEnumProperty
(
QtProperty
*
/*prop*/
,
const
QString
&
/*value*/
);
QString
getStringProperty
(
QtProperty
*
/*prop*/
)
const
;
void
setStringProperty
(
QtProperty
*
/*prop*/
,
const
QString
&
/*value*/
);
void
setPropertyEnumValues
(
QtProperty
*
prop
,
const
QStringList
&
values
);
/// Manager for bool properties
QtBoolPropertyManager
*
m_boolManager
;
/// Manager for int properties
QtIntPropertyManager
*
m_intManager
;
/// Manager for double properties
QtDoublePropertyManager
*
m_doubleManager
;
/// Manager for string properties
QtStringPropertyManager
*
m_stringManager
;
/// Manager for the string list properties
QtEnumPropertyManager
*
m_enumManager
;
/// Manager for groups of properties
QtGroupPropertyManager
*
m_groupManager
;
/// FitType property
QtProperty
*
m_fittingTypeProp
;
/// Minimizer group property
QtProperty
*
m_minimizerGroup
;
/// Minimizer property
QtProperty
*
m_minimizer
;
/// CostFunction property
...
...
@@ -138,27 +90,6 @@ private:
QtProperty
*
m_maxIterations
;
/// EvaluationType property
QtProperty
*
m_evaluationType
;
/// Peak radius property
QtProperty
*
m_peakRadius
;
// Fit properties
/// Output property
QtProperty
*
m_output
;
/// IgnoreInvalidData property
QtProperty
*
m_ignoreInvalidData
;
// PlotPeakByLogValue properties
/// Store special properties of the sequential Fit
QList
<
QtProperty
*>
m_sequentialProperties
;
/// PlotPeakByLogValue FitType property
QtProperty
*
m_plotPeakByLogValueFitType
;
/// OutputWorkspace property
QtProperty
*
m_outputWorkspace
;
/// LogValue property
QtProperty
*
m_logValue
;
/// Property for a name of a parameter to plot
/// against LogValue
QtProperty
*
m_plotParameter
;
/// Qt property browser which displays properties
QtTreePropertyBrowser
*
m_browser
;
...
...
@@ -178,8 +109,6 @@ private:
/// The Fitting Type
FittingMode
m_fittingType
;
/// Store special properties of the normal Fit
QList
<
QtProperty
*>
m_simultaneousProperties
;
QList
<
QtProperty
*>
m_blacklist
;
};
...
...
This diff is collapsed.
Click to expand it.
qt/widgets/common/src/BasicFitOptionsBrowser.cpp
+
24
−
641
View file @
116d65a0
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