Commit 7fac872d authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[MERGE]

parents a813552e 674771d0
......@@ -8,4 +8,6 @@ syntax: regexp
^doc/developer/html
^doc/developer/man
^build
\ No newline at end of file
^build
syntax: glob
.project
\ No newline at end of file
......@@ -6,7 +6,7 @@ FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" )
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 biosig)
TARGET_LINK_LIBRARIES( dataHandler kernel common math ${Boost_LIBRARIES} niftiio biosig)
# Unit tests
IF( CXXTEST_FOUND )
......
......@@ -28,6 +28,7 @@
#include "WSubject.h"
#include "exceptions/WNoSuchDataSetException.h"
#include "WLoaderManager.h"
#include "../kernel/WKernel.h"
WDataHandler::WDataHandler()
{
......@@ -60,6 +61,6 @@ void WDataHandler::loadDataSets( std::vector< std::string > fileNames )
for ( size_t i = 0 ; i < fileNames.size() ; ++i)
{
// TODO( wiebel ): need to associate the dataset to its subject
lm.load( fileNames[i], ( boost::shared_ptr< WDataHandler > )this );
lm.load( fileNames[i], WKernel::getRunningKernel()->getDataHandler() );
}
}
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
Markdown is supported
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