Merge branch 'bug-18289-integration-branch'
0a9ed04d097c
Actions

Description

Merge branch 'bug-18289-integration-branch'

Details

Provenance

Authored on Feb 1 2016, 3:39 PM

Parents

rMITK898eeea08945: Merge branch 'bug-18289-Replace-old-DICOMSeriesReader-2' into bug-18289…
rMITK8e0b85d1315e: Merge branch 'bug-11477-Integration-HandednessAwarePlaneGeometry'

Branches

Unknown

Tags

Unknown

Event Timeline

floca committed rMITK0a9ed04d097c: Merge branch 'bug-18289-integration-branch' (authored by floca).Feb 1 2016, 3:39 PM

Merged Changes

898eeea08945 Merge branch 'bug-18289-Replace-old-DICOMSeriesReader-2' into bug-18289…
Author
floca
Browse Repository
No Builds
No Audits
596baa2d8811 fixed linux gcc error
Author
floca
Browse Repository
No Builds
No Audits
6bbb6d5fe5b9 added ClassicDICOMSeriesReader as explicit service
Author
floca
Browse Repository
No Builds
No Audits
e17151928b48 fixed type
Author
floca
Browse Repository
No Builds
No Audits
4a0ed2f3b0c0 activated auto load
Author
floca
Browse Repository
No Builds
No Audits
12386c1cbab3 - first draft for DICOMReader module integration as IO service
Author
floca
Browse Repository
No Builds
No Audits

Changes (17)

Path

Size

Packages

Modules/

Core/

src/

IO/

mitkDicomSeriesReaderService.cpp

O1: MITK Reviewer Group I

mitkAutoSelectingDICOMReaderService.h

mitkBaseDICOMReaderService.h

mitkClassicDICOMSeriesReaderService.h

mitkDICOMFilesHelper.h

src

mitkAutoSelectingDICOMReaderService.cpp

mitkBaseDICOMReaderService.cpp

mitkClassicDICOMSeriesReaderService.cpp

mitkDICOMFilesHelper.cpp

	DICOMReaderServices/	src/
	IOExt/	Internal/

	mitkDICOMReaderServicesActivator.h
	mitkIOExtActivator.h

ModuleList.cmake

	Modules/	DICOMReaderServices/	src/	mitkDICOMReaderServicesActivator.cpp/
	Plugins/	org.mitk.gui.qt.imagenavigator/	src/	internal/


	mitkImageNavigatorPluginActivator.cpp

rMITK0a9ed04d097c

View Options

Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp

View Options

Modules/DICOMReaderServices/CMakeLists.txt

View Options

Modules/DICOMReaderServices/files.cmake

View Options

Modules/DICOMReaderServices/include/mitkAutoSelectingDICOMReaderService.h

View Options

Modules/DICOMReaderServices/include/mitkBaseDICOMReaderService.h

View Options

Modules/DICOMReaderServices/include/mitkClassicDICOMSeriesReaderService.h

View Options

Modules/DICOMReaderServices/include/mitkDICOMFilesHelper.h

View Options

Modules/DICOMReaderServices/src/mitkAutoSelectingDICOMReaderService.cpp

View Options

Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

View Options

Modules/DICOMReaderServices/src/mitkClassicDICOMSeriesReaderService.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMFilesHelper.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.cpp

View Options

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.h

View Options

Merge branch 'bug-18289-integration-branch'0a9ed04d097cActions

Description

Details

Event Timeline

Merged Changes

Changes (17)

rMITK0a9ed04d097c

Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp

Modules/DICOMReaderServices/CMakeLists.txt

Modules/DICOMReaderServices/files.cmake

Modules/DICOMReaderServices/include/mitkAutoSelectingDICOMReaderService.h

Modules/DICOMReaderServices/include/mitkBaseDICOMReaderService.h

Modules/DICOMReaderServices/include/mitkClassicDICOMSeriesReaderService.h

Modules/DICOMReaderServices/include/mitkDICOMFilesHelper.h

Modules/DICOMReaderServices/src/mitkAutoSelectingDICOMReaderService.cpp

Modules/DICOMReaderServices/src/mitkBaseDICOMReaderService.cpp

Modules/DICOMReaderServices/src/mitkClassicDICOMSeriesReaderService.cpp

Modules/DICOMReaderServices/src/mitkDICOMFilesHelper.cpp

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.cpp

Modules/DICOMReaderServices/src/mitkDICOMReaderServicesActivator.h

Modules/ModuleList.cmake

Merge branch 'bug-18289-integration-branch'
0a9ed04d097c
Actions