[CHANGE] - modules work again

1fc54a59 · Sebastian Eichelbaum · 92e5e5f6 · 1fc54a59 · 1fc54a59 · 1fc54a59
Commit 1fc54a59 authored May 18, 2011 by Sebastian Eichelbaum
20 changed files
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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

 #-------------------------------------------------------------------------------------------------------------

--- a/src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.cpp
+++ b/src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.cpp
@@ -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"


--- a/src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.h
+++ b/src/modules/HARDIToSphericalHarmonics/WMHARDIToSphericalHarmonics.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"


--- a/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.cpp
+++ b/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.cpp
@@ -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"


--- a/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h
+++ b/src/modules/HARDIToSphericalHarmonics/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"


 /**

--- a/src/modules/applyMask/WMApplyMask.cpp
+++ b/src/modules/applyMask/WMApplyMask.cpp
@@ -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"


--- a/src/modules/applyMask/WMApplyMask.h
+++ b/src/modules/applyMask/WMApplyMask.h
@@ -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;

--- a/src/modules/arbitraryPlane/WMArbitraryPlane.cpp
+++ b/src/modules/arbitraryPlane/WMArbitraryPlane.cpp
@@ -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"


--- a/src/modules/arbitraryPlane/WMArbitraryPlane.h
+++ b/src/modules/arbitraryPlane/WMArbitraryPlane.h
@@ -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.

--- a/src/modules/arbitraryRois/WMArbitraryRois.cpp
+++ b/src/modules/arbitraryRois/WMArbitraryRois.cpp
@@ -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"


--- a/src/modules/arbitraryRois/WMArbitraryRois.h
+++ b/src/modules/arbitraryRois/WMArbitraryRois.h
@@ -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;

--- a/src/modules/atlasCreator/WMAtlasCreator.cpp
+++ b/src/modules/atlasCreator/WMAtlasCreator.cpp
@@ -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"

--- a/src/modules/atlasCreator/WMAtlasCreator.h
+++ b/src/modules/atlasCreator/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"


 /**

--- a/src/modules/atlasSurfaces/WCreateSurfaceJob.h
+++ b/src/modules/atlasSurfaces/WCreateSurfaceJob.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!
 */

--- a/src/modules/atlasSurfaces/WMAtlasSurfaces.cpp
+++ b/src/modules/atlasSurfaces/WMAtlasSurfaces.cpp
@@ -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"

--- a/src/modules/atlasSurfaces/WMAtlasSurfaces.h
+++ b/src/modules/atlasSurfaces/WMAtlasSurfaces.h
@@ -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;


--- a/src/modules/bermanTracking/WMBermanTracking.cpp
+++ b/src/modules/bermanTracking/WMBermanTracking.cpp
@@ -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"


--- a/src/modules/bermanTracking/WMBermanTracking.h
+++ b/src/modules/bermanTracking/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;

--- a/src/modules/calculateGFA/WMCalculateGFA.cpp
+++ b/src/modules/calculateGFA/WMCalculateGFA.cpp
@@ -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"

--- a/src/modules/calculateGFA/WMCalculateGFA.h
+++ b/src/modules/calculateGFA/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