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
257013b6
Commit
257013b6
authored
9 years ago
by
Federico Montesino Pouzols
Browse files
Options
Downloads
Patches
Plain Diff
fix include and mock file name, re #13140
parent
082d1c75
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+3
-3
3 additions, 3 deletions
...tomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
MantidQt/CustomInterfaces/test/ImageROIViewMock.h
+5
-5
5 additions, 5 deletions
MantidQt/CustomInterfaces/test/ImageROIViewMock.h
with
8 additions
and
8 deletions
MantidQt/CustomInterfaces/src/Tomography/TomographyIfaceViewQtGUI.cpp
+
3
−
3
View file @
257013b6
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#include
"MantidQtAPI/AlgorithmInputHistory.h"
#include
"MantidQtAPI/AlgorithmInputHistory.h"
#include
"MantidQtAPI/AlgorithmRunner.h"
#include
"MantidQtAPI/AlgorithmRunner.h"
#include
"MantidQtAPI/HelpWindow.h"
#include
"MantidQtAPI/HelpWindow.h"
#include
"MantidQtCustomInterfaces/Tomography/Image
CoR
ViewQtWidget.h"
#include
"MantidQtCustomInterfaces/Tomography/Image
ROI
ViewQtWidget.h"
#include
"MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
#include
"MantidQtCustomInterfaces/Tomography/TomographyIfaceViewQtGUI.h"
#include
"MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
#include
"MantidQtCustomInterfaces/Tomography/TomographyIfacePresenter.h"
#include
"MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
#include
"MantidQtCustomInterfaces/Tomography/ToolConfigAstraToolbox.h"
...
@@ -73,8 +73,8 @@ void TomographyIfaceViewQtGUI::initLayout() {
...
@@ -73,8 +73,8 @@ void TomographyIfaceViewQtGUI::initLayout() {
m_uiTabSetup
.
setupUi
(
tabSetupW
);
m_uiTabSetup
.
setupUi
(
tabSetupW
);
m_ui
.
tabMain
->
addTab
(
tabSetupW
,
QString
(
"Setup"
));
m_ui
.
tabMain
->
addTab
(
tabSetupW
,
QString
(
"Setup"
));
Image
CoR
ViewQtWidget
*
tab
CoR
W
=
new
Image
CoR
ViewQtWidget
(
m_ui
.
tabMain
);
Image
ROI
ViewQtWidget
*
tab
ROI
W
=
new
Image
ROI
ViewQtWidget
(
m_ui
.
tabMain
);
m_ui
.
tabMain
->
addTab
(
tab
CoR
W
,
QString
(
"ROI etc."
));
m_ui
.
tabMain
->
addTab
(
tab
ROI
W
,
QString
(
"ROI etc."
));
QWidget
*
tabFiltersW
=
new
QWidget
();
QWidget
*
tabFiltersW
=
new
QWidget
();
m_ui
.
tabMain
->
addTab
(
tabFiltersW
,
QString
(
"Filters"
));
m_ui
.
tabMain
->
addTab
(
tabFiltersW
,
QString
(
"Filters"
));
...
...
This diff is collapsed.
Click to expand it.
MantidQt/CustomInterfaces/test/Image
CoR
ViewMock.h
→
MantidQt/CustomInterfaces/test/Image
ROI
ViewMock.h
+
5
−
5
View file @
257013b6
#ifndef MANTID_CUSTOMINTERFACES_IMAGE
COR
VIEWMOCK_H
#ifndef MANTID_CUSTOMINTERFACES_IMAGE
ROI
VIEWMOCK_H
#define MANTID_CUSTOMINTERFACES_IMAGE
COR
VIEWMOCK_H
#define MANTID_CUSTOMINTERFACES_IMAGE
ROI
VIEWMOCK_H
#include
"MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
#include
"MantidQtCustomInterfaces/Tomography/ITomographyIfaceView.h"
#include
<gmock/gmock.h>
#include
<gmock/gmock.h>
class
MockImage
CoR
View
:
public
MantidQt
::
CustomInterfaces
::
IImage
CoR
View
{
class
MockImage
ROI
View
:
public
MantidQt
::
CustomInterfaces
::
IImage
ROI
View
{
public:
public:
// void initParams(ImageStackPreParams ¶ms)
// void initParams(ImageStackPreParams ¶ms)
MOCK_METHOD1
(
setParams
,
MOCK_METHOD1
(
setParams
,
...
@@ -19,7 +19,7 @@ public:
...
@@ -19,7 +19,7 @@ public:
MOCK_CONST_METHOD0
(
selectionState
,
SelectionState
());
MOCK_CONST_METHOD0
(
selectionState
,
SelectionState
());
// void changeSelectionState(const SelectionState state);
// void changeSelectionState(const SelectionState state);
MOCK_METHOD1
(
changeSelectionState
,
void
(
const
IImage
CoR
View
::
SelectionState
&
));
MOCK_METHOD1
(
changeSelectionState
,
void
(
const
IImage
ROI
View
::
SelectionState
&
));
// void showStack(const std::string &path);
// void showStack(const std::string &path);
MOCK_METHOD1
(
showStack
,
void
(
const
std
::
string
&
));
MOCK_METHOD1
(
showStack
,
void
(
const
std
::
string
&
));
...
@@ -63,4 +63,4 @@ public:
...
@@ -63,4 +63,4 @@ public:
MOCK_METHOD0
(
resetNormArea
,
void
());
MOCK_METHOD0
(
resetNormArea
,
void
());
};
};
#endif // MANTID_CUSTOMINTERFACES_IMAGE
COR
VIEWMOCK_H
#endif // MANTID_CUSTOMINTERFACES_IMAGE
ROI
VIEWMOCK_H
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