Commit e9ce51fd authored by Roman Tolchenov's avatar Roman Tolchenov
Browse files

Moved the instrument view.

parent c61e2490
...@@ -696,8 +696,8 @@ include_directories ( src ) ...@@ -696,8 +696,8 @@ include_directories ( src )
include_directories ( src/lib/include ) include_directories ( src/lib/include )
include_directories ( src/lib/3rdparty/qtcolorpicker/src ) include_directories ( src/lib/3rdparty/qtcolorpicker/src )
include_directories ( ../QtPropertyBrowser/src )
include_directories ( ../qt/widgets/common/inc ) include_directories ( ../qt/widgets/common/inc )
include_directories ( ../qt/widgets/instrumentview/inc )
include_directories ( ../qt/widgets/sliceviewer/inc ) include_directories ( ../qt/widgets/sliceviewer/inc )
include_directories ( ../qt/widgets/spectrumviewer/inc ) include_directories ( ../qt/widgets/spectrumviewer/inc )
include_directories ( ../MantidQt/Factory/inc ) include_directories ( ../MantidQt/Factory/inc )
...@@ -794,8 +794,8 @@ add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp ...@@ -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} target_link_libraries ( MantidPlot LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
${CORE_MANTIDLIBS} ${CORE_MANTIDLIBS}
API API
MantidQtAPI qtwidgetscommon
MantidWidgets qtwidgetsinstrumentview
MantidQtSliceViewer MantidQtSliceViewer
MantidQtFactory MantidQtFactory
MantidQtSpectrumViewer MantidQtSpectrumViewer
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* * * *
***************************************************************************/ ***************************************************************************/
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include "CurvesDialog.h" #include "CurvesDialog.h"
#include "PlotDialog.h" #include "PlotDialog.h"
#include "AxesDialog.h" #include "AxesDialog.h"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
#include "Folder.h" #include "Folder.h"
#include "FindDialog.h" #include "FindDialog.h"
#include "ScaleDraw.h" #include "ScaleDraw.h"
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
#include "ScriptingLangDialog.h" #include "ScriptingLangDialog.h"
#include "ScriptingWindow.h" #include "ScriptingWindow.h"
#include "ScriptFileInterpreter.h" #include "ScriptFileInterpreter.h"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
#include "DataPickerTool.h" #include "DataPickerTool.h"
#include "TiledWindow.h" #include "TiledWindow.h"
#include "DockedWindow.h" #include "DockedWindow.h"
#include "MantidQtAPI/TSVSerialiser.h" #include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "ProjectSerialiser.h" #include "ProjectSerialiser.h"
   
// TODO: move tool-specific code to an extension manager // TODO: move tool-specific code to an extension manager
...@@ -189,19 +189,19 @@ ...@@ -189,19 +189,19 @@
#include "Mantid/ManageInterfaceCategories.h" #include "Mantid/ManageInterfaceCategories.h"
#include "Mantid/FirstTimeSetup.h" #include "Mantid/FirstTimeSetup.h"
   
#include "MantidQtAPI/InterfaceManager.h" #include "MantidQtWidgets/Common/InterfaceManager.h"
#include "MantidQtAPI/UserSubWindow.h" #include "MantidQtWidgets/Common/UserSubWindow.h"
#include "MantidQtAPI/AlgorithmInputHistory.h" #include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include "MantidQtAPI/ManageUserDirectories.h" #include "MantidQtWidgets/Common/ManageUserDirectories.h"
#include "MantidQtAPI/MantidDesktopServices.h" #include "MantidQtWidgets/Common/MantidDesktopServices.h"
#include "MantidQtAPI/Message.h" #include "MantidQtWidgets/Common/Message.h"
   
#include "MantidQtMantidWidgets/CatalogHelper.h" #include "MantidQtWidgets/Common/CatalogHelper.h"
#include "MantidQtMantidWidgets/CatalogSearch.h" #include "MantidQtWidgets/Common/CatalogSearch.h"
#include "MantidQtMantidWidgets/FitPropertyBrowser.h" #include "MantidQtWidgets/Common/FitPropertyBrowser.h"
#include "MantidQtMantidWidgets/MessageDisplay.h" #include "MantidQtWidgets/Common/MessageDisplay.h"
#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h" #include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include "MantidQtMantidWidgets/TrackedAction.h" #include "MantidQtWidgets/Common/TrackedAction.h"
   
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h" #include "MantidKernel/FacilityInfo.h"
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
#include "MantidAPI/MultipleFileProperty.h" #include "MantidAPI/MultipleFileProperty.h"
#include "MantidAPI/WorkspaceFactory.h" #include "MantidAPI/WorkspaceFactory.h"
   
#include "MantidQtAPI/ScriptRepositoryView.h" #include "MantidQtWidgets/Common/ScriptRepositoryView.h"
   
#ifdef MAKE_VATES #ifdef MAKE_VATES
#include "vtkPVDisplayInformation.h" #include "vtkPVDisplayInformation.h"
......
...@@ -42,8 +42,8 @@ Description : QtiPlot's main window ...@@ -42,8 +42,8 @@ Description : QtiPlot's main window
#include <QSettings> #include <QSettings>
#include <QSplitter> #include <QSplitter>
#include "MantidQtAPI/HelpWindow.h" #include "MantidQtWidgets/Common/HelpWindow.h"
#include "MantidQtAPI/IProjectSerialisable.h" #include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "ProjectSaveView.h" #include "ProjectSaveView.h"
#include "Script.h" #include "Script.h"
#include "Scripted.h" #include "Scripted.h"
......
...@@ -26,7 +26,7 @@ Description : General plot options dialog ...@@ -26,7 +26,7 @@ Description : General plot options dialog
* Boston, MA 02110-1301 USA * * Boston, MA 02110-1301 USA *
* * * *
***************************************************************************/ ***************************************************************************/
#include "MantidQtAPI/qwt_compat.h" #include "MantidQtWidgets/Common/qwt_compat.h"
#include "AxesDialog.h" #include "AxesDialog.h"
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include "TextDialog.h" #include "TextDialog.h"
...@@ -38,7 +38,7 @@ Description : General plot options dialog ...@@ -38,7 +38,7 @@ Description : General plot options dialog
#include "ColorButton.h" #include "ColorButton.h"
#include "TextFormatButtons.h" #include "TextFormatButtons.h"
#include "Table.h" #include "Table.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "ScaleDraw.h" #include "ScaleDraw.h"
#include <float.h> #include <float.h>
...@@ -66,7 +66,7 @@ Description : General plot options dialog ...@@ -66,7 +66,7 @@ Description : General plot options dialog
#include <qwt_plot.h> #include <qwt_plot.h>
#include <qwt_scale_widget.h> #include <qwt_scale_widget.h>
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
/* XPM */ /* XPM */
static const char *bottom_scl_xpm[] = { static const char *bottom_scl_xpm[] = {
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
#include "AxisDetails.h" #include "AxisDetails.h"
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include <qwt_scale_widget.h> #include <qwt_scale_widget.h>
//#include <qwt_plot.h> //#include <qwt_plot.h>
#include "MantidQtAPI/qwt_compat.h" #include "MantidQtWidgets/Common/qwt_compat.h"
#include "MyParser.h" #include "MyParser.h"
#include "Plot.h" #include "Plot.h"
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
#include <QWidget> #include <QWidget>
#include <QSpinBox> #include <QSpinBox>
......
...@@ -32,12 +32,12 @@ Description : Preferences dialog ...@@ -32,12 +32,12 @@ Description : Preferences dialog
#include "ColorButton.h" #include "ColorButton.h"
#include "Graph.h" #include "Graph.h"
#include "Mantid/MantidUI.h" #include "Mantid/MantidUI.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "MantidQtMantidWidgets/FitPropertyBrowser.h" #include "MantidQtWidgets/Common/FitPropertyBrowser.h"
#include "Matrix.h" #include "Matrix.h"
#include "MultiLayer.h" #include "MultiLayer.h"
#include "SendToProgramDialog.h" #include "SendToProgramDialog.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include <QApplication> #include <QApplication>
#include <QComboBox> #include <QComboBox>
...@@ -76,10 +76,10 @@ Description : Preferences dialog ...@@ -76,10 +76,10 @@ Description : Preferences dialog
#include "MantidAPI/IPeakFunction.h" #include "MantidAPI/IPeakFunction.h"
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h" #include "MantidKernel/FacilityInfo.h"
#include "MantidQtAPI/MdConstants.h" #include "MantidQtWidgets/Common/MdConstants.h"
#include "MantidQtAPI/MdPlottingCmapsProvider.h" #include "MantidQtWidgets/Common/MdPlottingCmapsProvider.h"
#include "MantidQtAPI/MdSettings.h" #include "MantidQtWidgets/Common/MdSettings.h"
#include "MantidQtMantidWidgets/InstrumentSelector.h" #include "MantidQtWidgets/Common/InstrumentSelector.h"
#include <limits> #include <limits>
......
...@@ -32,7 +32,7 @@ Description : Preferences dialog ...@@ -32,7 +32,7 @@ Description : Preferences dialog
#include <QDialog> #include <QDialog>
#include <QCheckBox> #include <QCheckBox>
#include <map> #include <map>
#include "MantidQtAPI/MdSettings.h" #include "MantidQtWidgets/Common/MdSettings.h"
class QLineEdit; class QLineEdit;
class QGroupBox; class QGroupBox;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* * * *
***************************************************************************/ ***************************************************************************/
#include "ContourLinesEditor.h" #include "ContourLinesEditor.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "Spectrogram.h" #include "Spectrogram.h"
#include "PenStyleBox.h" #include "PenStyleBox.h"
#include "ColorButton.h" #include "ColorButton.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "Matrix.h" #include "Matrix.h"
#include "PlotCurve.h" #include "PlotCurve.h"
#include "Table.h" #include "Table.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include <QCheckBox> #include <QCheckBox>
#include <QCloseEvent> #include <QCloseEvent>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "Plot.h" #include "Plot.h"
#include "PlotCurve.h" #include "PlotCurve.h"
#include "QwtErrorPlotCurve.h" #include "QwtErrorPlotCurve.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "ExponentialFit.h" #include "ExponentialFit.h"
#include "Fit.h" #include "Fit.h"
#include "LogisticFit.h" #include "LogisticFit.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "Matrix.h" #include "Matrix.h"
#include "MultiPeakFit.h" #include "MultiPeakFit.h"
#include "MyParser.h" #include "MyParser.h"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "PluginFit.h" #include "PluginFit.h"
#include "PolynomialFit.h" #include "PolynomialFit.h"
#include "SigmoidalFit.h" #include "SigmoidalFit.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include <QCloseEvent> #include <QCloseEvent>
#include <QComboBox> #include <QComboBox>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
***************************************************************************/ ***************************************************************************/
#include "Folder.h" #include "Folder.h"
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include <QApplication> #include <QApplication>
#include <QDateTime> #include <QDateTime>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <QEvent> #include <QEvent>
#include <QTreeWidget> #include <QTreeWidget>
#include "MantidQtAPI/IProjectSerialisable.h" #include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MdiSubWindow.h" #include "MdiSubWindow.h"
class FolderListItem; class FolderListItem;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* * * *
***************************************************************************/ ***************************************************************************/
#include "MantidQtAPI/qwt_compat.h" #include "MantidQtWidgets/Common/qwt_compat.h"
#include <QVarLengthArray> #include <QVarLengthArray>
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "Grid.h" #include "Grid.h"
#include "ImageMarker.h" #include "ImageMarker.h"
#include "LegendWidget.h" #include "LegendWidget.h"
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
#include "PatternBox.h" #include "PatternBox.h"
#include "PlotCurve.h" #include "PlotCurve.h"
#include "QwtBarCurve.h" #include "QwtBarCurve.h"
...@@ -57,18 +57,18 @@ ...@@ -57,18 +57,18 @@
#include "TitlePicker.h" #include "TitlePicker.h"
#include "VectorCurve.h" #include "VectorCurve.h"
#include "cursors.h" #include "cursors.h"
#include <MantidQtAPI/pixmaps.h> #include <MantidQtWidgets/Common/pixmaps.h>
#include "Mantid/ErrorBarSettings.h" #include "Mantid/ErrorBarSettings.h"
#include "Mantid/MantidMDCurve.h" #include "Mantid/MantidMDCurve.h"
#include "Mantid/MantidMatrixCurve.h" #include "Mantid/MantidMatrixCurve.h"
#include "MantidKernel/Strings.h" #include "MantidKernel/Strings.h"
#include "MantidAPI/AnalysisDataService.h" #include "MantidAPI/AnalysisDataService.h"
#include "MantidQtAPI/PlotAxis.h" #include "MantidQtWidgets/Common/PlotAxis.h"
#include "MantidQtAPI/QwtRasterDataMD.h" #include "MantidQtWidgets/Common/QwtRasterDataMD.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h" #include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
#include "MantidQtAPI/TSVSerialiser.h" #include "MantidQtWidgets/Common/TSVSerialiser.h"
#ifdef EMF_OUTPUT #ifdef EMF_OUTPUT
#include "EmfEngine.h" #include "EmfEngine.h"
......
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
#include <qwt_plot_rescaler.h> #include <qwt_plot_rescaler.h>
#endif #endif
#include "AxesDialog.h" #include "AxesDialog.h"
#include "MantidQtAPI/GraphOptions.h" #include "MantidQtWidgets/Common/GraphOptions.h"
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
#include "MultiLayer.h" #include "MultiLayer.h"
#include "Plot.h" #include "Plot.h"
#include "PlotToolInterface.h" #include "PlotToolInterface.h"
......
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
#include "Mantid/MantidMatrix.h" #include "Mantid/MantidMatrix.h"
#include "Mantid/MantidMatrixFunction.h" #include "Mantid/MantidMatrixFunction.h"
#include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/MatrixWorkspace.h"
#include "MantidQtAPI/PlotAxis.h" #include "MantidQtWidgets/Common/PlotAxis.h"
#include "MatrixModel.h" #include "MatrixModel.h"
#include "MyParser.h" #include "MyParser.h"
#include "UserFunction.h" //Mantid #include "UserFunction.h" //Mantid
#include "MantidQtAPI/TSVSerialiser.h" #include "MantidQtWidgets/Common/TSVSerialiser.h"
#include <QApplication> #include <QApplication>
#include <QBitmap> #include <QBitmap>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define GRAPH3D_H #define GRAPH3D_H
#include "MantidGeometry/Rendering/OpenGL_Headers.h" #include "MantidGeometry/Rendering/OpenGL_Headers.h"
#include "MantidQtAPI/IProjectSerialisable.h" #include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include <qwt3d_surfaceplot.h> #include <qwt3d_surfaceplot.h>
#include <qwt3d_function.h> #include <qwt3d_function.h>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "Table.h" #include "Table.h"
#include "Matrix.h" #include "Matrix.h"
#include "MantidQtAPI/TSVSerialiser.h" #include "MantidQtWidgets/Common/TSVSerialiser.h"
class MantidMatrix; class MantidMatrix;
class UserFunction2D; class UserFunction2D;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "Grid.h" #include "Grid.h"
#include "ColorBox.h" #include "ColorBox.h"
#include "MantidQtAPI/TSVSerialiser.h" #include "MantidQtWidgets/Common/TSVSerialiser.h"
#include <qwt_plot_canvas.h> #include <qwt_plot_canvas.h>
#include <qwt_painter.h> #include <qwt_painter.h>
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
#include <qwt_scale_widget.h> #include <qwt_scale_widget.h>
//#include <qwt_plot.h> //#include <qwt_plot.h>
#include "MantidQtAPI/qwt_compat.h" #include "MantidQtWidgets/Common/qwt_compat.h"
#include "Plot.h" #include "Plot.h"
#include "MantidQtAPI/ScaleEngine.h" #include "MantidQtWidgets/Common/ScaleEngine.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h" #include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include <QWidget> #include <QWidget>
#include <QCheckBox> #include <QCheckBox>
......
...@@ -33,7 +33,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org> ...@@ -33,7 +33,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
#include <QWidget> #include <QWidget>
#include <QList> #include <QList>
#include <MantidQtMantidWidgets/DoubleSpinBox.h> #include <MantidQtWidgets/Common/DoubleSpinBox.h>
class ApplicationWindow; class ApplicationWindow;
class Graph; class Graph;
class QCheckBox; class QCheckBox;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment