Commit 5f008949 authored by Owen Arnold's avatar Owen Arnold
Browse files

refs #11868. Complete move

parent eb707112
#include "MantidQtSliceViewer/PhysicalCrossPeak.h"
using namespace Mantid::API;
using namespace Mantid::Geometry;
namespace MantidQt
{
......
#include "MantidQtSliceViewer/PhysicalSphericalPeak.h"
using namespace Mantid::API;
using namespace Mantid::Geometry;
namespace MantidQt
{
......
#include "MantidQtSliceViewer/QPeaksTableModel.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidGeometry/IComponent.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
......@@ -8,6 +8,7 @@
#include <boost/lexical_cast.hpp>
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace boost;
namespace MantidQt
......@@ -56,7 +57,7 @@ namespace MantidQt
const int QPeaksTableModel::COL_QLAB(18);
const int QPeaksTableModel::COL_QSAMPLE(19);
void QPeaksTableModel::updateDataCache(const Mantid::API::IPeak& peak, const int row) const
void QPeaksTableModel::updateDataCache(const Mantid::Geometry::IPeak& peak, const int row) const
{
// if the index is what is already cached just return
if (row == m_dataCachePeakIndex)
......
......@@ -10,9 +10,9 @@
#include "MantidAPI/CoordTransform.h"
#include "MantidAPI/IMDIterator.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/PeakTransformHKL.h"
#include "MantidAPI/PeakTransformQSample.h"
#include "MantidAPI/PeakTransformQLab.h"
#include "MantidGeometry/Crystal/PeakTransformHKL.h"
#include "MantidGeometry/Crystal/PeakTransformQSample.h"
#include "MantidGeometry/Crystal/PeakTransformQLab.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidAPI/IMDEventWorkspace.h"
......
......@@ -3,10 +3,10 @@
#include <cxxtest/TestSuite.h>
#include "MantidAPI/ExperimentInfo.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidKernel/SpecialCoordinateSystem.h"
#include "MantidAPI/PeakTransformFactory.h"
#include "MantidGeometry/Crystal/PeakTransformFactory.h"
#include "MantidQtSliceViewer/ConcretePeaksPresenter.h"
#include "MantidQtSliceViewer/PeakOverlayViewFactory.h"
#include "MantidDataObjects/PeaksWorkspace.h"
......
......@@ -3,14 +3,14 @@
#include "MantidAPI/IMDWorkspace.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidAPI/PeakTransform.h"
#include "MantidAPI/PeakTransformFactory.h"
#include "MantidGeometry/Crystal/PeakTransform.h"
#include "MantidGeometry/Crystal/PeakTransformFactory.h"
#include "MantidQtSliceViewer/PeaksPresenter.h"
#include "MantidQtSliceViewer/PeakOverlayView.h"
#include "MantidQtSliceViewer/PeakOverlayViewFactory.h"
#include "MantidQtSliceViewer/ZoomablePeaksView.h"
#include "MantidQtSliceViewer/UpdateableOnDemand.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidKernel/UnitLabel.h"
#include <boost/regex.hpp>
#include <gmock/gmock.h>
......@@ -18,6 +18,7 @@
using namespace MantidQt::SliceViewer;
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid;
using boost::regex;
......@@ -81,7 +82,7 @@ namespace
/*------------------------------------------------------------
Mock Peak Transform
------------------------------------------------------------*/
class MockPeakTransform : public PeakTransform
class MockPeakTransform : public Geometry::PeakTransform
{
public:
MockPeakTransform()
......@@ -93,7 +94,7 @@ namespace
}
MOCK_CONST_METHOD0(clone, PeakTransform_sptr());
MOCK_CONST_METHOD1(transform, Mantid::Kernel::V3D(const Mantid::Kernel::V3D&));
MOCK_CONST_METHOD1(transformPeak, Mantid::Kernel::V3D(const Mantid::API::IPeak&));
MOCK_CONST_METHOD1(transformPeak, Mantid::Kernel::V3D(const Mantid::Geometry::IPeak&));
MOCK_CONST_METHOD0(getFriendlyName, std::string());
MOCK_CONST_METHOD0(getCoordinateSystem, Mantid::Kernel::SpecialCoordinateSystem());
};
......@@ -101,7 +102,7 @@ namespace
/*------------------------------------------------------------
Mock Peak Transform Factory
------------------------------------------------------------*/
class MockPeakTransformFactory : public PeakTransformFactory
class MockPeakTransformFactory : public Geometry::PeakTransformFactory
{
public:
MOCK_CONST_METHOD0(createDefaultTransform, PeakTransform_sptr());
......@@ -154,7 +155,7 @@ class MockPeakTransformFactory : public PeakTransformFactory
/*------------------------------------------------------------
Mock IPeak
------------------------------------------------------------*/
class MockIPeak : public Mantid::API::IPeak
class MockIPeak : public Mantid::Geometry::IPeak
{
public:
MOCK_METHOD1(setInstrument,
......
......@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidVatesAPI/PeaksPresenterVsi.h"
#include "MantidAPI/PeakTransform.h"
#include "MantidGeometry/Crystal/PeakTransform.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidVatesAPI/ViewFrustum.h"
#include "MantidGeometry/Crystal/PeakShape.h"
......
......@@ -3,7 +3,7 @@
#include "MantidKernel/System.h"
#include "MantidVatesAPI/PeaksPresenterVsi.h"
#include "MantidAPI/PeakTransform.h"
#include "MantidGeometry/Crystal/PeakTransform.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidVatesAPI/ViewFrustum.h"
#include "MantidGeometry/Crystal/PeakShape.h"
......
......@@ -56,7 +56,7 @@ namespace VATES
private:
vtkDataSetToPeaksFilteredDataSet& operator=(const vtkDataSetToPeaksFilteredDataSet& other);
std::vector<std::pair<Mantid::Kernel::V3D, double>> getPeaksInfo(std::vector<Mantid::API::IPeaksWorkspace_sptr> peaksWorkspaces);
void addSinglePeak(Mantid::API::IPeak* peak, const Mantid::Kernel::SpecialCoordinateSystem coordinateSystem, std::vector<std::pair<Mantid::Kernel::V3D, double>>& peaksInfo);
void addSinglePeak(Mantid::Geometry::IPeak* peak, const Mantid::Kernel::SpecialCoordinateSystem coordinateSystem, std::vector<std::pair<Mantid::Kernel::V3D, double>>& peaksInfo);
vtkUnstructuredGrid *m_inputData; ///< Data to peak filter
vtkUnstructuredGrid *m_outputData; ///< Peak filtered data
std::vector<Mantid::API::IPeaksWorkspace_sptr> m_peaksWorkspaces; ///< A list of peaks workspace names.
......
......@@ -6,7 +6,7 @@
#include "MantidDataObjects/PeakShapeSpherical.h"
#include "MantidDataObjects/PeakShapeEllipsoid.h"
#include "MantidKernel/SpecialCoordinateSystem.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidGeometry/Crystal/PeakShape.h"
namespace Mantid {
namespace VATES {
......
#include "MantidVatesAPI/vtkDataSetToPeaksFilteredDataSet.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidDataObjects/NoShape.h"
#include "MantidDataObjects/PeakShapeEllipsoid.h"
......@@ -193,7 +193,7 @@ namespace VATES
// Iterate over all peaks for the workspace
for (int i = 0; i < numPeaks ; i++)
{
Mantid::API::IPeak* peak = (*it)->getPeakPtr(i);
Mantid::Geometry::IPeak* peak = (*it)->getPeakPtr(i);
addSinglePeak(peak, coordinateSystem, peaksInfo);
}
......@@ -208,7 +208,7 @@ GCC_DIAG_OFF(strict-aliasing)
* @param coordinateSystem The coordinate system in which the peaks position should be retrieved.
* @param peaksInfo A reference to the vector containing peak information.
*/
void vtkDataSetToPeaksFilteredDataSet::addSinglePeak(Mantid::API::IPeak* peak, const Mantid::Kernel::SpecialCoordinateSystem coordinateSystem, std::vector<std::pair<Mantid::Kernel::V3D, double>>& peaksInfo)
void vtkDataSetToPeaksFilteredDataSet::addSinglePeak(Mantid::Geometry::IPeak* peak, const Mantid::Kernel::SpecialCoordinateSystem coordinateSystem, std::vector<std::pair<Mantid::Kernel::V3D, double>>& peaksInfo)
{
double radius = m_defaultRadius;
const Mantid::Geometry::PeakShape& shape = peak->getPeakShape();
......
......@@ -4,7 +4,7 @@
#include <boost/math/special_functions/fpclassify.hpp>
#include "MantidAPI/Workspace.h"
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidAPI/IPeak.h"
#include "MantidGeometry/Crystal/IPeak.h"
#include "MantidGeometry/Crystal/PeakShape.h"
#include "MantidDataObjects/PeakShapeSpherical.h"
#include "MantidDataObjects/PeakShapeEllipsoid.h"
......@@ -32,7 +32,7 @@
#include <cmath>
using Mantid::API::IPeaksWorkspace;
using Mantid::API::IPeak;
using Mantid::Geometry::IPeak;
using Mantid::Kernel::V3D;
namespace Mantid
......
......@@ -15,6 +15,7 @@
using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::DataObjects;
using namespace ::testing;
using namespace Mantid::VATES;
......@@ -32,7 +33,6 @@ class MockPeaksWorkspace : public PeaksWorkspace
{
public:
MOCK_METHOD1(setInstrument, void (Mantid::Geometry::Instrument_const_sptr inst));
//MOCK_METHOD0(getInstrument, Mantid::Geometry::Instrument_const_sptr ());
MOCK_CONST_METHOD0(clone, Mantid::DataObjects::PeaksWorkspace*());
MOCK_CONST_METHOD0(getNumberPeaks, int());
MOCK_METHOD1(removePeak, void (int peakNum) );
......
......@@ -5,7 +5,7 @@
#include "MantidVatesSimpleGuiViewWidgets/CameraManager.h"
#include "MantidVatesSimpleGuiViewWidgets/PeaksTabWidget.h"
#include "MantidVatesAPI/CompositePeaksPresenterVsi.h"
#include "MantidAPI/PeakTransformSelector.h"
#include "MantidGeometry/Crystal/PeakTransformSelector.h"
#include "MantidGeometry/Crystal/PeakShape.h"
#include "MantidQtSliceViewer/PeakPalette.h"
#include "MantidKernel/SpecialCoordinateSystem.h"
......@@ -67,7 +67,7 @@ private:
boost::shared_ptr<CameraManager> m_cameraManager;
boost::shared_ptr<Mantid::VATES::CompositePeaksPresenterVsi> m_presenter;
/// Object for choosing a PeakTransformFactory based on the workspace type.
Mantid::API::PeakTransformSelector m_peakTransformSelector;
Mantid::Geometry::PeakTransformSelector m_peakTransformSelector;
PeaksTabWidget *m_peaksTabWidget;
pqPipelineSource *m_peakMarker;
Mantid::Kernel::SpecialCoordinateSystem m_coordinateSystem;
......
......@@ -5,9 +5,9 @@
#include "MantidAPI/IPeaksWorkspace.h"
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/PeakTransformHKL.h"
#include "MantidAPI/PeakTransformQSample.h"
#include "MantidAPI/PeakTransformQLab.h"
#include "MantidGeometry/Crystal/PeakTransformHKL.h"
#include "MantidGeometry/Crystal/PeakTransformQSample.h"
#include "MantidGeometry/Crystal/PeakTransformQLab.h"
#include "MantidKernel/V3D.h"
#include "MantidKernel/SpecialCoordinateSystem.h"
#include "MantidKernel/Logger.h"
......@@ -75,11 +75,11 @@ PeaksTableControllerVsi::PeaksTableControllerVsi(
m_presenter(new Mantid::VATES::CompositePeaksPresenterVsi()),
m_peaksTabWidget(NULL), m_peakMarker(NULL), m_coordinateSystem(Mantid::Kernel::SpecialCoordinateSystem::QLab) {
m_peakTransformSelector.registerCandidate(
boost::make_shared<Mantid::API::PeakTransformHKLFactory>());
boost::make_shared<Mantid::Geometry::PeakTransformHKLFactory>());
m_peakTransformSelector.registerCandidate(
boost::make_shared<Mantid::API::PeakTransformQSampleFactory>());
boost::make_shared<Mantid::Geometry::PeakTransformQSampleFactory>());
m_peakTransformSelector.registerCandidate(
boost::make_shared<Mantid::API::PeakTransformQLabFactory>());
boost::make_shared<Mantid::Geometry::PeakTransformQLabFactory>());
}
PeaksTableControllerVsi::~PeaksTableControllerVsi() {
......@@ -148,9 +148,9 @@ void PeaksTableControllerVsi::addWorkspace(
Mantid::API::AnalysisDataService::Instance()
.retrieveWS<Mantid::API::IPeaksWorkspace>(wsName);
Mantid::API::PeakTransformFactory_sptr transformFactory =
Mantid::Geometry::PeakTransformFactory_sptr transformFactory =
m_peakTransformSelector.makeChoice(dimInfo[0], dimInfo[1]);
Mantid::API::PeakTransform_sptr transform =
Mantid::Geometry::PeakTransform_sptr transform =
transformFactory->createTransform(dimInfo[0], dimInfo[1]);
std::string frame = transform->getFriendlyName();
......
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