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

Moved the instrument view.

parent c61e2490
......@@ -30,7 +30,7 @@
#include "ApplicationWindow.h"
#include "Graph.h"
#include "Integration.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h"
#include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include <QGroupBox>
#include <QSpinBox>
......
......@@ -32,7 +32,7 @@
#include "Graph.h"
#include "Plot.h"
#include "ApplicationWindow.h"
#include "MantidQtMantidWidgets/DoubleSpinBox.h"
#include "MantidQtWidgets/Common/DoubleSpinBox.h"
#include <qwt_plot.h>
......
#ifndef ALGORITHMDOCKWIDGET_H
#define ALGORITHMDOCKWIDGET_H
#include "MantidQtMantidWidgets/AlgorithmSelectorWidget.h"
#include "MantidQtWidgets/Common/AlgorithmSelectorWidget.h"
#include <QDockWidget>
class MantidUI;
......
......@@ -4,7 +4,7 @@
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/Workspace.h"
#include "MantidQtAPI/AlgorithmInputHistory.h"
#include "MantidQtWidgets/Common/AlgorithmInputHistory.h"
#include <QAction>
#include <QApplication>
......
......@@ -7,7 +7,7 @@
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/EnvironmentHistory.h"
#include "MantidQtAPI/MantidDialog.h"
#include "MantidQtWidgets/Common/MantidDialog.h"
#include <QTreeView>
#include <QTreeWidget>
......
#include "FirstTimeSetup.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/MantidVersion.h"
#include "MantidQtAPI/HelpWindow.h"
#include "MantidQtAPI/ManageUserDirectories.h"
#include "MantidQtAPI/MantidDesktopServices.h"
#include "MantidQtWidgets/Common/HelpWindow.h"
#include "MantidQtWidgets/Common/ManageUserDirectories.h"
#include "MantidQtWidgets/Common/MantidDesktopServices.h"
#include <QMessageBox>
#include <QPainter>
......
......@@ -809,7 +809,7 @@ color: rgb(25,125,25);</string>
<customwidget>
<class>MantidQt::MantidWidgets::InstrumentSelector</class>
<extends>QComboBox</extends>
<header>MantidQtMantidWidgets/InstrumentSelector.h</header>
<header>MantidQtWidgets/Common/InstrumentSelector.h</header>
</customwidget>
</customwidgets>
<tabstops>
......
......@@ -5,13 +5,13 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Workspace.h"
#include "MantidKernel/UsageService.h"
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include <QApplication>
#include <QMessageBox>
#include <MantidQtMantidWidgets/InstrumentView/InstrumentWidget.h>
#include <MantidQtMantidWidgets/InstrumentView/ProjectionSurface.h>
#include <MantidQtWidgets/Common/InstrumentView/InstrumentWidget.h>
#include <MantidQtWidgets/Common/InstrumentView/ProjectionSurface.h>
// Register the window into the WindowFactory
DECLARE_WINDOW(InstrumentWindow)
......
......@@ -3,8 +3,8 @@
#include "MantidAPI/AlgorithmObserver.h"
#include "MantidAPI/AnalysisDataService.h"
#include <MantidQtAPI/GraphOptions.h>
#include <MantidQtAPI/IProjectSerialisable.h>
#include <MantidQtWidgets/Common/GraphOptions.h>
#include <MantidQtWidgets/Common/IProjectSerialisable.h>
#include <MdiSubWindow.h>
#include <boost/shared_ptr.hpp>
......
#include "ManageCustomMenus.h"
#include "../ApplicationWindow.h"
#include "MantidQtAPI/InterfaceManager.h"
#include "MantidQtAPI/MantidDesktopServices.h"
#include "MantidQtWidgets/Common/InterfaceManager.h"
#include "MantidQtWidgets/Common/MantidDesktopServices.h"
#include "MantidKernel/ConfigService.h"
#include <QtGui>
......
#include "MantidKernel/ConfigService.h"
#include "ManageInterfaceCategories.h"
#include "MantidQtAPI/MantidDesktopServices.h"
#include "MantidQtWidgets/Common/MantidDesktopServices.h"
#include "../ApplicationWindow.h"
#include <QtGui>
......
......@@ -5,7 +5,7 @@
// Includes
//----------------------
#include "ui_MantidAbout.h"
#include <MantidQtAPI/MantidDialog.h>
#include <MantidQtWidgets/Common/MantidDialog.h>
/**
This class implements About MantidPlot dialog for mnatid help menu.
......
......@@ -2,7 +2,7 @@
// MantidApplciation definitions
//==============================
#include "MantidApplication.h"
#include "MantidQtAPI/MantidDialog.h"
#include "MantidQtWidgets/Common/MantidDialog.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/UsageService.h"
......
......@@ -4,7 +4,7 @@
#include <qwt_symbol.h>
#include "MantidAPI/AnalysisDataService.h"
#include "MantidQtAPI/MantidQwtWorkspaceData.h"
#include "MantidQtWidgets/Common/MantidQwtWorkspaceData.h"
#include "../ApplicationWindow.h"
#include "../Graph.h"
......
......@@ -3,8 +3,8 @@
#include "../PlotCurve.h"
#include "MantidAPI/Workspace_fwd.h"
#include "MantidQtAPI/MantidQwtWorkspaceData.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include "MantidQtWidgets/Common/MantidQwtWorkspaceData.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
class Graph;
class ErrorBarSettings;
......
......@@ -3,7 +3,7 @@
#include "MantidAPI/IMDWorkspace.h"
#include "MantidCurve.h"
#include "MantidQtAPI/MantidQwtIMDWorkspaceData.h"
#include "MantidQtWidgets/Common/MantidQwtIMDWorkspaceData.h"
#include <boost/shared_ptr.hpp>
// Forward definitions
......
......@@ -8,14 +8,14 @@
#include "MantidMatrixModel.h"
#include "MantidUI.h"
#include "Preferences.h"
#include <MantidQtAPI/pixmaps.h>
#include <MantidQtWidgets/Common/pixmaps.h>
#include "MantidQtAPI/TSVSerialiser.h"
#include "MantidQtWidgets/Common/TSVSerialiser.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/NumericAxis.h"
#include "MantidQtAPI/PlotAxis.h"
#include "MantidQtWidgets/Common/PlotAxis.h"
#include <QApplication>
#include <QClipboard>
......
......@@ -16,7 +16,7 @@
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
#include <Poco/NObserver.h>
......
......@@ -7,8 +7,8 @@
#include "MantidAPI/Axis.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidQtAPI/QwtWorkspaceBinData.h"
#include "MantidQtAPI/QwtWorkspaceSpectrumData.h"
#include "MantidQtWidgets/Common/QwtWorkspaceBinData.h"
#include "MantidQtWidgets/Common/QwtWorkspaceSpectrumData.h"
#include "../ApplicationWindow.h"
#include "../Graph.h"
......
......@@ -4,7 +4,7 @@
#include "../UserFunction.h"
#include "MantidMatrix.h"
#include "MantidQtAPI/WorkspaceObserver.h"
#include "MantidQtWidgets/Common/WorkspaceObserver.h"
#include "MantidKernel/cow_ptr.h"
#include "MantidHistogramData/HistogramX.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