Merge branch 'T23835-MasterIntegration'
d136261f4e37
Actions

Description

Merge branch 'T23835-MasterIntegration'

Details

Provenance

kislinsk	Authored on Dec 7 2017, 11:37 AM
kislinsk	Pushed on Dec 7 2017, 11:37 AM

Parents

rMITKb26d03fdb4d4: Switch dicom editor loading to be mitkIOUtil based
rMITK22f3f3b6016b: Merge branch 'T23886-IVIM'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKd136261f4e37: Merge branch 'T23835-MasterIntegration' (authored by kislinsk).Dec 7 2017, 11:37 AM

Merged Changes

b26d03fdb4d4 Switch dicom editor loading to be mitkIOUtil based
Author
• goch
Browse Repository
No Builds
No Audits
5ace9f63e462 Change SVGs in documentation to PNGs
Author
kislinsk
Browse Repository
No Builds
No Audits
007e3642110b Increase autoselect dicom reader ranking to make it default
Author
• goch
Browse Repository
No Builds
No Audits
7883ad93981a Change segmentation icons
Author
kislinsk
Browse Repository
No Builds
No Audits
23f394e86a21 Change DICOM icon
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

Packages

Modules/

Core/

src/

IO/

mitkIOMimeTypes.cpp

O1: MITK Reviewer Group I

DICOMReader/

include/

mitkBaseDICOMReaderService.h

src/

mitkBaseDICOMReaderService.cpp

DICOMReaderServices/

src/

mitkAutoSelectingDICOMReaderService.cpp

Plugins/

org.mitk.gui.qt.dicom/

resources/

dicom.svg

src/

internal/

DicomEventHandler.cpp

	org.mitk.gui.qt.ext/	resources/
	org.mitk.gui.qt.dicom/	resources/

dicom.svg

O1: MITK Reviewer Group I

org.mitk.gui.qt.ext/

resources/

org_mitk_gui_qt_ext.qrc

O1: MITK Reviewer Group I

org.mitk.gui.qt.multilabelsegmentation/

resources/

multilabelsegmentation.svg

multilabelsegmentation_utilities.svg

org.mitk.gui.qt.remeshing/

documentation/

UserManual/

QmitkRemeshing.dox

O3: MITK Reviewer Group II

QmitkRemeshing_Icon.png

O3: MITK Reviewer Group II

RemeshingIcon.png

O3: MITK Reviewer Group II

org.mitk.gui.qt.segmentation/

plugin.xml

O1: MITK Reviewer Group I

resources/

segmentation.svg

O1: MITK Reviewer Group I

segmentation_utilities.svg

O1: MITK Reviewer Group I

org.mitk.gui.qt.viewnavigator/

documentation/

UserManual/

QmitkViewNavigator.dox

O3: MITK Reviewer Group II

view-manager.png

O3: MITK Reviewer Group II

view-manager_48.png

O3: MITK Reviewer Group II

rMITKd136261f4e37

View Options

Modules/Core/src/IO/mitkIOMimeTypes.cpp

View Options

Modules/DICOMReader/include/mitkBaseDICOMReaderService.h

View Options

Modules/DICOMReader/src/mitkBaseDICOMReaderService.cpp

View Options

Modules/DICOMReaderServices/src/mitkAutoSelectingDICOMReaderService.cpp

View Options

Plugins/org.mitk.gui.qt.dicom/resources/dicom.svg

View Options

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

View Options

Plugins/org.mitk.gui.qt.ext/resources/dicom.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.svg

View Options

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation_utilities.svg

View Options

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing.dox

View Options

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_Icon.png

View Options

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/RemeshingIcon.png

View Options

Plugins/org.mitk.gui.qt.segmentation/plugin.xml

View Options

Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.svg

View Options

Plugins/org.mitk.gui.qt.segmentation/resources/segmentation_utilities.svg

View Options

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/QmitkViewNavigator.dox

View Options

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/view-manager.png

View Options

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/view-manager_48.png

Merge branch 'T23835-MasterIntegration'd136261f4e37Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rMITKd136261f4e37

Modules/Core/src/IO/mitkIOMimeTypes.cpp

Modules/DICOMReader/include/mitkBaseDICOMReaderService.h

Modules/DICOMReader/src/mitkBaseDICOMReaderService.cpp

Modules/DICOMReaderServices/src/mitkAutoSelectingDICOMReaderService.cpp

Plugins/org.mitk.gui.qt.dicom/resources/dicom.svg

Plugins/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp

Plugins/org.mitk.gui.qt.ext/resources/dicom.svg

Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation.svg

Plugins/org.mitk.gui.qt.multilabelsegmentation/resources/multilabelsegmentation_utilities.svg

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing.dox

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_Icon.png

Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/RemeshingIcon.png

Plugins/org.mitk.gui.qt.segmentation/plugin.xml

Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.svg

Plugins/org.mitk.gui.qt.segmentation/resources/segmentation_utilities.svg

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/QmitkViewNavigator.dox

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/view-manager.png

Plugins/org.mitk.gui.qt.viewnavigator/documentation/UserManual/view-manager_48.png

Merge branch 'T23835-MasterIntegration'
d136261f4e37
Actions