[CHANGE] moved Loader classes to subdirectory

src/dataHandler/CMakeLists.txt

@@ -3,8 +3,9 @@ ADD_SUBDIRECTORY( exceptions )
 
 FILE( GLOB DATAHANDLER_SRC "*.cpp" "*.hpp" )
 FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" )
-ADD_LIBRARY( dataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} )
-TARGET_LINK_LIBRARIES( dataHandler niftiio common math ${Boost_LIBRARIES} )
+FILE( GLOB DATAHANDLER_LOADERS_SRC "io/WLoader*.cpp" )
+ADD_LIBRARY( dataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC}  ${DATAHANDLER_LOADERS_SRC})
+TARGET_LINK_LIBRARIES( dataHandler common math ${Boost_LIBRARIES} niftiio )
 
 # Unit tests
 IF( CXXTEST_FOUND )

src/dataHandler/io/CMakeLists.txt

-ADD_SUBDIRECTORY( nifti )
\ No newline at end of file
+ADD_SUBDIRECTORY( test )
+
+ADD_SUBDIRECTORY( nifti )
+ADD_SUBDIRECTORY( biosig )
+
+# Unit tests
+IF( CXXTEST_FOUND )
+  CXXTEST_ADD_TESTS_FROM_LIST( "${DATAHANDLER_IO_SRC}" "biosigLoader;biosig" )
+ENDIF( CXXTEST_FOUND )

src/dataHandler/WLoaderNIfTI.cpp → src/dataHandler/io/WLoaderNIfTI.cpp

@@ -27,13 +27,13 @@
 #include <boost/shared_ptr.hpp>
 
 #include "WLoaderNIfTI.h"
-#include "WDataHandler.h"
-#include "WDataSet.h"
-#include "WDataSetSingle.h"
-#include "WGrid.h"
-#include "WGridRegular3D.h"
-#include "WValueSetBase.h"
-#include "WValueSet.hpp"
+#include "../WDataHandler.h"
+#include "../WDataSet.h"
+#include "../WDataSetSingle.h"
+#include "../WGrid.h"
+#include "../WGridRegular3D.h"
+#include "../WValueSetBase.h"
+#include "../WValueSet.hpp"
 
 
 WLoaderNIfTI::WLoaderNIfTI( std::string fileName, boost::shared_ptr< WDataHandler > dataHandler )

src/dataHandler/WLoaderNIfTI.h → src/dataHandler/io/WLoaderNIfTI.h

@@ -28,10 +28,10 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 
-#include "WLoader.h"
-#include "WMetaInfo.h"
+#include "../WLoader.h"
+#include "../WMetaInfo.h"
 
-#include "io/nifti/nifti1_io.h"
+#include "nifti/nifti1_io.h"
 
 class WDataSet;
 class WDataHandler;

src/dataHandler/WLoaderVTK.h → src/dataHandler/io/WLoaderVTK.h

@@ -24,7 +24,7 @@
 #ifndef WLOADERVTK_H
 #define WLOADERVTK_H
 
-#include "WLoader.h"
+#include "../WLoader.h"
 
 /**
  * Loader for the VTK file formats. For VTK just see http://www.vtk.org