Commit e3dacddf authored by Nick Draper's avatar Nick Draper
Browse files

re #843

Added subfolders to src and inc in Geometry.vcproj
Tested with scons and VS sln builds
parent b141fb56
......@@ -6,7 +6,7 @@
//----------------------------------------------------------------------
#include "MantidKernel/Logger.h"
#include "MantidGeometry/ICompAssembly.h"
#include "MantidGeometry/Detector.h"
#include "MantidGeometry/Instrument/Detector.h"
#include <boost/shared_ptr.hpp>
#include <map>
#include <string>
......
......@@ -6,9 +6,9 @@
//----------------------------------------------------------------------
#include "MantidKernel/Logger.h"
#include "MantidAPI/IInstrument.h"
#include "MantidGeometry/CompAssembly.h"
#include "MantidGeometry/ObjComponent.h"
#include "MantidGeometry/Detector.h"
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidGeometry/Instrument/ObjComponent.h"
#include "MantidGeometry/Instrument/Detector.h"
#include <string>
#include <map>
#include <ostream>
......
......@@ -10,7 +10,7 @@
#include "MantidAPI/Sample.h"
#include "MantidAPI/WorkspaceIterator.h"
#include "MantidAPI/Axis.h"
#include "MantidGeometry/ParameterMap.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Unit.h"
......
......@@ -5,9 +5,9 @@
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/Logger.h"
#include "MantidGeometry/ParCompAssembly.h"
#include "MantidGeometry/ParObjComponent.h"
#include "MantidGeometry/Detector.h"
#include "MantidGeometry/Instrument/ParCompAssembly.h"
#include "MantidGeometry/Instrument/ParObjComponent.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidAPI/Instrument.h"
#include "MantidKernel/cow_ptr.h"
#include <string>
......
......@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/PropertyManager.h"
#include "MantidGeometry/Object.h"
#include "MantidGeometry/Objects/Object.h"
namespace Mantid
{
......
#include "MantidAPI/Instrument.h"
#include "MantidGeometry/V3D.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include <algorithm>
#include <iostream>
......
......@@ -6,7 +6,7 @@
#include "MantidAPI/SpectraDetectorMap.h"
#include "MantidAPI/ParInstrument.h"
#include "MantidAPI/XMLlogfile.h"
#include "MantidGeometry/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidKernel/TimeSeriesProperty.h"
namespace Mantid
......
......@@ -2,9 +2,9 @@
#include "MantidAPI/Instrument.h"
#include "MantidGeometry/V3D.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/DetectorGroup.h"
#include "MantidGeometry/ParObjComponent.h"
#include "MantidGeometry/ParDetector.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Instrument/ParObjComponent.h"
#include "MantidGeometry/Instrument/ParDetector.h"
#include <algorithm>
#include <iostream>
......
......@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/XMLlogfile.h"
#include "MantidGeometry/Component.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include <muParser.h>
#include <ctime>
......
......@@ -5,7 +5,7 @@
#include "MantidAPI/Instrument.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
using namespace Mantid::Kernel;
using namespace Mantid::API;
......
......@@ -6,7 +6,7 @@
#include "MantidAPI/Instrument.h"
#include "MantidAPI/ParInstrument.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/DetectorGroup.h"
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidKernel/cow_ptr.h"
using namespace Mantid::Kernel;
......
......@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
#include "MantidGeometry/Object.h"
#include "MantidGeometry/Objects/Object.h"
#include <climits>
namespace Mantid
......
......@@ -4,8 +4,8 @@
#include "MantidAlgorithms/CylinderAbsorption.h"
#include "MantidKernel/PhysicalConstants.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidGeometry/Cylinder.h"
#include "MantidGeometry/Plane.h"
#include "MantidGeometry/Surfaces/Cylinder.h"
#include "MantidGeometry/Surfaces/Plane.h"
#include "MantidKernel/Fast_Exponential.h"
namespace Mantid
......
......@@ -374,6 +374,14 @@
RelativePath=".\inc\MantidDataHandling\GroupDetectors2.h"
>
</File>
<File
RelativePath=".\test\GroupDetectors2Test.h"
>
</File>
<File
RelativePath=".\test\GroupDetectorsTest.h"
>
</File>
<File
RelativePath=".\src\LoadDAE\idc.h"
>
......@@ -442,6 +450,10 @@
RelativePath=".\inc\MantidDataHandling\LoadMappingTable.h"
>
</File>
<File
RelativePath=".\test\LoadMappingTableTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\LoadRaw.h"
>
......@@ -470,10 +482,18 @@
RelativePath=".\inc\MantidDataHandling\LoadRKH.h"
>
</File>
<File
RelativePath=".\test\LoadRKHTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\LoadSampleDetailsFromRaw.h"
>
</File>
<File
RelativePath=".\test\LoadSaveAsciiTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\ManagedRawFileWorkspace2D.h"
>
......@@ -494,14 +514,26 @@
RelativePath=".\test\MaskDetectorsInShapeTest.h"
>
</File>
<File
RelativePath=".\test\MaskDetectorsTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\MoveInstrumentComponent.h"
>
</File>
<File
RelativePath=".\test\MoveInstrumentComponentTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\RawFileInfo.h"
>
</File>
<File
RelativePath=".\test\RawFileInfoTest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\RotateInstrumentComponent.h"
>
......@@ -522,6 +554,10 @@
RelativePath=".\inc\MantidDataHandling\SaveFocusedXYE.h"
>
</File>
<File
RelativePath=".\test\SaveFocussedXYETest.h"
>
</File>
<File
RelativePath=".\inc\MantidDataHandling\SaveGSS.h"
>
......@@ -558,6 +594,10 @@
RelativePath=".\src\LoadRaw\vms_convert.h"
>
</File>
<File
RelativePath=".\test\XMLlogfileTest.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
......
......@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
#include "MantidGeometry/Component.h"
#include "MantidGeometry/Instrument/Component.h"
namespace Mantid
{
......
......@@ -5,7 +5,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/Algorithm.h"
#include "MantidGeometry/Component.h"
#include "MantidGeometry/Instrument/Component.h"
namespace Mantid
{
......
......@@ -8,8 +8,8 @@
#include "MantidAPI/Workspace.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/Property.h"
#include "MantidGeometry/ParametrizedComponent.h"
#include "MantidGeometry/Component.h"
#include "MantidGeometry/Instrument/ParametrizedComponent.h"
#include "MantidGeometry/Instrument/Component.h"
namespace Mantid
{
......
......@@ -2,7 +2,7 @@
// Includes
//--------------------------------
#include "MantidDataHandling/CreateSampleShape.h"
#include "MantidGeometry/ShapeFactory.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/Sample.h"
......
......@@ -2,7 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidDataHandling/FindDetectorsInShape.h"
#include "MantidGeometry/ShapeFactory.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidKernel/ArrayProperty.h"
#include "MantidAPI/MatrixWorkspace.h"
......
......@@ -2,14 +2,14 @@
// Includes
//----------------------------------------------------------------------
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidGeometry/ShapeFactory.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidAPI/Instrument.h"
#include "MantidAPI/InstrumentDataService.h"
#include "MantidAPI/XMLlogfile.h"
#include "MantidAPI/Progress.h"
#include "MantidGeometry/Detector.h"
#include "MantidGeometry/vtkGeometryCacheReader.h"
#include "MantidGeometry/vtkGeometryCacheWriter.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Rendering/vtkGeometryCacheReader.h"
#include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
#include "MantidKernel/PhysicalConstants.h"
#include "Poco/DOM/DOMParser.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