Commit 1fc54a59 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[CHANGE] - modules work again

parent 92e5e5f6
......@@ -249,7 +249,7 @@ INCLUDE_DIRECTORIES( "${PROJECT_SOURCE_DIR}/" )
ADD_SUBDIRECTORY( core )
ADD_SUBDIRECTORY( qt4gui )
#ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( modules )
ADD_SUBDIRECTORY( ext ) # The needed external libraries
#-------------------------------------------------------------------------------------------------------------
......
......@@ -33,21 +33,21 @@
#include <boost/thread/thread.hpp>
#include "HARDIToSphericalHarmonics.xpm"
#include "../../common/WLimits.h"
#include "../../common/WAssert.h"
#include "../../common/WProgress.h"
#include "../../common/WPreferences.h"
#include "../../common/math/WUnitSphereCoordinates.h"
#include "../../common/math/WMatrix.h"
#include "../../common/math/WSymmetricSphericalHarmonic.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../common/math/WLinearAlgebraFunctions.h"
#include "../../dataHandler/WDataHandler.h"
#include "../../dataHandler/WSubject.h"
#include "../../kernel/WKernel.h"
#include "../../graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "core/common/WLimits.h"
#include "core/common/WAssert.h"
#include "core/common/WProgress.h"
#include "core/common/WPreferences.h"
#include "core/common/math/WUnitSphereCoordinates.h"
#include "core/common/math/WMatrix.h"
#include "core/common/math/WSymmetricSphericalHarmonic.h"
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
#include "core/common/math/WLinearAlgebraFunctions.h"
#include "core/dataHandler/WDataHandler.h"
#include "core/dataHandler/WSubject.h"
#include "core/kernel/WKernel.h"
#include "core/graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "WSphericalHarmonicsCoefficientsThread.h"
......
......@@ -30,14 +30,14 @@
#include <vector>
#include "../../common/WThreadedRunner.h"
#include "../../common/math/WMatrix.h"
#include "../../dataHandler/WDataSetRawHARDI.h"
#include "../../dataHandler/WDataSetSphericalHarmonics.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../dataHandler/WGridRegular3D.h"
#include "core/common/WThreadedRunner.h"
#include "core/common/math/WMatrix.h"
#include "core/dataHandler/WDataSetRawHARDI.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "WSphericalHarmonicsCoefficientsThread.h"
......
......@@ -33,10 +33,10 @@
#include <boost/thread/thread.hpp>
#include "HARDIToSphericalHarmonics.xpm"
#include "../../common/WLimits.h"
#include "../../common/WAssert.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../common/math/WMatrix.h"
#include "core/common/WLimits.h"
#include "core/common/WAssert.h"
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
#include "core/common/math/WMatrix.h"
#include "WSphericalHarmonicsCoefficientsThread.h"
......
......@@ -30,14 +30,14 @@
#include <vector>
#include "../../common/WThreadedRunner.h"
#include "../../common/math/WMatrix.h"
#include "../../dataHandler/WDataSetRawHARDI.h"
#include "../../dataHandler/WDataSetSphericalHarmonics.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../dataHandler/WGridRegular3D.h"
#include "core/common/WThreadedRunner.h"
#include "core/common/math/WMatrix.h"
#include "core/dataHandler/WDataSetRawHARDI.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/dataHandler/WGridRegular3D.h"
/**
......
......@@ -32,9 +32,9 @@
#include <cmath>
#include "../../common/WProgress.h"
#include "../../common/WAssert.h"
#include "../../kernel/WKernel.h"
#include "core/common/WProgress.h"
#include "core/common/WAssert.h"
#include "core/kernel/WKernel.h"
#include "WMApplyMask.h"
#include "WMApplyMask.xpm"
......
......@@ -33,10 +33,10 @@
#include <osg/Geode>
#include <osg/Uniform>
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
class WPickHandler;
......
......@@ -25,19 +25,19 @@
#include <string>
#include <vector>
#include "../../dataHandler/WDataHandler.h"
#include "../../dataHandler/WDataSet.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../dataHandler/WDataSetSingle.h"
#include "../../dataHandler/WGridRegular3D.h"
#include "../../dataHandler/WSubject.h"
#include "../../dataHandler/WValueSet.h"
#include "../../graphicsEngine/shaders/WGEShader.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/WGEColormapping.h"
#include "../../graphicsEngine/shaders/WGEPropertyUniform.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WSelectionManager.h"
#include "core/dataHandler/WDataHandler.h"
#include "core/dataHandler/WDataSet.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/dataHandler/WDataSetSingle.h"
#include "core/dataHandler/WGridRegular3D.h"
#include "core/dataHandler/WSubject.h"
#include "core/dataHandler/WValueSet.h"
#include "core/graphicsEngine/shaders/WGEShader.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/shaders/WGEPropertyUniform.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WSelectionManager.h"
#include "WMArbitraryPlane.h"
#include "WMArbitraryPlane.xpm"
......
......@@ -30,12 +30,12 @@
#include <osg/Geode>
#include "../../graphicsEngine/WGEManagedGroupNode.h"
#include "../../graphicsEngine/WROISphere.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/WROISphere.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
/**
* Someone should add some documentation here.
......
......@@ -33,14 +33,14 @@
#include <osg/StateAttribute>
#include <osg/StateSet>
#include "../../common/WAssert.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../graphicsEngine/WROIBox.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "../../kernel/WSelectionManager.h"
#include "core/common/WAssert.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "core/graphicsEngine/WROIArbitrary.h"
#include "core/graphicsEngine/WROIBox.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WROIManager.h"
#include "core/kernel/WSelectionManager.h"
#include "WMArbitraryRois.h"
#include "WMArbitraryRois.xpm"
......
......@@ -30,13 +30,13 @@
#include <osg/Geode>
#include "../../graphicsEngine/WROI.h"
#include "../../graphicsEngine/WGEGroupNode.h"
#include "../../graphicsEngine/WTriangleMesh.h"
#include "core/graphicsEngine/WROI.h"
#include "core/graphicsEngine/WGEGroupNode.h"
#include "core/graphicsEngine/WTriangleMesh.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
class WROIArbitrary;
class WROIBox;
......
......@@ -34,7 +34,7 @@
#include <osg/Texture3D>
#include <osgDB/ReadFile>
#include "../../kernel/WKernel.h"
#include "core/kernel/WKernel.h"
#include "WMAtlasCreator.xpm"
#include "WMAtlasCreator.h"
......
......@@ -30,12 +30,12 @@
#include <osg/Geode>
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../dataHandler/WValueSet.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/dataHandler/WValueSet.h"
/**
......
......@@ -27,15 +27,15 @@
#include <vector>
#include "../../common/WProgress.h"
#include "../../common/WSharedObject.h"
#include "../../common/WThreadedJobs.h"
#include "core/common/WProgress.h"
#include "core/common/WSharedObject.h"
#include "core/common/WThreadedJobs.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "../../graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "core/graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "../../graphicsEngine/WTriangleMesh.h"
#include "core/graphicsEngine/WTriangleMesh.h"
/**
* TODO(schurade): Document this!
*/
......
......@@ -36,18 +36,18 @@
#include <osg/StateAttribute>
#include <osg/StateSet>
#include "../../common/WAssert.h"
#include "../../common/WThreadedFunction.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WGEGroupNode.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/WROI.h"
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../graphicsEngine/WTriangleMesh.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "core/common/WAssert.h"
#include "core/common/WThreadedFunction.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "core/graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "core/graphicsEngine/WGEGroupNode.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/graphicsEngine/WROI.h"
#include "core/graphicsEngine/WROIArbitrary.h"
#include "core/graphicsEngine/WTriangleMesh.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WROIManager.h"
#include "WCreateSurfaceJob.h"
#include "WMAtlasSurfaces.h"
#include "WMAtlasSurfaces.xpm"
......
......@@ -32,12 +32,12 @@
#include <osg/Geode>
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "../../graphicsEngine/WGEGroupNode.h"
#include "../../graphicsEngine/WTriangleMesh.h"
#include "core/graphicsEngine/WGEGroupNode.h"
#include "core/graphicsEngine/WTriangleMesh.h"
class WDataSetScalar;
......
......@@ -29,12 +29,12 @@
#include <teem/elf.h> // NOLINT: the stylechecker interprets this as c-header which is not true!
#include "../../common/math/WSymmetricSphericalHarmonic.h"
#include "../../common/WLimits.h"
#include "../../common/exceptions/WPreconditionNotMet.h"
#include "../../graphicsEngine/WROIBox.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "core/common/math/WSymmetricSphericalHarmonic.h"
#include "core/common/WLimits.h"
#include "core/common/exceptions/WPreconditionNotMet.h"
#include "core/graphicsEngine/WROIBox.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WROIManager.h"
#include "WMBermanTracking.xpm"
#include "WMBermanTracking.h"
......
......@@ -30,16 +30,16 @@
#include <boost/random/mersenne_twister.hpp>
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../common/WThreadedFunction.h"
#include "../../dataHandler/WDataSetSphericalHarmonics.h"
#include "../../dataHandler/WDataSetFibers.h"
#include "../../dataHandler/WDataSetRawHARDI.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "../../dataHandler/WThreadedTrackingFunction.h"
#include "../../dataHandler/WFiberAccumulator.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/common/WThreadedFunction.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/dataHandler/WDataSetFibers.h"
#include "core/dataHandler/WDataSetRawHARDI.h"
#include "core/dataHandler/WDataSetScalar.h"
#include "core/dataHandler/WThreadedTrackingFunction.h"
#include "core/dataHandler/WFiberAccumulator.h"
// forward declarations
class WROIBox;
......
......@@ -25,11 +25,11 @@
#include <string>
#include <vector>
#include "../../common/math/WSymmetricSphericalHarmonic.h"
#include "../../common/WLimits.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../common/math/WGeometryFunctions.h"
#include "../../kernel/WKernel.h"
#include "core/common/math/WSymmetricSphericalHarmonic.h"
#include "core/common/WLimits.h"
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
#include "core/common/math/WGeometryFunctions.h"
#include "core/kernel/WKernel.h"
#include "WMCalculateGFA.xpm"
#include "WMCalculateGFA.h"
......
......@@ -28,14 +28,14 @@
#include <string>
#include <vector>
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../common/WThreadedFunction.h"
#include "../../common/math/WMatrix.h"
#include "../../dataHandler/WThreadedPerVoxelOperation.h"
#include "../../dataHandler/WDataSetSphericalHarmonics.h"
#include "../../dataHandler/WDataSetScalar.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/common/WThreadedFunction.h"
#include "core/common/math/WMatrix.h"
#include "core/dataHandler/WThreadedPerVoxelOperation.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/dataHandler/WDataSetScalar.h"
/**
* \class WMCalculateGFA
......
......@@ -25,11 +25,11 @@
#include <string>
#include <vector>
#include "../../common/math/WSymmetricSphericalHarmonic.h"
#include "../../common/math/WMatrix.h"
#include "../../common/math/linearAlgebra/WLinearAlgebra.h"
#include "../../common/WLimits.h"
#include "../../kernel/WKernel.h"
#include "core/common/math/WSymmetricSphericalHarmonic.h"
#include "core/common/math/WMatrix.h"
#include "core/common/math/linearAlgebra/WLinearAlgebra.h"
#include "core/common/WLimits.h"
#include "core/kernel/WKernel.h"
#include "WMCalculateTensors.h"
......
......@@ -28,14 +28,14 @@
#include <string>
#include <vector>
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "../../common/WThreadedFunction.h"
#include "../../common/math/WMatrix.h"
#include "../../dataHandler/WThreadedPerVoxelOperation.h"
#include "../../dataHandler/WDataSetSphericalHarmonics.h"
#include "../../dataHandler/WDataSetDTI.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
#include "core/common/WThreadedFunction.h"
#include "core/common/math/WMatrix.h"
#include "core/dataHandler/WThreadedPerVoxelOperation.h"
#include "core/dataHandler/WDataSetSphericalHarmonics.h"
#include "core/dataHandler/WDataSetDTI.h"
/**
* \class WMCalculateTensors
......
......@@ -35,11 +35,11 @@
#include <osgWidget/ViewerEventHandlers> //NOLINT
#include <osgWidget/WindowManager> //NOLINT
#include "../../common/WPathHelper.h"
#include "../../common/WPropertyHelper.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WROIManager.h"
#include "core/common/WPathHelper.h"
#include "core/common/WPropertyHelper.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WROIManager.h"
#include "WMClusterDisplay.h"
#include "WMClusterDisplay.xpm" // Please put a real icon here.
......
......@@ -31,15 +31,15 @@
#include <osg/Geode>
#include "../../common/WHierarchicalTreeFibers.h"
#include "../../graphicsEngine/geodes/WDendrogramGeode.h"
#include "../../graphicsEngine/WFiberDrawable.h"
#include "../../graphicsEngine/WGEManagedGroupNode.h"
#include "../../graphicsEngine/widgets/WOSGButton.h"
#include "../../kernel/WFiberSelector.h"
#include "../../kernel/WModule.h"
#include "../../kernel/WModuleInputData.h"
#include "../../kernel/WModuleOutputData.h"
#include "core/common/WHierarchicalTreeFibers.h"
#include "core/graphicsEngine/geodes/WDendrogramGeode.h"
#include "core/graphicsEngine/WFiberDrawable.h"
#include "core/graphicsEngine/WGEManagedGroupNode.h"
#include "core/graphicsEngine/widgets/WOSGButton.h"
#include "core/kernel/WFiberSelector.h"
#include "core/kernel/WModule.h"
#include "core/kernel/WModuleInputData.h"
#include "core/kernel/WModuleOutputData.h"
const unsigned int MASK_2D = 0xF0000000; //!< used for osgWidget stuff
const unsigned int MASK_3D = 0x0F000000; //!< used for osgWidget stuff
......
......@@ -33,7 +33,7 @@
#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
#include "../../common/WLogger.h"
#include "core/common/WLogger.h"
#include "WFileParser.h"
......
......@@ -34,13 +34,13 @@
#include <osgWidget/WindowManager> //NOLINT
#include <osg/LightModel>
#include "../../common/WPathHelper.h"
#include "../../common/WPropertyHelper.h"
#include "../../graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "../../graphicsEngine/WGEColormapping.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "../../kernel/WSelectionManager.h"
#include "core/common/WPathHelper.h"
#include "core/common/WPropertyHelper.h"
#include "core/graphicsEngine/algorithms/WMarchingLegoAlgorithm.h"
#include "core/graphicsEngine/WGEColormapping.h"
#include "core/graphicsEngine/WGEUtils.h"
#include "core/kernel/WKernel.h"
#include "core/kernel/WSelectionManager.h"
#include "WFileParser.h"
#include "WMClusterDisplayVoxels.h"
#include "WMClusterDisplayVoxels.xpm"
......