Merge branch 'master' into niftk
f6bbb3c5f4baUnpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into niftk

Details

Provenance

clarkson	Authored on Jun 26 2012, 8:22 AM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITKd1879853b1b9: Merge branch 'MITK-bug-12303-trac-1584-change-QmitkStdMultiWidget-say-Axial…
rMITKc855dedda43b: Merge branch 'bug-12299-gcc-warning'

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITKf6bbb3c5f4ba: Merge branch 'master' into niftk (authored by clarkson).Jun 26 2012, 8:22 AM

Merged Changes

c855dedda43b Merge branch 'bug-12299-gcc-warning'
Author
maleike
Browse Repository
No Builds
No Audits
66e7ae957652 Avoid gcc warning in release mode
Author
maleike
Browse Repository
No Builds
No Audits
55282a417e41 Merge branch 'bug-5544-MultiShellReconstruction'
Author
• cordes
Browse Repository
No Builds
No Audits
1a8738bb9385 Merge branch 'bug-12152-extend-network-statistics-by-filters'
Author
• goch
Browse Repository
No Builds
No Audits
53292de065b1 Merge branch 'bug-12304-wrong-intersection-detection-for-3D-interpolation'
Author
• fetzer
Browse Repository
No Builds
No Audits
72eed2b50b3b Fixed bug in intersection detection
Author
• fetzer
Browse Repository
No Builds
No Audits
2a6c353fc91f cleanup and update SingleShellReconstruction
Author
• cordes
Browse Repository
No Builds
No Audits
f14087e43459 fix transformation factor
Author
• cordes
Browse Repository
No Builds
No Audits
972591201115 fix projection1 and lambda calculation
Author
• cordes
Browse Repository
No Builds
No Audits
e95ad39f2df1 verification (1)
Author
• cordes
Browse Repository
No Builds
No Audits
f28ac22f925b fix s0 normalization problem (2)
Author
• cordes
Browse Repository
No Builds
No Audits
fae42d0079a6 fix s0 normalization problem
Author
• cordes
Browse Repository
No Builds
No Audits
2bae3ba9b7e7 cleanup 2
Author
• cordes
Browse Repository
No Builds
No Audits
bdb757004934 cleanup
Author
• cordes
Browse Repository
No Builds
No Audits
f10f335cf5ea interpolation SH-Basis added
Author
• cordes
Browse Repository
No Builds
No Audits
9d2081180dba Added option to prune edges below a certain weight
Author
• goch
Browse Repository
No Builds
No Audits
d76fe9f82cd0 Added option to prune unconnected nodes
Author
• goch
Browse Repository
No Builds
No Audits
cea7b1dc1439 Added three more areas not to be included
Author
• goch
Browse Repository
No Builds
No Audits
c84cd6177d98 disabel q-ball mirroring
Author
• cordes
Browse Repository
No Builds
No Audits
22354a2b19f2 add interpolation criteria, resturcture filter
Author
• cordes
Browse Repository
No Builds
No Audits
f8d47cd5990b stpe to do : insert shell interpolation
Author
• cordes
Browse Repository
No Builds
No Audits
7f61fa46bc7b add interpolations decision
Author
• cordes
Browse Repository
No Builds
No Audits
9cdcca33cc41 refactor projection 2
Author
• cordes
Browse Repository
No Builds
No Audits
16b8efe95169 cleanup member relations
Author
• cordes
Browse Repository
No Builds
No Audits
ff91af19f163 Merge branch 'bug-11979-qballreconstructionview-adaption' into bug-5544…
Author
• cordes
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Packages

Core/

Code/

IO/

mitkDicomSeriesReader.cpp

Modules/

DiffusionImaging/

Algorithms/

Connectomics/

mitkConnectomicsNetworkCreator.cpp

mitkConnectomicsNetworkCreator.h

IODataStructures/

ConnectomicsNetwork/

mitkConnectomicsNetwork.cpp

mitkConnectomicsNetwork.h

Reconstruction/

itkDiffusionMultiShellQballReconstructionImageFilter.cpp

itkDiffusionMultiShellQballReconstructionImageFilter.h

Rendering/

mitkConnectomicsNetworkMapper3D.cpp

Segmentation/

Algorithms/

mitkReduceContourSetFilter.cpp

O1: MITK Reviewer Group I

Controllers/

mitkSurfaceInterpolationController.cpp

O1: MITK Reviewer Group I

mitkSurfaceInterpolationController.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

Connectomics/

QmitkBrainNetworkAnalysisView.cpp

QmitkBrainNetworkAnalysisView.h

QmitkBrainNetworkAnalysisViewControls.ui

rMITKf6bbb3c5f4ba

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.cpp

View Options

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.h

View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.cpp

View Options

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.h

View Options

Modules/DiffusionImaging/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cpp

View Options

Modules/DiffusionImaging/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.h

View Options

Modules/DiffusionImaging/Rendering/mitkConnectomicsNetworkMapper3D.cpp

View Options

Modules/Segmentation/Algorithms/mitkReduceContourSetFilter.cpp

View Options

Modules/Segmentation/Controllers/mitkSurfaceInterpolationController.cpp

View Options

Modules/Segmentation/Controllers/mitkSurfaceInterpolationController.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisView.h

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisViewControls.ui

Merge branch 'master' into niftkf6bbb3c5f4baUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITKf6bbb3c5f4ba

Core/Code/IO/mitkDicomSeriesReader.cpp

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.cpp

Modules/DiffusionImaging/Algorithms/Connectomics/mitkConnectomicsNetworkCreator.h

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.cpp

Modules/DiffusionImaging/IODataStructures/ConnectomicsNetwork/mitkConnectomicsNetwork.h

Modules/DiffusionImaging/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cpp

Modules/DiffusionImaging/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.h

Modules/DiffusionImaging/Rendering/mitkConnectomicsNetworkMapper3D.cpp

Modules/Segmentation/Algorithms/mitkReduceContourSetFilter.cpp

Modules/Segmentation/Controllers/mitkSurfaceInterpolationController.cpp

Modules/Segmentation/Controllers/mitkSurfaceInterpolationController.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisView.h

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/Connectomics/QmitkBrainNetworkAnalysisViewControls.ui

Merge branch 'master' into niftk
f6bbb3c5f4baUnpublished
Actions