~ubuntu-branches/ubuntu/vivid/openwalnut/vivid

« back to all changes in this revision

Viewing changes to src/modules/fiberSelection/WMFiberSelection.cpp

Committer: Package Import Robot
Author(s): Dmitrijs Ledkovs
Date: 2013-05-24 03:12:03 UTC
Revision ID: package-import@ubuntu.com-20130524031203-l5g1lzm1vd83fupi

Tags: 1.3.1+hg5849-1ubuntu1

Cherrypick boost1.53 pointer cast fixes.

files added:
.pc/boost153

.pc/boost153/src

.pc/boost153/src/core

.pc/boost153/src/core/common

.pc/boost153/src/core/common/WPropertyBase.cpp

.pc/boost153/src/core/common/WPropertyBase.h

.pc/boost153/src/core/common/WPropertyGroup.cpp

.pc/boost153/src/core/common/WPropertyList.h

.pc/boost153/src/core/common/WPropertyStruct.h

.pc/boost153/src/core/common/WPropertyVariable.h

.pc/boost153/src/core/dataHandler

.pc/boost153/src/core/dataHandler/WDataSetDTI.cpp

.pc/boost153/src/core/dataHandler/WDataSetFibers.cpp

.pc/boost153/src/core/dataHandler/WDataSetRawHARDI.h

.pc/boost153/src/core/dataHandler/WDataSetScalar.cpp

.pc/boost153/src/core/dataHandler/WDataSetScalar.h

.pc/boost153/src/core/dataHandler/WDataSetSegmentation.cpp

.pc/boost153/src/core/dataHandler/WDataSetSegmentation.h

.pc/boost153/src/core/dataHandler/WDataSetSingle.cpp

.pc/boost153/src/core/dataHandler/WDataSetSingle.h

.pc/boost153/src/core/dataHandler/WDataSetSphericalHarmonics.cpp

.pc/boost153/src/core/dataHandler/WDataSetTimeSeries.cpp

.pc/boost153/src/core/dataHandler/WDataSetTimeSeries.h

.pc/boost153/src/core/dataHandler/WDataSetVector.cpp

.pc/boost153/src/core/dataHandler/WDataSetVector.h

.pc/boost153/src/core/dataHandler/WDataTexture3D.cpp

.pc/boost153/src/core/dataHandler/WITKImageConversion.h

.pc/boost153/src/core/dataHandler/WThreadedPerVoxelOperation.h

.pc/boost153/src/core/dataHandler/WThreadedTrackingFunction.cpp

.pc/boost153/src/core/dataHandler/datastructures

.pc/boost153/src/core/dataHandler/datastructures/WJoinContourTree.cpp

.pc/boost153/src/core/dataHandler/test

.pc/boost153/src/core/dataHandler/test/WDataSetTimeSeries_test.h

.pc/boost153/src/core/dataHandler/test/WITKImageConversion_test.h

.pc/boost153/src/core/dataHandler/test/WThreadedPerVoxelOperation_test.h

.pc/boost153/src/core/dataHandler/test/WThreadedTrackingFunction_test.h

.pc/boost153/src/core/graphicsEngine

.pc/boost153/src/core/graphicsEngine/shaders

.pc/boost153/src/core/graphicsEngine/shaders/WGEShader.h

.pc/boost153/src/core/kernel

.pc/boost153/src/core/kernel/WBatchLoader.cpp

.pc/boost153/src/core/kernel/WModuleConnector.cpp

.pc/boost153/src/core/kernel/WModuleContainer.cpp

.pc/boost153/src/core/kernel/WModuleInputData.h

.pc/boost153/src/core/kernel/WModuleOutputData.h

.pc/boost153/src/core/kernel/combiner

.pc/boost153/src/core/kernel/combiner/WModuleProjectFileCombiner.cpp

.pc/boost153/src/core/kernel/test

.pc/boost153/src/core/kernel/test/WModuleConnector_test.h

.pc/boost153/src/modules

.pc/boost153/src/modules/HARDIToSphericalHarmonics

.pc/boost153/src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h

.pc/boost153/src/modules/anisotropicFiltering

.pc/boost153/src/modules/anisotropicFiltering/WMAnisotropicFiltering.cpp

.pc/boost153/src/modules/applyMask

.pc/boost153/src/modules/applyMask/WMApplyMask.cpp

.pc/boost153/src/modules/arbitraryROIs

.pc/boost153/src/modules/arbitraryROIs/WMArbitraryROIs.cpp

.pc/boost153/src/modules/atlasSurfaces

.pc/boost153/src/modules/atlasSurfaces/WCreateSurfaceJob.h

.pc/boost153/src/modules/atlasSurfaces/WMAtlasSurfaces.cpp

.pc/boost153/src/modules/bermanTracking

.pc/boost153/src/modules/bermanTracking/WMBermanTracking.cpp

.pc/boost153/src/modules/calculateGFA

.pc/boost153/src/modules/calculateGFA/WMCalculateGFA.cpp

.pc/boost153/src/modules/calculateTensors

.pc/boost153/src/modules/calculateTensors/WMCalculateTensors.cpp

.pc/boost153/src/modules/clusterDisplayVoxels

.pc/boost153/src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp

.pc/boost153/src/modules/clusterSlicer

.pc/boost153/src/modules/clusterSlicer/WMClusterSlicer.cpp

.pc/boost153/src/modules/coordinateSystem

.pc/boost153/src/modules/coordinateSystem/WMCoordinateSystem.cpp

.pc/boost153/src/modules/data

.pc/boost153/src/modules/data/WMData.cpp

.pc/boost153/src/modules/data/WMReadSphericalHarmonics.cpp

.pc/boost153/src/modules/data/WMWriteNIfTI.cpp

.pc/boost153/src/modules/dataTypeConversion

.pc/boost153/src/modules/dataTypeConversion/WMDataTypeConversion.cpp

.pc/boost153/src/modules/datasetManipulator

.pc/boost153/src/modules/datasetManipulator/WMDatasetManipulator.cpp

.pc/boost153/src/modules/datasetProfile

.pc/boost153/src/modules/datasetProfile/WMDatasetProfile.cpp

.pc/boost153/src/modules/deterministicFTMori

.pc/boost153/src/modules/deterministicFTMori/WMDeterministicFTMori.cpp

.pc/boost153/src/modules/directVolumeRendering

.pc/boost153/src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp

.pc/boost153/src/modules/distanceMap

.pc/boost153/src/modules/distanceMap/WMDistanceMap.cpp

.pc/boost153/src/modules/effectiveConnectivityCluster

.pc/boost153/src/modules/effectiveConnectivityCluster/WMEffectiveConnectivityCluster.cpp

.pc/boost153/src/modules/eigenSystem

.pc/boost153/src/modules/eigenSystem/WMEigenSystem.cpp

.pc/boost153/src/modules/fiberSelection

.pc/boost153/src/modules/fiberSelection/WMFiberSelection.cpp

.pc/boost153/src/modules/fiberStipples

.pc/boost153/src/modules/fiberStipples/WMFiberStipples.cpp

.pc/boost153/src/modules/fiberStipples/WSPSliceBuilder.cpp

.pc/boost153/src/modules/gaussFiltering

.pc/boost153/src/modules/gaussFiltering/WMGaussFiltering.cpp

.pc/boost153/src/modules/gridRenderer

.pc/boost153/src/modules/gridRenderer/WMGridRenderer.cpp

.pc/boost153/src/modules/imageExtractor

.pc/boost153/src/modules/imageExtractor/WMImageExtractor.cpp

.pc/boost153/src/modules/imageSpaceLIC

.pc/boost153/src/modules/imageSpaceLIC/WMImageSpaceLIC.cpp

.pc/boost153/src/modules/isosurface

.pc/boost153/src/modules/isosurface/WMIsosurface.cpp

.pc/boost153/src/modules/isosurfaceRaytracer

.pc/boost153/src/modules/isosurfaceRaytracer/WMIsosurfaceRaytracer.cpp

.pc/boost153/src/modules/openIGTLink

.pc/boost153/src/modules/openIGTLink/WIGTLinkRemote.cpp

.pc/boost153/src/modules/paintTexture

.pc/boost153/src/modules/paintTexture/WMPaintTexture.cpp

.pc/boost153/src/modules/scalarSegmentation

.pc/boost153/src/modules/scalarSegmentation/WSegmentationAlgoRegionGrowingConfidenceConnected.h

.pc/boost153/src/modules/spatialDerivative

.pc/boost153/src/modules/spatialDerivative/WMSpatialDerivative.cpp

.pc/boost153/src/modules/superquadricGlyphs

.pc/boost153/src/modules/superquadricGlyphs/WMSuperquadricGlyphs.cpp

.pc/boost153/src/modules/surfaceParameterAnimator

.pc/boost153/src/modules/surfaceParameterAnimator/WMSurfaceParameterAnimator.cpp

.pc/boost153/src/modules/teemGlyphs

.pc/boost153/src/modules/teemGlyphs/WMTeemGlyphs.cpp

.pc/boost153/src/modules/transferFunctionColorBar

.pc/boost153/src/modules/transferFunctionColorBar/WMTransferFunctionColorBar.cpp

.pc/boost153/src/modules/vectorAlign

.pc/boost153/src/modules/vectorAlign/WMVectorAlign.cpp

.pc/boost153/src/modules/vectorOperator

.pc/boost153/src/modules/vectorOperator/WMVectorOperator.cpp

.pc/boost153/src/modules/vectorPlot

.pc/boost153/src/modules/vectorPlot/WMVectorPlot.cpp

.pc/boost153/src/modules/vectorPlot/WMVectorPlot.h

.pc/boost153/src/modules/voxelizer

.pc/boost153/src/modules/voxelizer/WMVoxelizer.cpp

.pc/boost153/src/modules/webglSupport

.pc/boost153/src/modules/webglSupport/WMWebglSupport.cpp

.pc/boost153/src/qt4gui

.pc/boost153/src/qt4gui/WMainWindow.cpp

.pc/boost153/src/qt4gui/controlPanel

.pc/boost153/src/qt4gui/controlPanel/WQtControlPanel.cpp

.pc/boost153/src/qt4gui/networkEditor

.pc/boost153/src/qt4gui/networkEditor/WQtNetworkItem.cpp

debian/patches/boost153

debian/patches/series

files modified:
.pc/applied-patches

debian/changelog

debian/control

src/core/common/WPropertyBase.cpp

src/core/common/WPropertyBase.h

src/core/common/WPropertyGroup.cpp

src/core/common/WPropertyList.h

src/core/common/WPropertyStruct.h

src/core/common/WPropertyVariable.h

src/core/dataHandler/WDataSetDTI.cpp

src/core/dataHandler/WDataSetFibers.cpp

src/core/dataHandler/WDataSetRawHARDI.h

src/core/dataHandler/WDataSetScalar.cpp

src/core/dataHandler/WDataSetScalar.h

src/core/dataHandler/WDataSetSegmentation.cpp

src/core/dataHandler/WDataSetSegmentation.h

src/core/dataHandler/WDataSetSingle.cpp

src/core/dataHandler/WDataSetSingle.h

src/core/dataHandler/WDataSetSphericalHarmonics.cpp

src/core/dataHandler/WDataSetTimeSeries.cpp

src/core/dataHandler/WDataSetTimeSeries.h

src/core/dataHandler/WDataSetVector.cpp

src/core/dataHandler/WDataSetVector.h

src/core/dataHandler/WDataTexture3D.cpp

src/core/dataHandler/WITKImageConversion.h

src/core/dataHandler/WThreadedPerVoxelOperation.h

src/core/dataHandler/WThreadedTrackingFunction.cpp

src/core/dataHandler/datastructures/WJoinContourTree.cpp

src/core/dataHandler/test/WDataSetTimeSeries_test.h

src/core/dataHandler/test/WITKImageConversion_test.h

src/core/dataHandler/test/WThreadedPerVoxelOperation_test.h

src/core/dataHandler/test/WThreadedTrackingFunction_test.h

src/core/graphicsEngine/shaders/WGEShader.h

src/core/kernel/WBatchLoader.cpp

src/core/kernel/WModuleConnector.cpp

src/core/kernel/WModuleContainer.cpp

src/core/kernel/WModuleInputData.h

src/core/kernel/WModuleOutputData.h

src/core/kernel/combiner/WModuleProjectFileCombiner.cpp

src/core/kernel/test/WModuleConnector_test.h

src/modules/HARDIToSphericalHarmonics/WSphericalHarmonicsCoefficientsThread.h

src/modules/anisotropicFiltering/WMAnisotropicFiltering.cpp

src/modules/applyMask/WMApplyMask.cpp

src/modules/arbitraryROIs/WMArbitraryROIs.cpp

src/modules/atlasSurfaces/WCreateSurfaceJob.h

src/modules/atlasSurfaces/WMAtlasSurfaces.cpp

src/modules/bermanTracking/WMBermanTracking.cpp

src/modules/calculateGFA/WMCalculateGFA.cpp

src/modules/calculateTensors/WMCalculateTensors.cpp

src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp

src/modules/clusterSlicer/WMClusterSlicer.cpp

src/modules/coordinateSystem/WMCoordinateSystem.cpp

src/modules/data/WMData.cpp

src/modules/data/WMReadSphericalHarmonics.cpp

src/modules/data/WMWriteNIfTI.cpp

src/modules/dataTypeConversion/WMDataTypeConversion.cpp

src/modules/datasetManipulator/WMDatasetManipulator.cpp

src/modules/datasetProfile/WMDatasetProfile.cpp

src/modules/deterministicFTMori/WMDeterministicFTMori.cpp

src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp

src/modules/distanceMap/WMDistanceMap.cpp

src/modules/effectiveConnectivityCluster/WMEffectiveConnectivityCluster.cpp

src/modules/eigenSystem/WMEigenSystem.cpp

src/modules/fiberSelection/WMFiberSelection.cpp

src/modules/fiberStipples/WMFiberStipples.cpp

src/modules/fiberStipples/WSPSliceBuilder.cpp

src/modules/gaussFiltering/WMGaussFiltering.cpp

src/modules/gridRenderer/WMGridRenderer.cpp

src/modules/imageExtractor/WMImageExtractor.cpp

src/modules/imageSpaceLIC/WMImageSpaceLIC.cpp

src/modules/isosurface/WMIsosurface.cpp

src/modules/isosurfaceRaytracer/WMIsosurfaceRaytracer.cpp

src/modules/openIGTLink/WIGTLinkRemote.cpp

src/modules/paintTexture/WMPaintTexture.cpp

src/modules/scalarSegmentation/WSegmentationAlgoRegionGrowingConfidenceConnected.h

src/modules/spatialDerivative/WMSpatialDerivative.cpp

src/modules/superquadricGlyphs/WMSuperquadricGlyphs.cpp

src/modules/surfaceParameterAnimator/WMSurfaceParameterAnimator.cpp

src/modules/teemGlyphs/WMTeemGlyphs.cpp

src/modules/transferFunctionColorBar/WMTransferFunctionColorBar.cpp

src/modules/vectorAlign/WMVectorAlign.cpp

src/modules/vectorOperator/WMVectorOperator.cpp

src/modules/vectorPlot/WMVectorPlot.cpp

src/modules/vectorPlot/WMVectorPlot.h

src/modules/voxelizer/WMVoxelizer.cpp

src/modules/webglSupport/WMWebglSupport.cpp

src/qt4gui/WMainWindow.cpp

src/qt4gui/controlPanel/WQtControlPanel.cpp

src/qt4gui/networkEditor/WQtNetworkItem.cpp

Show diffs side-by-side

added added

removed removed

src/modules/fiberSelection/WMFiberSelection.cpp

232

233

// currently, both grids need to be the same

234

// the grid of voi1 and voi2 is needed here

235

boost::shared_ptr< WGridRegular3D > grid1 = boost::shared_dynamic_cast< WGridRegular3D >( m_voi1->getGrid() );

236

boost::shared_ptr< WGridRegular3D > grid2 = boost::shared_dynamic_cast< WGridRegular3D >( m_voi2->getGrid() );

235

boost::shared_ptr< WGridRegular3D > grid1 = boost::dynamic_pointer_cast< WGridRegular3D >( m_voi1->getGrid() );

236

boost::shared_ptr< WGridRegular3D > grid2 = boost::dynamic_pointer_cast< WGridRegular3D >( m_voi2->getGrid() );

237

238

// the list of fibers

239

std::vector< boost::tuple< size_t, size_t, size_t > > matches; // a match contains the fiber ID, the start vertex ID and the stop ID

Older »