Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
e9ce51fd
Commit
e9ce51fd
authored
Jul 28, 2017
by
Roman Tolchenov
Browse files
Moved the instrument view.
parent
c61e2490
Changes
196
Hide whitespace changes
Inline
Side-by-side
MantidPlot/CMakeLists.txt
View file @
e9ce51fd
...
...
@@ -696,8 +696,8 @@ include_directories ( src )
include_directories
(
src/lib/include
)
include_directories
(
src/lib/3rdparty/qtcolorpicker/src
)
include_directories
(
../QtPropertyBrowser/src
)
include_directories
(
../qt/widgets/common/inc
)
include_directories
(
../qt/widgets/instrumentview/inc
)
include_directories
(
../qt/widgets/sliceviewer/inc
)
include_directories
(
../qt/widgets/spectrumviewer/inc
)
include_directories
(
../MantidQt/Factory/inc
)
...
...
@@ -794,8 +794,8 @@ add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp
target_link_libraries
(
MantidPlot LINK_PRIVATE
${
TCMALLOC_LIBRARIES_LINKTIME
}
${
CORE_MANTIDLIBS
}
API
MantidQtAPI
MantidWidgets
qtwidgetscommon
qtwidgetsinstrumentview
MantidQtSliceViewer
MantidQtFactory
MantidQtSpectrumViewer
...
...
MantidPlot/src/ApplicationWindow.cpp
View file @
e9ce51fd
...
...
@@ -30,7 +30,7 @@
* *
***************************************************************************/
#include "ApplicationWindow.h"
#include <MantidQt
API
/pixmaps.h>
#include <MantidQt
Widgets/Common
/pixmaps.h>
#include "CurvesDialog.h"
#include "PlotDialog.h"
#include "AxesDialog.h"
...
...
@@ -79,7 +79,7 @@
#include "Folder.h"
#include "FindDialog.h"
#include "ScaleDraw.h"
#include "MantidQt
API
/ScaleEngine.h"
#include "MantidQt
Widgets/Common
/ScaleEngine.h"
#include "ScriptingLangDialog.h"
#include "ScriptingWindow.h"
#include "ScriptFileInterpreter.h"
...
...
@@ -112,7 +112,7 @@
#include "DataPickerTool.h"
#include "TiledWindow.h"
#include "DockedWindow.h"
#include "MantidQt
API
/TSVSerialiser.h"
#include "MantidQt
Widgets/Common
/TSVSerialiser.h"
#include "ProjectSerialiser.h"
// TODO: move tool-specific code to an extension manager
...
...
@@ -189,19 +189,19 @@
#include "Mantid/ManageInterfaceCategories.h"
#include "Mantid/FirstTimeSetup.h"
#include "MantidQt
API
/InterfaceManager.h"
#include "MantidQt
API
/UserSubWindow.h"
#include "MantidQt
API
/AlgorithmInputHistory.h"
#include "MantidQt
API
/ManageUserDirectories.h"
#include "MantidQt
API
/MantidDesktopServices.h"
#include "MantidQt
API
/Message.h"
#include "MantidQt
Widgets/Common
/InterfaceManager.h"
#include "MantidQt
Widgets/Common
/UserSubWindow.h"
#include "MantidQt
Widgets/Common
/AlgorithmInputHistory.h"
#include "MantidQt
Widgets/Common
/ManageUserDirectories.h"
#include "MantidQt
Widgets/Common
/MantidDesktopServices.h"
#include "MantidQt
Widgets/Common
/Message.h"
#include "MantidQt
Mantid
Widgets/CatalogHelper.h"
#include "MantidQt
Mantid
Widgets/CatalogSearch.h"
#include "MantidQt
Mantid
Widgets/FitPropertyBrowser.h"
#include "MantidQt
Mantid
Widgets/MessageDisplay.h"
#include "MantidQt
Mantid
Widgets/MuonFitPropertyBrowser.h"
#include "MantidQt
Mantid
Widgets/TrackedAction.h"
#include "MantidQtWidgets/
Common/
CatalogHelper.h"
#include "MantidQtWidgets/
Common/
CatalogSearch.h"
#include "MantidQtWidgets/
Common/
FitPropertyBrowser.h"
#include "MantidQtWidgets/
Common/
MessageDisplay.h"
#include "MantidQtWidgets/
Common/
MuonFitPropertyBrowser.h"
#include "MantidQtWidgets/
Common/
TrackedAction.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
...
...
@@ -218,7 +218,7 @@
#include "MantidAPI/MultipleFileProperty.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidQt
API
/ScriptRepositoryView.h"
#include "MantidQt
Widgets/Common
/ScriptRepositoryView.h"
#ifdef MAKE_VATES
#include "vtkPVDisplayInformation.h"
...
...
MantidPlot/src/ApplicationWindow.h
View file @
e9ce51fd
...
...
@@ -42,8 +42,8 @@ Description : QtiPlot's main window
#include
<QSettings>
#include
<QSplitter>
#include
"MantidQt
API
/HelpWindow.h"
#include
"MantidQt
API
/IProjectSerialisable.h"
#include
"MantidQt
Widgets/Common
/HelpWindow.h"
#include
"MantidQt
Widgets/Common
/IProjectSerialisable.h"
#include
"ProjectSaveView.h"
#include
"Script.h"
#include
"Scripted.h"
...
...
MantidPlot/src/AxesDialog.cpp
View file @
e9ce51fd
...
...
@@ -26,7 +26,7 @@ Description : General plot options dialog
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
#include
"MantidQt
API
/qwt_compat.h"
#include
"MantidQt
Widgets/Common
/qwt_compat.h"
#include
"AxesDialog.h"
#include
"ApplicationWindow.h"
#include
"TextDialog.h"
...
...
@@ -38,7 +38,7 @@ Description : General plot options dialog
#include
"ColorButton.h"
#include
"TextFormatButtons.h"
#include
"Table.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
"ScaleDraw.h"
#include
<float.h>
...
...
@@ -66,7 +66,7 @@ Description : General plot options dialog
#include
<qwt_plot.h>
#include
<qwt_scale_widget.h>
#include
"MantidQt
API
/ScaleEngine.h"
#include
"MantidQt
Widgets/Common
/ScaleEngine.h"
/* XPM */
static
const
char
*
bottom_scl_xpm
[]
=
{
...
...
MantidPlot/src/AxisDetails.cpp
View file @
e9ce51fd
...
...
@@ -4,13 +4,13 @@
#include
"AxisDetails.h"
#include
"ApplicationWindow.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
<qwt_scale_widget.h>
//#include <qwt_plot.h>
#include
"MantidQt
API
/qwt_compat.h"
#include
"MantidQt
Widgets/Common
/qwt_compat.h"
#include
"MyParser.h"
#include
"Plot.h"
#include
"MantidQt
API
/ScaleEngine.h"
#include
"MantidQt
Widgets/Common
/ScaleEngine.h"
#include
<QWidget>
#include
<QSpinBox>
...
...
MantidPlot/src/ConfigDialog.cpp
View file @
e9ce51fd
...
...
@@ -32,12 +32,12 @@ Description : Preferences dialog
#include
"ColorButton.h"
#include
"Graph.h"
#include
"Mantid/MantidUI.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQt
Mantid
Widgets/FitPropertyBrowser.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
"MantidQtWidgets/
Common/
FitPropertyBrowser.h"
#include
"Matrix.h"
#include
"MultiLayer.h"
#include
"SendToProgramDialog.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
<QApplication>
#include
<QComboBox>
...
...
@@ -76,10 +76,10 @@ Description : Preferences dialog
#include
"MantidAPI/IPeakFunction.h"
#include
"MantidKernel/ConfigService.h"
#include
"MantidKernel/FacilityInfo.h"
#include
"MantidQt
API
/MdConstants.h"
#include
"MantidQt
API
/MdPlottingCmapsProvider.h"
#include
"MantidQt
API
/MdSettings.h"
#include
"MantidQt
Mantid
Widgets/InstrumentSelector.h"
#include
"MantidQt
Widgets/Common
/MdConstants.h"
#include
"MantidQt
Widgets/Common
/MdPlottingCmapsProvider.h"
#include
"MantidQt
Widgets/Common
/MdSettings.h"
#include
"MantidQtWidgets/
Common/
InstrumentSelector.h"
#include
<limits>
...
...
MantidPlot/src/ConfigDialog.h
View file @
e9ce51fd
...
...
@@ -32,7 +32,7 @@ Description : Preferences dialog
#include
<QDialog>
#include
<QCheckBox>
#include
<map>
#include
"MantidQt
API
/MdSettings.h"
#include
"MantidQt
Widgets/Common
/MdSettings.h"
class
QLineEdit
;
class
QGroupBox
;
...
...
MantidPlot/src/ContourLinesEditor.cpp
View file @
e9ce51fd
...
...
@@ -26,7 +26,7 @@
* *
***************************************************************************/
#include
"ContourLinesEditor.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
"Spectrogram.h"
#include
"PenStyleBox.h"
#include
"ColorButton.h"
...
...
MantidPlot/src/CurvesDialog.cpp
View file @
e9ce51fd
...
...
@@ -36,7 +36,7 @@
#include
"Matrix.h"
#include
"PlotCurve.h"
#include
"Table.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
<QCheckBox>
#include
<QCloseEvent>
...
...
MantidPlot/src/DataPickerTool.cpp
View file @
e9ce51fd
...
...
@@ -33,7 +33,7 @@
#include
"Plot.h"
#include
"PlotCurve.h"
#include
"QwtErrorPlotCurve.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
<QApplication>
#include
<QClipboard>
...
...
MantidPlot/src/FitDialog.cpp
View file @
e9ce51fd
...
...
@@ -32,7 +32,7 @@
#include
"ExponentialFit.h"
#include
"Fit.h"
#include
"LogisticFit.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
"Matrix.h"
#include
"MultiPeakFit.h"
#include
"MyParser.h"
...
...
@@ -40,7 +40,7 @@
#include
"PluginFit.h"
#include
"PolynomialFit.h"
#include
"SigmoidalFit.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
<QCloseEvent>
#include
<QComboBox>
...
...
MantidPlot/src/Folder.cpp
View file @
e9ce51fd
...
...
@@ -30,7 +30,7 @@
***************************************************************************/
#include
"Folder.h"
#include
"ApplicationWindow.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
<QApplication>
#include
<QDateTime>
...
...
MantidPlot/src/Folder.h
View file @
e9ce51fd
...
...
@@ -34,7 +34,7 @@
#include
<QEvent>
#include
<QTreeWidget>
#include
"MantidQt
API
/IProjectSerialisable.h"
#include
"MantidQt
Widgets/Common
/IProjectSerialisable.h"
#include
"MdiSubWindow.h"
class
FolderListItem
;
...
...
MantidPlot/src/Graph.cpp
View file @
e9ce51fd
...
...
@@ -28,7 +28,7 @@
* *
***************************************************************************/
#include
"MantidQt
API
/qwt_compat.h"
#include
"MantidQt
Widgets/Common
/qwt_compat.h"
#include
<QVarLengthArray>
#include
"ApplicationWindow.h"
...
...
@@ -41,7 +41,7 @@
#include
"Grid.h"
#include
"ImageMarker.h"
#include
"LegendWidget.h"
#include
"MantidQt
API
/ScaleEngine.h"
#include
"MantidQt
Widgets/Common
/ScaleEngine.h"
#include
"PatternBox.h"
#include
"PlotCurve.h"
#include
"QwtBarCurve.h"
...
...
@@ -57,18 +57,18 @@
#include
"TitlePicker.h"
#include
"VectorCurve.h"
#include
"cursors.h"
#include
<MantidQt
API
/pixmaps.h>
#include
<MantidQt
Widgets/Common
/pixmaps.h>
#include
"Mantid/ErrorBarSettings.h"
#include
"Mantid/MantidMDCurve.h"
#include
"Mantid/MantidMatrixCurve.h"
#include
"MantidKernel/Strings.h"
#include
"MantidAPI/AnalysisDataService.h"
#include
"MantidQt
API
/PlotAxis.h"
#include
"MantidQt
API
/QwtRasterDataMD.h"
#include
"MantidQt
API
/QwtWorkspaceSpectrumData.h"
#include
"MantidQt
Widgets/Common
/PlotAxis.h"
#include
"MantidQt
Widgets/Common
/QwtRasterDataMD.h"
#include
"MantidQt
Widgets/Common
/QwtWorkspaceSpectrumData.h"
#include
"MantidQt
API
/TSVSerialiser.h"
#include
"MantidQt
Widgets/Common
/TSVSerialiser.h"
#ifdef EMF_OUTPUT
#include
"EmfEngine.h"
...
...
MantidPlot/src/Graph.h
View file @
e9ce51fd
...
...
@@ -48,8 +48,8 @@
#include
<qwt_plot_rescaler.h>
#endif
#include
"AxesDialog.h"
#include
"MantidQt
API
/GraphOptions.h"
#include
"MantidQt
API
/ScaleEngine.h"
#include
"MantidQt
Widgets/Common
/GraphOptions.h"
#include
"MantidQt
Widgets/Common
/ScaleEngine.h"
#include
"MultiLayer.h"
#include
"Plot.h"
#include
"PlotToolInterface.h"
...
...
MantidPlot/src/Graph3D.cpp
View file @
e9ce51fd
...
...
@@ -33,12 +33,12 @@
#include
"Mantid/MantidMatrix.h"
#include
"Mantid/MantidMatrixFunction.h"
#include
"MantidAPI/MatrixWorkspace.h"
#include
"MantidQt
API
/PlotAxis.h"
#include
"MantidQt
Widgets/Common
/PlotAxis.h"
#include
"MatrixModel.h"
#include
"MyParser.h"
#include
"UserFunction.h"
//Mantid
#include
"MantidQt
API
/TSVSerialiser.h"
#include
"MantidQt
Widgets/Common
/TSVSerialiser.h"
#include
<QApplication>
#include
<QBitmap>
...
...
MantidPlot/src/Graph3D.h
View file @
e9ce51fd
...
...
@@ -30,7 +30,7 @@
#define GRAPH3D_H
#include
"MantidGeometry/Rendering/OpenGL_Headers.h"
#include
"MantidQt
API
/IProjectSerialisable.h"
#include
"MantidQt
Widgets/Common
/IProjectSerialisable.h"
#include
<qwt3d_surfaceplot.h>
#include
<qwt3d_function.h>
...
...
@@ -42,7 +42,7 @@
#include
"Table.h"
#include
"Matrix.h"
#include
"MantidQt
API
/TSVSerialiser.h"
#include
"MantidQt
Widgets/Common
/TSVSerialiser.h"
class
MantidMatrix
;
class
UserFunction2D
;
...
...
MantidPlot/src/Grid.cpp
View file @
e9ce51fd
...
...
@@ -31,7 +31,7 @@
#include
"Grid.h"
#include
"ColorBox.h"
#include
"MantidQt
API
/TSVSerialiser.h"
#include
"MantidQt
Widgets/Common
/TSVSerialiser.h"
#include
<qwt_plot_canvas.h>
#include
<qwt_painter.h>
...
...
MantidPlot/src/GridDetails.cpp
View file @
e9ce51fd
...
...
@@ -6,10 +6,10 @@
#include
"ApplicationWindow.h"
#include
<qwt_scale_widget.h>
//#include <qwt_plot.h>
#include
"MantidQt
API
/qwt_compat.h"
#include
"MantidQt
Widgets/Common
/qwt_compat.h"
#include
"Plot.h"
#include
"MantidQt
API
/ScaleEngine.h"
#include
"MantidQt
Mantid
Widgets/DoubleSpinBox.h"
#include
"MantidQt
Widgets/Common
/ScaleEngine.h"
#include
"MantidQtWidgets/
Common/
DoubleSpinBox.h"
#include
<QWidget>
#include
<QCheckBox>
...
...
MantidPlot/src/GridDetails.h
View file @
e9ce51fd
...
...
@@ -33,7 +33,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#include
<QWidget>
#include
<QList>
#include
<MantidQt
Mantid
Widgets/DoubleSpinBox.h>
#include
<MantidQtWidgets/
Common/
DoubleSpinBox.h>
class
ApplicationWindow
;
class
Graph
;
class
QCheckBox
;
...
...
Prev
1
2
3
4
5
…
10
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment