Merge branch 'master' into niftk
Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Merge branch 'master' into niftk 917d31e6fcfcUnpublished
Tags None Referenced Files None Subscribers None Unpublished Commit · Learn MoreNot On Permanent Ref: This commit is not an ancestor of any permanent ref.
Description Merge branch 'master' into niftk Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (645)
rMITK917d31e6fcfc Core/Code/CppMicroServices/test/modules/libRWithResources/resources/icons/compressable.bmpLoading... Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.cppLoading... Modules/DiffusionImaging/DiffusionCore/Algorithms/Reconstruction/itkDiffusionMultiShellQballReconstructionImageFilter.hLoading... Modules/DiffusionImaging/DiffusionCore/DicomImport/mitkSiemensMosaicDicomDiffusionImageHeaderReader.cppLoading... Modules/DiffusionImaging/FiberTracking/Algorithms/GibbsTracking/mitkSphereInterpolator.cppLoading... Modules/SceneSerializationBase/BasePropertySerializer/mitkEnumerationSubclassesSerializer.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDwiSoftwarePhantomViewUserManual.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dwisoftwarephantomsview.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkAstrosticksModelParametersWidgetControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkZeppelinModelParametersWidgetControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionViewControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.htmlLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/10asoftwarephantoms.pngLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppFiberTractographyPerspective.cppLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/Perspectives/QmitkDIAppSyntheticDataGenerationPerspective.cppLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatistics.doxLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsCalculationThread.cppLoading... Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.uiLoading... Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cppLoading... Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.cppLoading... Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.cppLoading... |