mitk
151b6529bb34
Actions

Description

Merge branch 'master' of https://phabricator.mitk.org/source/mitk

Details

Provenance

goetzm	Authored on Mar 27 2018, 3:34 PM
goetzm	Pushed on Apr 3 2018, 10:02 AM

Parents

rMITK9b2d303213bc: Merge branch 'master' of https://phabricator.mitk.org/source/mitk
rMITK1ae53b20b8f6: Merge branch 'T24046-LinuxBugfixes'

Branches

Unknown

Tags

Unknown

Event Timeline

goetzm committed rMITK151b6529bb34: Merge branch 'master' of https://phabricator.mitk.org/source/mitk (authored by goetzm).Mar 27 2018, 3:34 PM

Merged Changes

1ae53b20b8f6 Merge branch 'T24046-LinuxBugfixes'
Author
goetzm
Browse Repository
No Builds
No Audits
e00648497840 COMP: Bugfixes for advanced Linux compatibility
Author
goetzm
Browse Repository
No Builds
No Audits
834e430057da Merge branch 'T24525-update-tutorial-doc'
Author
• goch
Browse Repository
No Builds
No Audits
87299c260e61 Merge branch 'T24439-categorical-imperative'
Author
• goch
Browse Repository
No Builds
No Audits
c50bc521f39c Rename Data category and add several views to General
Author
• goch
Browse Repository
No Builds
No Audits
fa68e53680d3 Fixes T24525
Author
• goch
Browse Repository
No Builds
No Audits
baa32ee7f55f Merge branch 'T24363-updateImageCropperHelpPage'
Author
hentsch
Browse Repository
No Builds
No Audits
09cfdad74368 Removed typos and adapted help for current version
Author
hentsch
Browse Repository
No Builds
No Audits
0839afb7d0ce Resolved T24363 image cropper images in help match with current version
Author
hentsch
Browse Repository
No Builds
No Audits
e5b4379c0d65 Merge branch 'T24351-remove-reference-to-bat'
Author
• goch
Browse Repository
No Builds
No Audits
cff6f2d9f5a4 Remove references to batch files
Author
• goch
Browse Repository
No Builds
No Audits
797880879491 Fixed T19437
Author
floca
Browse Repository
No Builds
No Audits
beadf89434da Introduced config that realy is ClassicDICOMReader for 3DnT
Author
floca
Browse Repository
No Builds
No Audits
ce46cc872289 Adjusted configs to the new default value
Author
floca
Browse Repository
No Builds
No Audits
411aa7a5c82a Ensure that the DICOM configurator uses the same init values
Author
floca
Browse Repository
No Builds
No Audits
58f9dd336113 Corrected class documentation
Author
floca
Browse Repository
No Builds
No Audits
d9c28d58a960 Changed copy constructor to really copy
Author
floca
Browse Repository
No Builds
No Audits
0eeda0140165 Refactored query of boolean attributes (DICOM reader)
Author
floca
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

Packages

Documentation/

Doxygen/

3-DeveloperManual/

Starting/

GettingToKnow/

Tutorial/

SettingUpMITK/

Examples/

Tutorial/

Step6/

Step6RegionGrowing.txx

Modules/

DICOMReader/

files.cmake

include/

mitkDICOMITKSeriesGDCMReader.h

mitkDICOMReaderConfigurator.h

mitkDICOMTagBasedSorter.h

mitkThreeDnTDICOMSeriesReader.h

resource/

configurations/

3D/

classicreader.xml

imageposition.xml

imageposition_byacquisition.xml

imagetime.xml

instancenumber.xml

instancenumber_soft.xml

simpleinstancenumber_soft.xml

slicelocation.xml

3DnT/

classicreader.xml

	imageposition.xml
	classicreader.xml

imageposition_byacquisition.xml

imageposition_bytriggertime.xml

src/

mitkDICOMITKSeriesGDCMReader.cpp

mitkDICOMReaderConfigurator.cpp

mitkDICOMTagBasedSorter.cpp

mitkThreeDnTDICOMSeriesReader.cpp

DICOMReaderServices/

include/

mitkClassicDICOMSeriesReaderService.h

Plugins/

org.blueberry.ui.qt.log/

plugin.xml

O1: MITK Reviewer Group I

org.mitk.gui.qt.datamanager/

plugin.xml

O1: MITK Reviewer Group I

org.mitk.gui.qt.diffusionimaging/

plugin.xml

org.mitk.gui.qt.imagecropper/

documentation/

UserManual/

Advanced_ImageCropperView.png

O3: MITK Reviewer Group II

Basic_ImageCropperView.png

O3: MITK Reviewer Group II

QmitkImageCropper.dox

O3: MITK Reviewer Group II

org.mitk.gui.qt.moviemaker/

plugin.xml

O3: MITK Reviewer Group II

org.mitk.gui.qt.pointsetinteraction/

plugin.xml

O3: MITK Reviewer Group II

org.mitk.gui.qt.properties/

plugin.xml

O1: MITK Reviewer Group I

org.mitk.gui.qt.remeshing/

plugin.xml

O3: MITK Reviewer Group II

org.mitk.gui.qt.volumevisualization/

plugin.xml

O3: MITK Reviewer Group II

org.mitk.gui.qt.xnat/

plugin.xml

O3: MITK Reviewer Group II

Wrapping/

Common/

mitk_swig_macros.i

Python/

CMakeLists.txt

mitkNumpyArrayConversion.cxx

rMITK151b6529bb34

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step01.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step06.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step07.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step08.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/HowToNewProject.dox

View Options

Examples/Tutorial/Step6/Step6RegionGrowing.txx

View Options

Modules/DICOMReader/files.cmake

View Options

Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h

View Options

Modules/DICOMReader/include/mitkDICOMReaderConfigurator.h

View Options

Modules/DICOMReader/include/mitkDICOMTagBasedSorter.h

View Options

Modules/DICOMReader/include/mitkThreeDnTDICOMSeriesReader.h

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Modules/DICOMReader/resource/configurations/3D/instancenumber_soft.xml

View Options

Modules/DICOMReader/resource/configurations/3D/simpleinstancenumber_soft.xml

View Options

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

View Options

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

View Options

Modules/DICOMReader/resource/configurations/3DnT/imageposition.xml

View Options

Modules/DICOMReader/resource/configurations/3DnT/imageposition_byacquisition.xml

View Options

Modules/DICOMReader/resource/configurations/3DnT/imageposition_bytriggertime.xml

View Options

Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp

View Options

Modules/DICOMReader/src/mitkDICOMReaderConfigurator.cpp

View Options

Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp

View Options

Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

View Options

Modules/DICOMReaderServices/include/mitkClassicDICOMSeriesReaderService.h

View Options

Plugins/org.blueberry.ui.qt.log/plugin.xml

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Advanced_ImageCropperView.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Basic_ImageCropperView.png

View Options

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper.dox

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Wrapping/Common/mitk_swig_macros.i

View Options

Wrapping/Python/CMakeLists.txt

View Options

Wrapping/Python/mitkNumpyArrayConversion.cxx

Merge branch 'master' of https://phabricator.mitk.org/source/mitk151b6529bb34Actions

Description

Details

Event Timeline

Merged Changes

Changes (43)

rMITK151b6529bb34

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step01.dox

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step06.dox

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step07.dox

Documentation/Doxygen/3-DeveloperManual/Starting/GettingToKnow/Tutorial/Step08.dox

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/HowToNewProject.dox

Examples/Tutorial/Step6/Step6RegionGrowing.txx

Modules/DICOMReader/files.cmake

Modules/DICOMReader/include/mitkDICOMITKSeriesGDCMReader.h

Modules/DICOMReader/include/mitkDICOMReaderConfigurator.h

Modules/DICOMReader/include/mitkDICOMTagBasedSorter.h

Modules/DICOMReader/include/mitkThreeDnTDICOMSeriesReader.h

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

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

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

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

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

Modules/DICOMReader/resource/configurations/3D/instancenumber_soft.xml

Modules/DICOMReader/resource/configurations/3D/simpleinstancenumber_soft.xml

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

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

Modules/DICOMReader/resource/configurations/3DnT/imageposition.xml

Modules/DICOMReader/resource/configurations/3DnT/imageposition_byacquisition.xml

Modules/DICOMReader/resource/configurations/3DnT/imageposition_bytriggertime.xml

Modules/DICOMReader/src/mitkDICOMITKSeriesGDCMReader.cpp

Modules/DICOMReader/src/mitkDICOMReaderConfigurator.cpp

Modules/DICOMReader/src/mitkDICOMTagBasedSorter.cpp

Modules/DICOMReader/src/mitkThreeDnTDICOMSeriesReader.cpp

Modules/DICOMReaderServices/include/mitkClassicDICOMSeriesReaderService.h

Plugins/org.blueberry.ui.qt.log/plugin.xml

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

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

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Advanced_ImageCropperView.png

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/Basic_ImageCropperView.png

Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropper.dox

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

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

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

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

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

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

Wrapping/Common/mitk_swig_macros.i

Wrapping/Python/CMakeLists.txt

Wrapping/Python/mitkNumpyArrayConversion.cxx

Merge branch 'master' of https://phabricator.mitk.org/source/mitk
151b6529bb34
Actions