Re #7746. Fix include paths.

The library now compiles and the tests pass.
mantidproject · Aug 13, 2013 · 342dff4 · 342dff4
1 parent c3cbafb
commit 342dff4
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 48 deletions.
diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
@@ -117,6 +117,7 @@ add_subdirectory (WorkflowAlgorithms)
 add_subdirectory (CurveFitting)
 add_subdirectory (Crystal)
 add_subdirectory (ICat)
+add_subdirectory (LiveData)
 
 # If an MPI-enabled build, add in the MPI-specific algorithms package
 if ( MPI_BUILD )
@@ -150,6 +151,7 @@ set ( FRAMEWORK_LIBS Kernel Geometry API PythonAPI PythonKernelModule
                      PythonGeometryModule PythonAPIModule DataObjects
                      DataHandling Nexus Algorithms CurveFitting ICat
                      Crystal MDAlgorithms MDEvents WorkflowAlgorithms
+                     LiveData
 #                     ISISLiveData
 )
 

diff --git a/Code/Mantid/Framework/LiveData/CMakeLists.txt b/Code/Mantid/Framework/LiveData/CMakeLists.txt
@@ -21,19 +21,19 @@ set ( SRC_UNITY_IGNORE_FILES src/LoadDAE/idc.cpp
         src/LoadDAE/isisds_command.cpp)
 
 set ( INC_FILES
-	inc/MantidDataHandling/ADARA.h
-	inc/MantidDataHandling/ADARAPackets.h
-	inc/MantidDataHandling/ADARAParser.h
-	inc/MantidDataHandling/FakeEventDataListener.h
-	inc/MantidDataHandling/FakeISISHistoDAE.h
-	inc/MantidDataHandling/FileEventDataListener.h
-	inc/MantidDataHandling/ISISHistoDataListener.h
-	inc/MantidDataHandling/LiveDataAlgorithm.h
-	inc/MantidDataHandling/LoadDAE.h
-	inc/MantidDataHandling/LoadLiveData.h
-	inc/MantidDataHandling/MonitorLiveData.h
-	inc/MantidDataHandling/SNSLiveEventDataListener.h
-	inc/MantidDataHandling/StartLiveData.h
+	inc/MantidLiveData/ADARA.h
+	inc/MantidLiveData/ADARAPackets.h
+	inc/MantidLiveData/ADARAParser.h
+	inc/MantidLiveData/FakeEventDataListener.h
+	inc/MantidLiveData/FakeISISHistoDAE.h
+	inc/MantidLiveData/FileEventDataListener.h
+	inc/MantidLiveData/ISISHistoDataListener.h
+	inc/MantidLiveData/LiveDataAlgorithm.h
+	inc/MantidLiveData/LoadDAE.h
+	inc/MantidLiveData/LoadLiveData.h
+	inc/MantidLiveData/MonitorLiveData.h
+	inc/MantidLiveData/SNSLiveEventDataListener.h
+	inc/MantidLiveData/StartLiveData.h
 )
 
 set ( TEST_FILES

diff --git a/Code/Mantid/Framework/LiveData/inc/MantidLiveData/ADARAParser.h b/Code/Mantid/Framework/LiveData/inc/MantidLiveData/ADARAParser.h
@@ -5,8 +5,8 @@
 #include <stdint.h>
 #include <stdexcept>
 
-#include "MantidDataHandling/ADARA.h"
-#include "MantidDataHandling/ADARAPackets.h"
+#include "MantidLiveData/ADARA.h"
+#include "MantidLiveData/ADARAPackets.h"
 
 namespace ADARA {
 

diff --git a/Code/Mantid/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h b/Code/Mantid/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
-#include "MantidDataHandling/LiveDataAlgorithm.h"
+#include "MantidLiveData/LiveDataAlgorithm.h"
 #include "MantidAPI/Workspace.h"
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h b/Code/Mantid/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
-#include "MantidDataHandling/LiveDataAlgorithm.h"
+#include "MantidLiveData/LiveDataAlgorithm.h"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h b/Code/Mantid/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
@@ -4,7 +4,7 @@
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidDataHandling/ADARAParser.h"
+#include "MantidLiveData/ADARAParser.h"
 #include "MantidAPI/ILiveListener.h"
 #include "MantidDataObjects/EventWorkspace.h"
 //#include "MantidKernel/RandomNumberGenerator.h"

diff --git a/Code/Mantid/Framework/LiveData/inc/MantidLiveData/StartLiveData.h b/Code/Mantid/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidAPI/Algorithm.h"
-#include "MantidDataHandling/LiveDataAlgorithm.h"
+#include "MantidLiveData/LiveDataAlgorithm.h"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/LiveData/src/ADARAPackets.cpp b/Code/Mantid/Framework/LiveData/src/ADARAPackets.cpp
@@ -1,4 +1,4 @@
-#include "MantidDataHandling/ADARAPackets.h"
+#include "MantidLiveData/ADARAPackets.h"
 
 #include <boost/lexical_cast.hpp>
 #include <string.h>

diff --git a/Code/Mantid/Framework/LiveData/src/ADARAParser.cpp b/Code/Mantid/Framework/LiveData/src/ADARAParser.cpp
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "MantidDataHandling/ADARAParser.h"
+#include "MantidLiveData/ADARAParser.h"
 
 using namespace ADARA;
 

diff --git a/Code/Mantid/Framework/LiveData/src/FakeEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/FakeEventDataListener.cpp
@@ -1,4 +1,4 @@
-#include "MantidDataHandling/FakeEventDataListener.h"
+#include "MantidLiveData/FakeEventDataListener.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidKernel/MersenneTwister.h"

diff --git a/Code/Mantid/Framework/LiveData/src/FakeISISHistoDAE.cpp b/Code/Mantid/Framework/LiveData/src/FakeISISHistoDAE.cpp
@@ -6,7 +6,7 @@ Simulates ISIS histogram DAE. It runs continuously until canceled and listens to
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidDataHandling/FakeISISHistoDAE.h"
+#include "MantidLiveData/FakeISISHistoDAE.h"
 #include <numeric>
 
 #include <Poco/Net/TCPServer.h>

diff --git a/Code/Mantid/Framework/LiveData/src/FileEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/FileEventDataListener.cpp
@@ -1,4 +1,4 @@
-#include "MantidDataHandling/FileEventDataListener.h"
+#include "MantidLiveData/FileEventDataListener.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidKernel/ConfigService.h"

diff --git a/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp b/Code/Mantid/Framework/LiveData/src/ISISHistoDataListener.cpp
@@ -1,4 +1,4 @@
-#include "MantidDataHandling/ISISHistoDataListener.h"
+#include "MantidLiveData/ISISHistoDataListener.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidAPI/AlgorithmFactory.h"

diff --git a/Code/Mantid/Framework/LiveData/src/LiveDataAlgorithm.cpp b/Code/Mantid/Framework/LiveData/src/LiveDataAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include "MantidDataHandling/LiveDataAlgorithm.h"
+#include "MantidLiveData/LiveDataAlgorithm.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/ListValidator.h"

diff --git a/Code/Mantid/Framework/LiveData/src/LoadDAE.cpp b/Code/Mantid/Framework/LiveData/src/LoadDAE.cpp
@@ -17,7 +17,7 @@ If the optional 'spectrum' properties are set for a multiperiod dataset, then th
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidDataHandling/LoadDAE.h"
+#include "MantidLiveData/LoadDAE.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/ConfigService.h"

diff --git a/Code/Mantid/Framework/LiveData/src/LoadDAE/idc.h b/Code/Mantid/Framework/LiveData/src/LoadDAE/idc.h
@@ -16,8 +16,6 @@
     GNU General Public License
 */
 
-#include "MantidDataHandling/DllConfig.h"
-
 ///@cond nodoc
 /** 
 * holds information about the DAE connection - defined fully in idc.c
@@ -35,10 +33,10 @@ extern "C" {
 #endif
 
 /** Open a DAE connection on host*/
-int DLLExport IDCopen(const char* host, int mode, int options, idc_handle_t* fh);
+int IDCopen(const char* host, int mode, int options, idc_handle_t* fh);
 
 /** Close a DAE connection */
-int DLLExport IDCclose(idc_handle_t* fh);
+int IDCclose(idc_handle_t* fh);
 
 /* The A versions of the functions allocate memory, the other need to be passed a pre-allocated array */
 
@@ -72,7 +70,7 @@ int IDCgetparc(idc_handle_t fh, const char* name, char* value, int dims_array[],
 
 /** Read \a nos spectra from the DAE starting at \a ifsn into pre-allocated array \a value.
     The size of value is held in the parameters \a dims_array and \a ndims  */
-int DLLExport IDCgetdat(idc_handle_t fh, int ifsn, int nos, int* value, int dims_array[], int* ndims);
+int IDCgetdat(idc_handle_t fh, int ifsn, int nos, int* value, int dims_array[], int* ndims);
 
 /** Read \a nos spectra from the DAE starting at \a ifsn and allocate array \a value to return the results.
     The size of the returned array is written to the parameters \a dims_array and \a ndims  */

diff --git a/Code/Mantid/Framework/LiveData/src/LoadLiveData.cpp b/Code/Mantid/Framework/LiveData/src/LoadLiveData.cpp
@@ -55,7 +55,7 @@ This could cause Mantid to run very slowly or to crash due to lack of memory.
 
 *WIKI*/
 
-#include "MantidDataHandling/LoadLiveData.h"
+#include "MantidLiveData/LoadLiveData.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/WriteLock.h"
 #include "MantidKernel/ReadLock.h"

diff --git a/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp b/Code/Mantid/Framework/LiveData/src/MonitorLiveData.cpp
@@ -11,9 +11,9 @@ For details on the way to specify the data processing steps, see: [[LoadLiveData
 
 *WIKI*/
 
-#include "MantidDataHandling/MonitorLiveData.h"
+#include "MantidLiveData/MonitorLiveData.h"
 #include "MantidKernel/System.h"
-#include "MantidDataHandling/LoadLiveData.h"
+#include "MantidLiveData/LoadLiveData.h"
 #include <Poco/Thread.h>
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/MemoryManager.h"

diff --git a/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp
@@ -1,8 +1,8 @@
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidAPI/WorkspaceFactory.h"
-#include "MantidDataHandling/ADARAParser.h"
-#include "MantidDataHandling/SNSLiveEventDataListener.h"
+#include "MantidLiveData/ADARAParser.h"
+#include "MantidLiveData/SNSLiveEventDataListener.h"
 #include "MantidDataObjects/Events.h"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/TimeSeriesProperty.h"

diff --git a/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp b/Code/Mantid/Framework/LiveData/src/StartLiveData.cpp
@@ -94,10 +94,10 @@ StartLiveData(UpdateEvery='1.0',Instrument='OFFSPEC',
 plotSpectrum('live', [0,1])
 </source>
 *WIKI_USAGE_NO_SIGNATURE*/
-#include "MantidDataHandling/StartLiveData.h"
+#include "MantidLiveData/StartLiveData.h"
 #include "MantidKernel/System.h"
-#include "MantidDataHandling/LoadLiveData.h"
-#include "MantidDataHandling/MonitorLiveData.h"
+#include "MantidLiveData/LoadLiveData.h"
+#include "MantidLiveData/MonitorLiveData.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/AlgorithmProxy.h"
 #include "MantidAPI/AlgorithmProperty.h"

diff --git a/Code/Mantid/Framework/LiveData/test/ADARAPacketTest.h b/Code/Mantid/Framework/LiveData/test/ADARAPacketTest.h
@@ -3,7 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "MantidDataHandling/ADARAParser.h"
+#include "MantidLiveData/ADARAParser.h"
 #include "boost/shared_ptr.hpp"
 #include "Poco/DOM/DOMParser.h"  // for parsing the XML device descriptions
 

diff --git a/Code/Mantid/Framework/LiveData/test/ADARAPackets.h b/Code/Mantid/Framework/LiveData/test/ADARAPackets.h
@@ -2,7 +2,7 @@
 #define MANTID_DATAHANDLING_ADARAPACKETS_H_
 
 #ifndef MANTID_DATAHANDLING_ADARAPACKETTEST_H_
-  #error "This file should only be included by MantidDataHandling/test/AdaraPacketTest.h"
+  #error "This file should only be included by MantidLiveData/test/AdaraPacketTest.h"
 #endif
 
 // This file includes sample packets for the AdaraPacketTest unit test. It's

diff --git a/Code/Mantid/Framework/LiveData/test/CMakeLists.txt b/Code/Mantid/Framework/LiveData/test/CMakeLists.txt
@@ -5,10 +5,14 @@ if ( CXXTEST_FOUND )
   # This variable is used within the cxxtest_add_test macro to build this helper class into the test executable.
   # It will go out of scope at the end of this file so doesn't need un-setting
   set ( TESTHELPER_SRCS TestDataListener.cpp
+                        ../../TestHelpers/src/ComponentCreationHelper.cpp
+                        ../../TestHelpers/src/WorkspaceCreationHelper.cpp
+                        ../../TestHelpers/src/StartFrameworkManager.cpp
       )
 
   cxxtest_add_test ( LiveDataTest ${TEST_FILES} )
   target_link_libraries( LiveDataTest LiveData )
+  add_dependencies ( LiveDataTest DataHandling Algorithms)
   add_dependencies ( FrameworkTests LiveDataTest )
   # Add to the 'FrameworkTests' group in VS
   set_property ( TARGET LiveDataTest PROPERTY FOLDER "UnitTests" )

diff --git a/Code/Mantid/Framework/LiveData/test/ISISHistoDataListenerTest.h b/Code/Mantid/Framework/LiveData/test/ISISHistoDataListenerTest.h
@@ -1,8 +1,8 @@
 #ifndef MANTID_DATAHANDLING_ISISHISTODATALISTENERTEST_H_
 #define MANTID_DATAHANDLING_ISISHISTODATALISTENERTEST_H_
 
-#include "MantidDataHandling/ISISHistoDataListener.h"
-#include "MantidDataHandling/FakeISISHistoDAE.h"
+#include "MantidLiveData/ISISHistoDataListener.h"
+#include "MantidLiveData/FakeISISHistoDAE.h"
 #include "MantidAPI/LiveListenerFactory.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/MatrixWorkspace.h"

diff --git a/Code/Mantid/Framework/LiveData/test/LiveDataAlgorithmTest.h b/Code/Mantid/Framework/LiveData/test/LiveDataAlgorithmTest.h
@@ -6,7 +6,7 @@
 #include "MantidKernel/System.h"
 #include <iostream>
 #include <iomanip>
-#include "MantidDataHandling/LiveDataAlgorithm.h"
+#include "MantidLiveData/LiveDataAlgorithm.h"
 #include "MantidTestHelpers/WorkspaceCreationHelper.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidAPI/AlgorithmManager.h"

diff --git a/Code/Mantid/Framework/LiveData/test/LoadLiveDataTest.h b/Code/Mantid/Framework/LiveData/test/LoadLiveDataTest.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_DATAHANDLING_LOADLIVEDATATEST_H_
 #define MANTID_DATAHANDLING_LOADLIVEDATATEST_H_
 
-#include "MantidDataHandling/LoadLiveData.h"
+#include "MantidLiveData/LoadLiveData.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidKernel/System.h"

diff --git a/Code/Mantid/Framework/LiveData/test/MonitorLiveDataTest.h b/Code/Mantid/Framework/LiveData/test/MonitorLiveDataTest.h
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include "MantidDataHandling/MonitorLiveData.h"
+#include "MantidLiveData/MonitorLiveData.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidKernel/Strings.h"
 #include "MantidDataObjects/EventWorkspace.h"

diff --git a/Code/Mantid/Framework/LiveData/test/StartLiveDataTest.h b/Code/Mantid/Framework/LiveData/test/StartLiveDataTest.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_DATAHANDLING_STARTLIVEDATATEST_H_
 #define MANTID_DATAHANDLING_STARTLIVEDATATEST_H_
 
-#include "MantidDataHandling/StartLiveData.h"
+#include "MantidLiveData/StartLiveData.h"
 #include "MantidDataObjects/EventWorkspace.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/Timer.h"