HomePhabricator
Diffusion MITK 4d8006f166ea

Merge remote-tracking branch 'origin/bug-16744-integration-master' into bug…
4d8006f166ea
Actions

Description

Merge remote-tracking branch 'origin/bug-16744-integration-master' into bug-16744-dcm-refactor-integration-2014-03

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h
Core/Code/Testing/DICOMTesting/CMakeLists.txt
Examples/Plugins/org.mitk.example.gui.opencv/CMakeLists.txt
Modules/CMakeLists.txt

Details

Provenance
• heringAuthored on Apr 23 2014, 2:36 PM
Parents
rMITKc8eb8c72e367: Merge remote-tracking branch 'origin/bug-16744-develop' into bug-16744…
rMITKeb025ddf02d2: MITK 2014.03.00 version update
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Changes (138)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSizePackages
Core/
Code/
DataManagement/
IO/
Rendering/
Testing/
DCMTesting/
DICOMTesting/
DumpDCMMitkImage.cpp
DumpDICOMMitkImage.cpp
Testing/
mitkDCMPreloadedVolumeTest.cpp
mitkDICOMPreloadedVolumeTest.cpp
mitkDCMTestingSanityTest.cpp
mitkDICOMTestingSanityTest.cpp
VerifyDCMMitkImageDump.cpp
VerifyDICOMMitkImageDump.cpp
mitkTestDCMLoading.cpp
mitkTestDICOMLoading.cpp
mitkTestDCMLoading.h
mitkTestDICOMLoading.h
TestingHelper/
Documentation/
Doxygen/
Concepts/
images/
Examples/
Modules/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
ImageStatistics/
Testing/
O1: MITK Reviewer Group I
O1: MITK Reviewer Group I
Modules/
DICOMReader/
Documentation/
Core/
Documentation/
Doxygen/
images/
images/
Modules/
DICOMTesting/
Core/
Code/
Testing/
DICOMTesting/
O3: MITK Reviewer Group II
Testing/
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II
O3: MITK Reviewer Group II

rMITK4d8006f166ea

View Options

Core/Code/DataManagement/mitkLevelWindow.cpp

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Testing/CMakeLists.txt

View Options

Core/Code/Testing/DCMTesting/CMakeLists.txt

View Options

Core/Code/Testing/DCMTesting/DumpDCMMitkImage.cpp

View Options

Core/Code/Testing/DCMTesting/Testing/CMakeLists.txt

View Options

Core/Code/Testing/DCMTesting/Testing/files.cmake

View Options

Core/Code/Testing/DCMTesting/Testing/mitkDCMPreloadedVolumeTest.cpp

View Options

Core/Code/Testing/DCMTesting/Testing/mitkDCMTestingSanityTest.cpp

View Options

Core/Code/Testing/DCMTesting/VerifyDCMMitkImageDump.cpp

View Options

Core/Code/Testing/DCMTesting/files.cmake

View Options

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.cpp

View Options

Core/Code/Testing/DCMTesting/mitkTestDCMLoading.h

View Options

Core/Code/Testing/DICOMTesting

View Options

Core/Code/Testing/DICOMTesting/CMakeLists.txt

View Options

Core/Code/Testing/DICOMTesting/DumpDICOMMitkImage.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing

View Options

Core/Code/Testing/DICOMTesting/Testing/CMakeLists.txt

View Options

Core/Code/Testing/DICOMTesting/Testing/files.cmake

View Options

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

View Options

Core/Code/Testing/DICOMTesting/VerifyDICOMMitkImageDump.cpp

View Options

Core/Code/Testing/DICOMTesting/files.cmake

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Core/Code/Testing/mitkLevelWindowTest.cpp

View Options

Core/Code/TestingHelper/mitkTestingMacros.h

View Options

Core/Documentation/Doxygen/Concepts/DICOMTesting.dox

View Options

Core/Documentation/images/tilt-correction.jpg

View Options

Examples/CMakeLists.txt

View Options

Examples/mitkdump/CMakeLists.txt

View Options

Examples/mitkdump/files.cmake

View Options

Examples/mitkdump/mitkdump.cpp

View Options

Examples/mitkdumpdir/CMakeLists.txt

View Options

Examples/mitkdumpdir/files.cmake

View Options

Examples/mitkdumpdir/mitkdumpdir.cpp

View Options

Modules/CMakeLists.txt

View Options

Modules/DICOMReader/CMakeLists.txt

View Options

Modules/DICOMReader/Documentation/Doxygen/Modules.dox

View Options

Modules/DICOMReader/Documentation/Doxygen/tilt-correction.jpg

View Options

Modules/DICOMReader/Documentation/images/implementeditkseriesgdcmreader.jpg

View Options

Modules/DICOMReader/Documentation/images/tilt-correction.jpg

View Options

Modules/DICOMReader/Resources/configurations/3D/classicreader.xml

View Options

Modules/DICOMReader/Resources/configurations/3D/imageposition.xml

View Options

Modules/DICOMReader/Resources/configurations/3D/imageposition_byacquisition.xml

View Options

Modules/DICOMReader/Resources/configurations/3D/imagetime.xml

View Options

Modules/DICOMReader/Resources/configurations/3D/instancenumber.xml

View Options

Modules/DICOMReader/Resources/configurations/3D/slicelocation.xml

View Options

Modules/DICOMReader/Resources/configurations/3DnT/classicreader.xml

View Options

Modules/DICOMReader/TODOs.txt

View Options

Modules/DICOMReader/Testing/CMakeLists.txt

View Options

Modules/DICOMReader/Testing/files.cmake

View Options

Modules/DICOMReader/Testing/mitkDICOMFileReaderTest.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMFileReaderTestHelper.h

View Options

Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMFilenameSorter.h

View Options

Modules/DICOMReader/Testing/mitkDICOMITKSeriesGDCMReaderBasicsTest.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.cpp

View Options

Modules/DICOMReader/Testing/mitkDICOMNullFileReader.h

View Options

Modules/DICOMReader/Testing/mitkDICOMReaderConfiguratorTest.cpp

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/mitkClassicDICOMSeriesReader.h

View Options

Modules/DICOMReader/mitkDICOMDatasetAccess.h

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMDatasetSorter.h

View Options

Modules/DICOMReader/mitkDICOMEnums.cpp

View Options

Modules/DICOMReader/mitkDICOMEnums.h

View Options

Modules/DICOMReader/mitkDICOMFileReader.cpp

View Options

Modules/DICOMReader/mitkDICOMFileReader.h

View Options

Modules/DICOMReader/mitkDICOMFileReaderSelector.cpp

View Options

Modules/DICOMReader/mitkDICOMFileReaderSelector.h

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMGDCMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMGDCMTagScanner.cpp

View Options

Modules/DICOMReader/mitkDICOMGDCMTagScanner.h

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.cpp

View Options

Modules/DICOMReader/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.cpp

View Options

Modules/DICOMReader/mitkDICOMImageBlockDescriptor.h

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.cpp

View Options

Modules/DICOMReader/mitkDICOMImageFrameInfo.h

View Options

Modules/DICOMReader/mitkDICOMReaderConfigurator.cpp

View Options

Modules/DICOMReader/mitkDICOMReaderConfigurator.h

View Options

Modules/DICOMReader/mitkDICOMSortByTag.cpp

View Options

Modules/DICOMReader/mitkDICOMSortByTag.h

View Options

Modules/DICOMReader/mitkDICOMSortCriterion.cpp

View Options

Modules/DICOMReader/mitkDICOMSortCriterion.h

View Options

Modules/DICOMReader/mitkDICOMTag.cpp

View Options

Modules/DICOMReader/mitkDICOMTag.h

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.cpp

View Options

Modules/DICOMReader/mitkDICOMTagBasedSorter.h

View Options

Modules/DICOMReader/mitkDICOMTagCache.cpp

View Options

Modules/DICOMReader/mitkDICOMTagCache.h

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.cpp

View Options

Modules/DICOMReader/mitkEquiDistantBlocksSorter.h

View Options

Modules/DICOMReader/mitkGantryTiltInformation.cpp

View Options

Modules/DICOMReader/mitkGantryTiltInformation.h

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.cpp

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.h

View Options

Modules/DICOMReader/mitkITKDICOMSeriesReaderHelper.txx

View Options

Modules/DICOMReader/mitkNormalDirectionConsistencySorter.cpp

View Options

Modules/DICOMReader/mitkNormalDirectionConsistencySorter.h

View Options

Modules/DICOMReader/mitkSortByImagePositionPatient.cpp

View Options

Modules/DICOMReader/mitkSortByImagePositionPatient.h

View Options

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.cpp

View Options

Modules/DICOMReader/mitkThreeDnTDICOMSeriesReader.h

View Options

Modules/DICOMTesting/CMakeLists.txt

View Options

Modules/DICOMTesting/DumpDICOMMitkImage.cpp

View Options

Modules/DICOMTesting/Testing/CMakeLists.txt

View Options

Modules/DICOMTesting/Testing/files.cmake

View Options

Modules/DICOMTesting/Testing/mitkDICOMLocaleTest.cpp

View Options

Modules/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

View Options

Modules/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

View Options

Modules/DICOMTesting/VerifyDICOMMitkImageDump.cpp

View Options

Modules/DICOMTesting/files.cmake

View Options

Modules/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Modules/DICOMTesting/mitkTestDICOMLoading.h

View Options

Modules/ImageStatistics/Testing/CMakeLists.txt

View Options

Modules/ImageStatistics/Testing/mitkImageStatisticsCalculatorTest.cpp

MITK · MIC · IMSY · DKFZ