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

Moved the instrument view.

parent c61e2490
......@@ -5,7 +5,7 @@
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidGeometry/MDGeometry/IMDDimension.h"
#include <MantidQtMantidWidgets/MantidDisplayBase.h>
#include <MantidQtWidgets/Common/MantidDisplayBase.h>
using namespace MantidQt::MantidWidgets;
using Mantid::API::WorkspaceGroup_const_sptr;
......
#ifndef MANTIDPLOTUTILITIES_H_
#define MANTIDPLOTUTILITIES_H_
#include "MantidQtMantidWidgets/MantidWSIndexDialog.h"
#include "MantidQtWidgets/Common/MantidWSIndexDialog.h"
/**
* These utilities assist with plotting in Mantid
......
......@@ -6,7 +6,7 @@
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidPlotUtilities.h"
#include "MantidGeometry/MDGeometry/IMDDimension.h"
#include <MantidQtMantidWidgets/MantidDisplayBase.h>
#include <MantidQtWidgets/Common/MantidDisplayBase.h>
using namespace MantidQt::MantidWidgets;
using Mantid::API::WorkspaceGroup_const_sptr;
......
......@@ -5,8 +5,8 @@
#include "MantidAPI/NumericAxis.h"
#include "MantidAPI/WorkspaceGroup_fwd.h"
#include "MantidMatrix.h"
#include <MantidQtMantidWidgets/MantidWSIndexDialog.h>
#include <MantidQtMantidWidgets/MantidDisplayBase.h>
#include <MantidQtWidgets/Common/MantidWSIndexDialog.h>
#include <MantidQtWidgets/Common/MantidDisplayBase.h>
/**
* This utility class generates a surface or contour plot from a group of
......
......@@ -2,7 +2,7 @@
#define MANTIDTABLE_H
#include "../Table.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
/** A MantidTable appears to be a MantidPlot "Table" object
......
// Python header must go first
#include "MantidQtAPI/PythonThreading.h"
#include "MantidQtWidgets/Common/PythonThreading.h"
#include "AlgorithmDockWidget.h"
#include "AlgorithmHistoryWindow.h"
......@@ -10,8 +10,8 @@
#include "MantidMDCurveDialog.h"
#include "MantidMatrix.h"
#include "MantidMatrixCurve.h"
#include "MantidQtMantidWidgets/FitPropertyBrowser.h"
#include "MantidQtMantidWidgets/MantidWSIndexDialog.h"
#include "MantidQtWidgets/Common/FitPropertyBrowser.h"
#include "MantidQtWidgets/Common/MantidWSIndexDialog.h"
#include "MantidSampleLogDialog.h"
#include "MantidSampleMaterialDialog.h"
#include "MantidTable.h"
......@@ -23,7 +23,7 @@
#include "../ScriptingWindow.h"
#include "../Spectrogram.h"
#include "../TiledWindow.h"
#include "MantidQtAPI/pixmaps.h"
#include "MantidQtWidgets/Common/pixmaps.h"
#include "Mantid/InstrumentWidget/InstrumentWindow.h"
#include "MantidAPI/Axis.h"
......@@ -40,13 +40,13 @@
#include "InstrumentWidget/InstrumentWindow.h"
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtAPI/InterfaceManager.h"
#include "MantidQtAPI/PlotAxis.h"
#include "MantidQtAPI/VatesViewerInterface.h"
#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include "MantidQtWidgets/Common/InterfaceManager.h"
#include "MantidQtWidgets/Common/PlotAxis.h"
#include "MantidQtWidgets/Common/VatesViewerInterface.h"
#include "MantidQtMantidWidgets/MantidTreeWidget.h"
#include "MantidQtMantidWidgets/WorkspacePresenter/QWorkspaceDockView.h"
#include "MantidQtWidgets/Common/MantidTreeWidget.h"
#include "MantidQtWidgets/Common/WorkspacePresenter/QWorkspaceDockView.h"
#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/DetectorInfo.h"
......
......@@ -6,9 +6,9 @@
//----------------------------------
#include "../ApplicationWindow.h"
#include "../Graph.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtMantidWidgets/MantidDisplayBase.h"
#include "MantidQtMantidWidgets/MantidWSIndexDialog.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/MantidDisplayBase.h"
#include "MantidQtWidgets/Common/MantidWSIndexDialog.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmFactory.h"
......@@ -20,9 +20,9 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/Workspace_fwd.h"
#include "MantidQtAPI/AlgorithmDialog.h"
#include "MantidQtAPI/MantidAlgorithmMetatype.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
#include "MantidQtWidgets/Common/AlgorithmDialog.h"
#include "MantidQtWidgets/Common/MantidAlgorithmMetatype.h"
#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
#include "MantidPlotUtilities.h"
......
#include "PeakPickerTool.h"
#include "../FunctionCurve.h"
#include "MantidMatrixCurve.h"
#include "MantidQtMantidWidgets/FitPropertyBrowser.h"
#include "MantidQtMantidWidgets/MuonFitPropertyBrowser.h"
#include "MantidQtMantidWidgets/PropertyHandler.h"
#include "MantidQtWidgets/Common/FitPropertyBrowser.h"
#include "MantidQtWidgets/Common/MuonFitPropertyBrowser.h"
#include "MantidQtWidgets/Common/PropertyHandler.h"
#include "MantidUI.h"
#include "MantidAPI/CompositeFunction.h"
......
......@@ -31,11 +31,11 @@
#include "ApplicationWindow.h"
#include "Graph.h"
#include "MantidKernel/Strings.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "MatrixCommand.h"
#include "ScriptingEnv.h"
#include "muParserScript.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include <QApplication>
#include <QClipboard>
......
......@@ -44,7 +44,7 @@
#include "ScriptingEnv.h"
#include "Scripted.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include <qwt_double_rect.h>
#include <qwt_color_map.h>
......
......@@ -36,7 +36,7 @@
#include "muParserScript.h"
#include "ScriptingEnv.h"
#include "analysis/fft2D.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "MantidKernel/Strings.h"
......
......@@ -28,7 +28,7 @@
***************************************************************************/
#include "MatrixSizeDialog.h"
#include "MatrixCommand.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h"
#include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include <QPushButton>
#include <QLabel>
......
......@@ -31,7 +31,7 @@
***************************************************************************/
#include "MatrixValuesDialog.h"
#include "MatrixCommand.h"
#include "MantidQtMantidWidgets/ScriptEditor.h"
#include "MantidQtWidgets/Common/ScriptEditor.h"
#include <QLayout>
#include <QSpinBox>
......
......@@ -31,7 +31,7 @@
#include "ApplicationWindow.h"
#include "Folder.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include <QApplication>
#include <QMessageBox>
......
......@@ -30,7 +30,7 @@
#define MdiSubWindow_H
#include "MantidKernel/RegistrationHelper.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "WindowFactory.h"
#include <QDockWidget>
#include <QFrame>
......
......@@ -68,15 +68,15 @@
#include "Mantid/MantidMDCurve.h"
#include "Mantid/MantidMatrixCurve.h"
#include "MantidKernel/Strings.h"
#include <MantidQtMantidWidgets/MantidTreeWidget.h>
#include <MantidQtWidgets/Common/MantidTreeWidget.h>
#include "Mantid/MantidMDCurveDialog.h"
#include "MantidQtSliceViewer/LinePlotOptions.h"
#include <MantidQtMantidWidgets/MantidTreeWidget.h>
#include <MantidQtMantidWidgets/MantidWSIndexDialog.h>
#include <MantidQtWidgets/Common/MantidTreeWidget.h>
#include <MantidQtWidgets/Common/MantidWSIndexDialog.h>
#include <gsl/gsl_vector.h>
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
// Register the window into the WindowFactory
DECLARE_WINDOW(MultiLayer)
......
......@@ -33,7 +33,7 @@
#define MULTILAYER_H
#include "Graph.h"
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MdiSubWindow.h"
#include <QLayout>
#include <QPointer>
......
......@@ -12,7 +12,7 @@
#include "ScriptingLangDialog.h"
#include "MultiTabScriptInterpreter.h"
#include "MantidQtMantidWidgets/ScriptEditor.h"
#include "MantidQtWidgets/Common/ScriptEditor.h"
// Qt
#include <QPoint>
......
......@@ -41,7 +41,7 @@
#include <Qsci/qsciprinter.h>
#include "ApplicationWindow.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "MantidKernel/ConfigService.h"
// Register the window into the WindowFactory
......
......@@ -30,7 +30,7 @@
#ifndef NOTE_H
#define NOTE_H
#include "MantidQtAPI/IProjectSerialisable.h"
#include "MantidQtWidgets/Common/IProjectSerialisable.h"
#include "MdiSubWindow.h"
#include <QTextEdit>
......
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