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

Moved the instrument view.

parent c61e2490
......@@ -31,8 +31,8 @@
#include "Graph.h"
#include "Grid.h"
#include "LegendWidget.h"
#include "MantidQtAPI/ScaleEngine.h"
#include "MantidQtAPI/qwt_compat.h"
#include "MantidQtWidgets/Common/ScaleEngine.h"
#include "MantidQtWidgets/Common/qwt_compat.h"
#include "PlotCurve.h"
#include "ScaleDraw.h"
#include "Spectrogram.h"
......
......@@ -53,7 +53,7 @@
#include <qwt3d_color.h>
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/MantidColorMap.h"
#include "MantidQtWidgets/Common/MantidColorMap.h"
using Mantid::Kernel::ConfigService;
......
......@@ -32,9 +32,9 @@
#include "Mantid/ErrorBarSettings.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidQtAPI/QwtWorkspaceBinData.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
#include "MantidQtAPI/ScaleEngine.h"
#include "MantidQtWidgets/Common/QwtWorkspaceBinData.h"
#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
#include "MantidQtWidgets/Common/ScaleEngine.h"
#include "PatternBox.h"
#include "ScaleDraw.h"
#include "SymbolBox.h"
......
......@@ -35,7 +35,7 @@
#include "ContourLinesEditor.h"
#include "Folder.h"
#include "FunctionCurve.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h"
#include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "MyParser.h"
#include "PatternBox.h"
#include "PenStyleBox.h"
......@@ -46,10 +46,10 @@
#include "SymbolBox.h"
#include "Table.h"
#include "VectorCurve.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include "MantidKernel/ConfigService.h"
#include "MantidQtAPI/MantidColorMap.h"
#include "MantidQtWidgets/Common/MantidColorMap.h"
#include <QCheckBox>
#include <QComboBox>
#include <QDateTime>
......
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtAPI/WindowIcons.h"
#include "MantidQtMantidWidgets/ProjectSavePresenter.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/WindowIcons.h"
#include "MantidQtWidgets/Common/ProjectSavePresenter.h"
#include "ProjectSaveView.h"
......
#ifndef MANTIDQT_MANTIDWIDGETS_PROJECTSAVEVIEW_H
#define MANTIDQT_MANTIDWIDGETS_PROJECTSAVEVIEW_H
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtMantidWidgets/IProjectSaveView.h"
#include "MantidQtMantidWidgets/ProjectSavePresenter.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSaveView.h"
#include "MantidQtWidgets/Common/ProjectSavePresenter.h"
#include "ProjectSerialiser.h"
#include "ui_ProjectSave.h"
......
......@@ -15,8 +15,8 @@
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/MantidVersion.h"
#include "MantidQtAPI/PlotAxis.h"
#include "MantidQtAPI/VatesViewerInterface.h"
#include "MantidQtWidgets/Common/PlotAxis.h"
#include "MantidQtWidgets/Common/VatesViewerInterface.h"
#include "MantidQtSliceViewer/SliceViewerWindow.h"
#include "MantidQtSpectrumViewer/SpectrumView.h"
......
......@@ -10,7 +10,7 @@
#include <QDir>
#include <QApplication>
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "qstring.h"
#include "Folder.h"
......
......@@ -30,11 +30,11 @@
#define PYTHON_SCRIPT_H
// Python headers have to go first!
#include "MantidQtAPI/PythonSystemHeader.h"
#include "MantidQtAPI/PythonThreading.h"
#include "MantidQtWidgets/Common/PythonSystemHeader.h"
#include "MantidQtWidgets/Common/PythonThreading.h"
#include "Script.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
#include <QFileInfo>
#include <QDir>
......
......@@ -4,11 +4,11 @@
#include "ScaleDetails.h"
#include "ApplicationWindow.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h"
#include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include "MantidQtAPI/qwt_compat.h"
#include "MantidQtWidgets/Common/qwt_compat.h"
#include "Plot.h"
#include "MantidQtAPI/ScaleEngine.h"
#include "MantidQtWidgets/Common/ScaleEngine.h"
#include "MantidKernel/Logger.h"
......
......@@ -28,7 +28,7 @@
***************************************************************************/
#include "ScaleDraw.h"
#include "MyParser.h"
#include "MantidQtAPI/ScaleEngine.h"
#include "MantidQtWidgets/Common/ScaleEngine.h"
#include "Graph.h"
#include <QPainter>
......
......@@ -33,7 +33,7 @@
#include "PlotCurve.h"
#include "SymbolBox.h"
#include "Table.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include <QKeyEvent>
#include <qwt_symbol.h>
......
#include "ScriptFileInterpreter.h"
#include "ScriptOutputDisplay.h"
#include "ScriptingEnv.h"
#include "MantidQtMantidWidgets/ScriptEditor.h"
#include "MantidQtWidgets/Common/ScriptEditor.h"
#include <QAction>
#include <QFileInfo>
#include <QFontDatabase>
......
#include "ScriptOutputDisplay.h"
#include "TextFileIO.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include <QDateTime>
#include <QKeyEvent>
......
......@@ -3,20 +3,20 @@
//-------------------------------------------
#include "ScriptingWindow.h"
#include "ApplicationWindow.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "MultiTabScriptInterpreter.h"
#include "ScriptFileInterpreter.h"
#include "ScriptingEnv.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
// Mantid
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/Logger.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
// MantidQt
#include "MantidQtAPI/HelpWindow.h"
#include "MantidQtMantidWidgets/ScriptEditor.h"
#include "MantidQtWidgets/Common/HelpWindow.h"
#include "MantidQtWidgets/Common/ScriptEditor.h"
// Qt
#include <QAction>
......
......@@ -4,7 +4,7 @@
//----------------------------------
// Includes
//----------------------------------
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "Script.h"
#include <QMainWindow>
......
......@@ -2,7 +2,7 @@
#include "ConfigDialog.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidKernel/ConfigService.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include <QComboBox>
#include <QFileDialog>
......
......@@ -31,7 +31,7 @@
***************************************************************************/
#include "SetColValuesDialog.h"
#include "Table.h"
#include "MantidQtMantidWidgets/ScriptEditor.h"
#include "MantidQtWidgets/Common/ScriptEditor.h"
#include <QTableWidget>
#include <QTableWidgetSelectionRange>
......
......@@ -25,7 +25,7 @@
* Boston, MA 02110-1301 USA *
* *
***************************************************************************/
#include "MantidQtAPI/qwt_compat.h"
#include "MantidQtWidgets/Common/qwt_compat.h"
#include "Spectrogram.h"
#include <math.h>
#include <QPen>
......@@ -41,11 +41,11 @@
#include "MantidAPI/IMDIterator.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/make_unique.h"
#include "MantidQtAPI/PlotAxis.h"
#include "MantidQtAPI/QwtRasterDataMD.h"
#include "MantidQtAPI/SignalRange.h"
#include "MantidQtWidgets/Common/PlotAxis.h"
#include "MantidQtWidgets/Common/QwtRasterDataMD.h"
#include "MantidQtWidgets/Common/SignalRange.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include <numeric>
......
......@@ -40,9 +40,9 @@
#include "PlotCurve.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidQtAPI/MantidColorMap.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include <MantidQtMantidWidgets/InstrumentView/InstrumentWidget.h>
#include "MantidQtWidgets/Common/MantidColorMap.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
#include "MantidQtWidgets/InstrumentView/InstrumentWidget.h"
#include <fstream>
#include <float.h>
......
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