Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
4224ea0a
Commit
4224ea0a
authored
Jun 15, 2020
by
Anthony Lim
Browse files
refs #26878 fix for ALF view destructors
parent
babb9e70
Changes
8
Hide whitespace changes
Inline
Side-by-side
qt/scientific_interfaces/Direct/ALFCustomInstrumentModel.h
View file @
4224ea0a
...
...
@@ -20,6 +20,8 @@ class DLLExport IALFCustomInstrumentModel
:
public
virtual
MantidWidgets
::
IBaseCustomInstrumentModel
{
public:
IALFCustomInstrumentModel
(){}
virtual
~
IALFCustomInstrumentModel
(){};
// virtual so we can patch them later
virtual
void
loadAlg
(
const
std
::
string
&
name
)
=
0
;
virtual
void
transformData
()
=
0
;
...
...
qt/scientific_interfaces/Direct/ALFCustomInstrumentView.h
View file @
4224ea0a
...
...
@@ -23,6 +23,8 @@ namespace CustomInterfaces {
class
MANTIDQT_DIRECT_DLL
IALFCustomInstrumentView
:
public
virtual
MantidWidgets
::
IBaseCustomInstrumentView
{
public:
IALFCustomInstrumentView
(){};
virtual
~
IALFCustomInstrumentView
(){};
virtual
void
observeExtractSingleTube
(
Observer
*
listner
)
=
0
;
virtual
void
observeAverageTube
(
Observer
*
listner
)
=
0
;
virtual
void
addSpectrum
(
const
std
::
string
&
wsName
)
=
0
;
...
...
@@ -63,4 +65,4 @@ private:
MantidWidgets
::
IPlotFitAnalysisPaneView
*
m_analysisPane
;
};
}
// namespace CustomInterfaces
}
// namespace MantidQt
\ No newline at end of file
}
// namespace MantidQt
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentMocks.h
View file @
4224ea0a
...
...
@@ -33,7 +33,7 @@ class EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW MockBaseCustomInstrumentView
:
public
MantidQt
::
MantidWidgets
::
IBaseCustomInstrumentView
{
public:
explicit
MockBaseCustomInstrumentView
(
const
std
::
string
&
instrument
,
QWidget
*
parent
=
nullptr
){(
void
)
instrument
;
(
void
)
parent
};
QWidget
*
parent
=
nullptr
){(
void
)
instrument
;
(
void
)
parent
;
};
~
MockBaseCustomInstrumentView
(){};
MOCK_METHOD0
(
getFile
,
std
::
string
());
...
...
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentModel.h
View file @
4224ea0a
...
...
@@ -17,6 +17,8 @@ namespace MantidWidgets {
class
EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW
IBaseCustomInstrumentModel
{
public:
IBaseCustomInstrumentModel
(){};
virtual
~
IBaseCustomInstrumentModel
(){};
virtual
void
loadEmptyInstrument
()
=
0
;
virtual
std
::
pair
<
int
,
std
::
string
>
loadData
(
const
std
::
string
&
name
)
=
0
;
virtual
void
setCurrentRun
(
int
&
run
)
=
0
;
...
...
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/BaseCustomInstrumentView.h
View file @
4224ea0a
...
...
@@ -22,6 +22,8 @@ namespace MantidWidgets {
class
EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW
IBaseCustomInstrumentView
{
public:
IBaseCustomInstrumentView
(){};
virtual
~
IBaseCustomInstrumentView
(){};
virtual
std
::
string
getFile
()
=
0
;
virtual
void
setRunQuietly
(
const
std
::
string
&
runNumber
)
=
0
;
virtual
void
observeLoadRun
(
Observer
*
listener
)
=
0
;
...
...
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneModel.h
View file @
4224ea0a
...
...
@@ -19,7 +19,7 @@ class EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW PlotFitAnalysisPaneModel {
public:
PlotFitAnalysisPaneModel
(){};
~
PlotFitAnalysisPaneModel
(){};
virtual
~
PlotFitAnalysisPaneModel
(){};
virtual
IFunction_sptr
doFit
(
const
std
::
string
&
wsName
,
const
std
::
pair
<
double
,
double
>
&
range
,
const
IFunction_sptr
func
);
...
...
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPanePresenter.h
View file @
4224ea0a
...
...
@@ -19,7 +19,7 @@ class EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW IPlotFitAnalysisPanePresenter {
public:
IPlotFitAnalysisPanePresenter
(){};
~
IPlotFitAnalysisPanePresenter
(){};
virtual
~
IPlotFitAnalysisPanePresenter
(){};
virtual
void
destructor
()
=
0
;
virtual
IPlotFitAnalysisPaneView
*
getView
()
=
0
;
virtual
std
::
string
getCurrentWS
()
=
0
;
...
...
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/PlotFitAnalysisPaneView.h
View file @
4224ea0a
...
...
@@ -24,6 +24,8 @@ namespace MantidWidgets {
class
EXPORT_OPT_MANTIDQT_INSTRUMENTVIEW
IPlotFitAnalysisPaneView
{
public:
IPlotFitAnalysisPaneView
(){};
virtual
~
IPlotFitAnalysisPaneView
(){};
virtual
void
observeFitButton
(
Observer
*
listener
)
=
0
;
virtual
std
::
pair
<
double
,
double
>
getRange
()
=
0
;
virtual
Mantid
::
API
::
IFunction_sptr
getFunction
()
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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