COMP: Merge branch 'bug-15837-FinalCommit'
28cf73611da3
Actions

Description

COMP: Merge branch 'bug-15837-FinalCommit'

Details

Provenance

Authored on Aug 14 2013, 10:26 AM

Parents

rMITK2121251ca53e: Merge remote-tracking branch 'origin/bug-15837-update-ctk-for-moc-options'…
rMITKdf53a0387ae4: Merge branch 'bug-15837-QMocRun'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK28cf73611da3: COMP: Merge branch 'bug-15837-FinalCommit' (authored by kislinsk).Aug 14 2013, 10:26 AM

Merged Changes

2121251ca53e Merge remote-tracking branch 'origin/bug-15837-update-ctk-for-moc-options' into…
Author
kislinsk
Browse Repository
No Builds
No Audits
8290e4ebb215 Revert "COMP: Include boost header files only if Q_MOC_RUN isn't defined."
Author
kislinsk
Browse Repository
No Builds
No Audits
5061d812bfe3 Update CTK for MOC options support. Pass Boost defines to work-around MOC…
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (35)

Path

Size

Packages

BlueBerry/

CMake/

MacroCreateCTKPlugin.cmake

CMake/

mitkMacroCreateCTKPlugin.cmake

O1: MITK Reviewer Group I

CMakeExternals/

CTK.cmake

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

Connectomics/

Algorithms/

mitkConnectomicsBetweennessHistogram.cpp

mitkConnectomicsBetweennessHistogram.h

mitkConnectomicsHistogramBase.cpp

mitkConnectomicsShortestPathHistogram.cpp

IODataStructures/

mitkConnectomicsNetwork.cpp

mitkConnectomicsNetwork.h

DiffusionCore/

Algorithms/

Reconstruction/

itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

itkDwiPhantomGenerationFilter.cpp

itkFiniteDiffOdfMaximaExtractionFilter.cpp

itkOdfMaximaExtractionFilter.cpp

itkShCoefficientImageImporter.cpp

mitkDiffusionFunctionCollection.cpp

FiberTracking/

Algorithms/

itkAddArtifactsToDwiImageFilter.cpp

itkEvaluateDirectionImagesFilter.cpp

itkEvaluateTractogramDirectionsFilter.cpp

itkGibbsTrackingFilter.cpp

itkTractDensityImageFilter.cpp

itkTractsToDWIImageFilter.cpp

itkTractsToFiberEndingsImageFilter.cpp

itkTractsToRgbaImageFilter.cpp

itkTractsToVectorImageFilter.cpp

IODataStructures/

FiberBundleX/

mitkFiberBundleX.cpp

MiniApps/

FiberDirectionExtraction.cpp

FiberProcessing.cpp

GibbsTracking.cpp

PeakExtraction.cpp

TractogramAngularError.cpp

TractometerAngularErrorTool.cpp

Quantification/

IODataStructures/

TbssImages/

mitkNrrdTbssImageWriter.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberfoxView.cpp

QmitkQBallReconstructionView.cpp

QmitkTbssSkeletonizationView.cpp

rMITK28cf73611da3

View Options

BlueBerry/CMake/MacroCreateCTKPlugin.cmake

View Options

CMake/mitkMacroCreateCTKPlugin.cmake

View Options

CMakeExternals/CTK.cmake

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsBetweennessHistogram.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsBetweennessHistogram.h

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsHistogramBase.cpp

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsShortestPathHistogram.cpp

View Options

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.cpp

View Options

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.h

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiPhantomGenerationFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkOdfMaximaExtractionFilter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkShCoefficientImageImporter.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/mitkDiffusionFunctionCollection.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkAddArtifactsToDwiImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateDirectionImagesFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateTractogramDirectionsFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToFiberEndingsImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToRgbaImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberDirectionExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberProcessing.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/GibbsTracking.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/TractogramAngularError.cpp

View Options

Modules/DiffusionImaging/FiberTracking/MiniApps/TractometerAngularErrorTool.cpp

View Options

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp

COMP: Merge branch 'bug-15837-FinalCommit'28cf73611da3Actions

Description

Details

Event Timeline

Merged Changes

Changes (35)

rMITK28cf73611da3

BlueBerry/CMake/MacroCreateCTKPlugin.cmake

CMake/mitkMacroCreateCTKPlugin.cmake

CMakeExternals/CTK.cmake

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsBetweennessHistogram.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsBetweennessHistogram.h

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsHistogramBase.cpp

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsShortestPathHistogram.cpp

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.cpp

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetwork.h

Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkAnalyticalDiffusionQballReconstructionImageFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkDwiPhantomGenerationFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkFiniteDiffOdfMaximaExtractionFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkOdfMaximaExtractionFilter.cpp

Modules/DiffusionImaging/DiffusionCore/Algorithms/itkShCoefficientImageImporter.cpp

Modules/DiffusionImaging/DiffusionCore/mitkDiffusionFunctionCollection.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkAddArtifactsToDwiImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateDirectionImagesFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkEvaluateTractogramDirectionsFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkGibbsTrackingFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractDensityImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToDWIImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToFiberEndingsImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToRgbaImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkTractsToVectorImageFilter.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberDirectionExtraction.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/FiberProcessing.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/GibbsTracking.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/PeakExtraction.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/TractogramAngularError.cpp

Modules/DiffusionImaging/FiberTracking/MiniApps/TractometerAngularErrorTool.cpp

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssImageWriter.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberfoxView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp

COMP: Merge branch 'bug-15837-FinalCommit'
28cf73611da3
Actions