Commit 654c6b1f authored by Mathias Goldau's avatar Mathias Goldau

[CHANGE] Renamed all icons of modules to the patter given in our coding standard.

parent 622b27da
......@@ -36,7 +36,7 @@
#include "../../common/WAssert.h"
#include "../../kernel/WKernel.h"
#include "WMApplyMask.h"
#include "apply_mask.xpm"
#include "WMApplyMask.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMApplyMask )
......
......@@ -40,7 +40,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "WMArbitraryPlane.h"
#include "arbitraryPlane.xpm"
#include "WMArbitraryPlane.xpm"
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
W_LOADABLE_MODULE( WMArbitraryPlane )
......
......@@ -43,7 +43,7 @@
#include "../../graphicsEngine/algorithms/WMarchingCubesAlgorithm.h"
#include "WMArbitraryRois.h"
#include "arbitraryROI.xpm"
#include "WMArbitraryRois.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMArbitraryRois )
......
......@@ -43,7 +43,7 @@
#include "../../kernel/WKernel.h"
#include "WMAtlasSurfaces.h"
#include "atlas.xpm"
#include "WMAtlasSurfaces.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMAtlasSurfaces )
......
......@@ -34,7 +34,7 @@
#include "../../dataHandler/WDataHandler.h"
#include "../../dataHandler/WDataTexture3D.h"
#include "../../kernel/WKernel.h"
#include "bermanTracking.xpm"
#include "WMBermanTracking.xpm"
#include "WMBermanTracking.h"
// This line is needed by the module loader to actually find your module. Do not remove. Do NOT add a ";" here.
......
......@@ -43,7 +43,7 @@
#include "../../common/math/WVector3D.h"
#include "../../kernel/modules/data/WMData.h"
#include "WMBoundingBox.h"
#include "boundingbox.xpm"
#include "WMBoundingBox.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMBoundingBox )
......
......@@ -42,7 +42,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "clusterDisplay.xpm" // Please put a real icon here.
#include "WMClusterDisplay.xpm" // Please put a real icon here.
#include "WMClusterDisplay.h"
......
......@@ -28,7 +28,7 @@
#include "../../common/WColor.h"
#include "../../kernel/WKernel.h"
#include "WMClusterParamDisplay.h"
#include "clusterParamDisplay.xpm"
#include "WMClusterParamDisplay.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMClusterParamDisplay )
......
......@@ -48,7 +48,7 @@
#include "../../graphicsEngine/WTriangleMesh2.h"
#include "../../kernel/WKernel.h"
#include "WMClusterSlicer.h"
#include "clusterSlicer.xpm"
#include "WMClusterSlicer.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMClusterSlicer )
......
......@@ -35,7 +35,7 @@
#include "../../dataHandler/datastructures/WJoinContourTree.h"
#include "../../kernel/WKernel.h"
#include "WMContourTree.h"
#include "contourTree.xpm"
#include "WMContourTree.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMContourTree )
......
......@@ -40,7 +40,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "WMCoordinateHUD.h"
#include "coordinateHUD.xpm"
#include "WMCoordinateHUD.xpm"
#include "option_1.xpm"
#include "option_2.xpm"
#include "option_3.xpm"
......
......@@ -40,7 +40,7 @@
#include "../../kernel/WKernel.h"
#include "WTalairachConverter.h"
#include "coordinateSystem.xpm"
#include "WMCoordinateSystem.xpm"
#include "WMCoordinateSystem.h"
......
......@@ -39,7 +39,7 @@
#include "../../common/math/WPosition.h"
#include "../../common/math/WVector3D.h"
#include "WMDataTypeConversion.h"
#include "datatypeconversion.xpm"
#include "WMDataTypeConversion.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMDataTypeConversion )
......
......@@ -50,7 +50,7 @@
#include "../../dataHandler/WSubject.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "detTractClustering.xpm"
#include "WMDetTractClustering.xpm"
#include "WMDetTractClustering.h"
// This line is needed by the module loader to actually find your module.
......@@ -271,7 +271,9 @@ void WMDetTractClustering::cluster()
if( !m_dLtTableExists )
{
boost::shared_ptr< SimilarityMatrixComputation > threadInstance( new SimilarityMatrixComputation( m_dLtTable, m_tracts, proximity_t * proximity_t, m_shutdownFlag ) );
boost::shared_ptr< SimilarityMatrixComputation > threadInstance( new SimilarityMatrixComputation( m_dLtTable,
m_tracts, proximity_t * proximity_t,
m_shutdownFlag ) );
WThreadedFunction< SimilarityMatrixComputation > threadPool( 2, threadInstance );
threadPool.run();
threadPool.wait();
......@@ -446,7 +448,7 @@ WMDetTractClustering::SimilarityMatrixComputation::SimilarityMatrixComputation(
{
}
void WMDetTractClustering::SimilarityMatrixComputation::operator()( size_t id, size_t numThreads, WBoolFlag& b )
void WMDetTractClustering::SimilarityMatrixComputation::operator()( size_t id, size_t numThreads, WBoolFlag& b ) // NOLINT const ref
{
wlog::debug( "WMDetTractClustering::SimilarityMatrixComputation" ) << "Thread: " << id << " starting its work";
( void ) b; // NOLINT for removing the warning about unused variables
......
......@@ -39,7 +39,7 @@
#include "../../dataHandler/WDataSetFiberVector.h"
#include "../../dataHandler/WSubject.h"
#include "../../kernel/WKernel.h"
#include "detTractCulling.xpm"
#include "WMDetTractCulling.xpm"
#include "WMDetTractCulling.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -35,7 +35,7 @@
#include "../../common/math/WLinearAlgebraFunctions.h"
#include "WMDeterministicFTMori.h"
#include "moriTracking.xpm"
#include "WMDeterministicFTMori.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMDeterministicFTMori )
......
......@@ -28,7 +28,7 @@
#include <vector>
#include "WMDistanceMap.h"
#include "distancemap.xpm"
#include "WMDistanceMap.xpm"
#include "../../kernel/WKernel.h"
#include "../../kernel/WModuleFactory.h"
......
......@@ -28,7 +28,7 @@
#include <vector>
#include "WMDistanceMapIsosurface.h"
#include "distancemapIsosurface.xpm"
#include "WMDistanceMapIsosurface.xpm"
#include "../../kernel/WKernel.h"
#include "../../kernel/WModuleFactory.h"
......
......@@ -46,7 +46,7 @@
#include "WMEEGView.h"
#include "WPanTransformCallback.h"
#include "WScaleTransformCallback.h"
#include "eeg.xpm"
#include "WMEEGView.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMEEGView )
......
......@@ -57,7 +57,7 @@
#include "../../graphicsEngine/WGELabel.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "effectiveConnectivityCluster.xpm"
#include "WMEffectiveConnectivityCluster.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMEffectiveConnectivityCluster )
......
......@@ -80,7 +80,7 @@ void WSimpleResampler::resample( boost::shared_ptr< const std::vector< double >
}
// upto this point it may occur that the remaining length ( of the last new segment ) is smaller than the newSegmentLength
// so we add simply the last point of the old tract
if( std::abs( remainingLength ) > 0.001 ) // In case there is much of the length left but smaller than the new segment length, the last segment should be placed anyway...
if( std::abs( remainingLength ) > 0.001 )
{
( *newVerts )[j ] = next[0];
( *newVerts )[j + 1] = next[1];
......
......@@ -80,6 +80,15 @@ public:
const size_t newStartIdx ) const;
protected:
/**
* Accumulates all line segment lengths of a certain tract.
*
* \param verts Vertex array of all tracts
* \param startIdx Idx where the specific tract starts
* \param length How many vertices are used.
*
* \return The sum of all line segement lengths
*/
double lineIntegration( boost::shared_ptr< const std::vector< double > > verts,
const size_t startIdx,
const size_t length ) const;
......
......@@ -38,7 +38,7 @@
#include "../../common/WColor.h"
#include "WMFiberSelection.h"
#include "fiberSelection.xpm"
#include "WMFiberSelection.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMFiberSelection )
......
......@@ -27,7 +27,7 @@
#include "../../common/WPropertyHelper.h"
#include "../../dataHandler/io/WWriterFiberVTK.h"
#include "WMFiberTransform.h"
#include "fiberTransform.xpm"
#include "WMFiberTransform.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMFiberTransform )
......
......@@ -37,7 +37,7 @@
#include "../../common/WStringUtils.h"
#include "../../dataHandler/WGridRegular3D.h"
#include "../../kernel/WKernel.h"
#include "gaussfiltering.xpm"
#include "WMGaussFiltering.xpm"
#include "WMGaussFiltering.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -24,7 +24,7 @@
#include <string>
#include "gridRenderer.xpm"
#include "WMGridRenderer.xpm"
#include "../../kernel/WKernel.h"
#include "WMGridRenderer.h"
......
......@@ -32,7 +32,7 @@
#include "../../kernel/WKernel.h"
#include "WMHud.h"
#include "hud.xpm"
#include "WMHud.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMHud )
......
......@@ -31,7 +31,7 @@
#include "../../dataHandler/WDataTexture3D.h"
#include "../../common/WPropertyHelper.h"
#include "imageExtractor.xpm"
#include "WMImageExtractor.xpm"
#include "WMImageExtractor.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -40,7 +40,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/WShader.h"
#include "../../kernel/WKernel.h"
#include "isosurfaceraytracer.xpm"
#include "WMIsosurfaceRaytracer.xpm"
#include "WMIsosurfaceRaytracer.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -35,7 +35,7 @@
#include "../../kernel/WKernel.h"
#include "fibernavigator/SurfaceLIC.h"
#include "WMLIC.h"
#include "lic.xpm"
#include "WMLIC.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMLIC )
......
......@@ -36,7 +36,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "../../kernel/WKernel.h"
#include "WMLineGuidedSlice.h"
#include "lineGuidedSlice.xpm"
#include "WMLineGuidedSlice.xpm"
W_LOADABLE_MODULE( WMLineGuidedSlice )
......
......@@ -28,7 +28,7 @@
#include <vector>
#include <limits>
#include "iso_surface.xpm"
#include "WMMarchingCubes.xpm"
#include "../../common/WLimits.h"
#include "../../common/WAssert.h"
......
......@@ -31,7 +31,7 @@
#include "../../graphicsEngine/WTriangleMesh2.h"
#include "WMMeshReader.h"
#include "meshreader.xpm"
#include "WMMeshReader.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMMeshReader )
......
......@@ -34,7 +34,7 @@
#include "../../graphicsEngine/WROIArbitrary.h"
#include "../../kernel/WKernel.h"
#include "paintTexture.xpm" // Please put a real icon here.
#include "WMPaintTexture.xpm" // Please put a real icon here.
#include "WMPaintTexture.h"
......
......@@ -28,7 +28,7 @@
#include <boost/lexical_cast.hpp>
#include "../../dataHandler/WDataSetScalar.h"
#include "probtractdisplay.xpm"
#include "WMProbTractDisplay.xpm"
#include "WMProbTractDisplay.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -30,7 +30,7 @@
#include "../../common/WColor.h"
#include "../../common/WPropertyHelper.h"
#include "scalarSegmentation.xpm"
#include "WMScalarSegmentation.xpm"
#include "WMScalarSegmentation.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -29,7 +29,7 @@
#include <cmath>
#include "spline_surface.xpm"
#include "WMSplineSurface.xpm"
#include "../../common/WLimits.h"
#include "../../common/WAssert.h"
......
......@@ -38,7 +38,7 @@
#include "../../graphicsEngine/WGEPropertyUniform.h"
#include "WMSuperquadricGlyphs.h"
#include "superquadricglyphs.xpm"
#include "WMSuperquadricGlyphs.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMSuperquadricGlyphs )
......
......@@ -42,7 +42,7 @@
#include "../../graphicsEngine/callbacks/WGEShaderAnimationCallback.h"
#include "WMSurfaceParameterAnimator.h"
#include "surfaceParameterAnimator.xpm"
#include "WMSurfaceParameterAnimator.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMSurfaceParameterAnimator )
......
......@@ -35,7 +35,7 @@
#include "../../common/WThreadedFunction.h"
#include "../../common/WConditionOneShot.h"
#include "../../kernel/WKernel.h"
#include "teemGlyphs.xpm"
#include "WMTeemGlyphs.xpm"
#include "WMTeemGlyphs.h"
......
......@@ -64,7 +64,7 @@
#include "../../common/WPropertyHelper.h"
#include "../../graphicsEngine/WGEUtils.h"
#include "template.xpm"
#include "WMTemplate.xpm"
#include "icons/bier.xpm"
#include "icons/wurst.xpm"
#include "icons/steak.xpm"
......
......@@ -32,7 +32,7 @@
#include "../../graphicsEngine/WGEUtils.h"
#include "../../graphicsEngine/WTriangleMesh2.h"
#include "../../kernel/WKernel.h"
#include "trianglemeshrenderer.xpm"
#include "WMTriangleMeshRenderer.xpm"
#include "WMTriangleMeshRenderer.h"
// This line is needed by the module loader to actually find your module.
......
......@@ -36,7 +36,7 @@
#include "../../common/WColor.h"
#include "WMVectorPlot.h"
#include "vectorplot.xpm"
#include "WMVectorPlot.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMVectorPlot )
......
......@@ -50,7 +50,7 @@
#include "WRasterAlgorithm.h"
#include "WIntegrationParameterization.h"
#include "WCenterlineParameterization.h"
#include "voxelizer.xpm"
#include "WMVoxelizer.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMVoxelizer )
......
......@@ -28,7 +28,7 @@
#include "../../dataHandler/io/WWriterFiberVTK.h"
#include "../../kernel/WKernel.h"
#include "WMWriteTracts.h"
#include "writeTracts.xpm"
#include "WMWriteTracts.xpm"
// This line is needed by the module loader to actually find your module.
W_LOADABLE_MODULE( WMWriteTracts )
......
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