Merge branch 'master' into bug-14866-RemoveLegacyIODependencies
Conflicts:
Modules/PlanarFigure/CMakeLists.txt
Merge branch 'master' into bug-14866-RemoveLegacyIODependencies
Tags None Referenced Files None Subscribers None
Description Merge branch 'master' into bug-14866-RemoveLegacyIODependencies Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (538)
rMITK2923634300a1 BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryPluginActivator.cppLoading... BlueBerry/Bundles/org.blueberry.ui.qt.objectinspector/src/internal/berryQtObjectTableModel.cppLoading... Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/org_mitk_example_gui_customviewer_views_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.customviewer/src/internal/org_mitk_example_gui_customviewer_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.extensionpointcontribution/src/internal/org_mitk_example_gui_extensionpointcontribution_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.extensionpointdefinition/src/internal/org_mitk_example_gui_extensionpointdefinition_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.minimalapplication/src/internal/org_mitk_example_gui_minimalapplication_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.multipleperspectives/src/internal/org_mitk_example_gui_multipleperspectives_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/org_mitk_example_gui_regiongrowing_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.selectionservicemitk.views/src/internal/org_mitk_example_gui_selectionservicemitk_views_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.selectionservicemitk/src/internal/org_mitk_example_gui_selectionservicemitk_Activator.hLoading... Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.cppLoading... Examples/Plugins/org.mitk.example.gui.selectionserviceqt/src/internal/org_mitk_example_gui_selectionserviceqt_Activator.hLoading... Modules/SceneSerializationBase/BasePropertySerializer/mitkTransferFunctionPropertySerializer.cppLoading... Plugins/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.cppLoading... Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cppLoading... Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.cppLoading... Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.hLoading... Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/org_mitk_gui_qt_cmdlinemodules_Activator.cppLoading... Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/org_mitk_gui_qt_cmdlinemodules_Activator.hLoading... Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.cppLoading... Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.hLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/PreprocessingGUI_1.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/PreprocessingGUI_2.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/PreprocessingGUI_3.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/PreprocessingGUI_4.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingPreprocessingPage.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingRegistration.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingVisualization.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfDetailsViewUserManual.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/prepro1.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs1.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs2.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs3.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/residuals.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor1.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor4.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/visualization3.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkDiffusionImagingQuantificationPage.doxLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/ScalarIndicesGUI.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/quantification.pngLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.uiLoading... Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.cppLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/UserManual/QmitkDiffusionImagingAppUserManual.doxLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.cppLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionApplicationPlugin.hLoading... Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cppLoading... Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_qt_eventrecorder_Activator.cppLoading... Plugins/org.mitk.gui.qt.eventrecorder/src/internal/org_mitk_gui_qt_eventrecorder_Activator.hLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-pause.svgLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-start.svgLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-playback-stop.svgLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-seek-backward.svgLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/media-skip-backward.svgLoading... Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/categories/applications-multimedia.svgLoading... Plugins/org.mitk.gui.qt.extapplication/src/internal/perspectives/QmitkExtDefaultPerspective.cppLoading... Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_ControlArea.pngLoading... Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_MovieMakerView.pngLoading... Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_Preferences.pngLoading... Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMaker_ScreenshotMakerInterface.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_CylinderGood.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_Gradation10Percent.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_NoBoundaryFixing10Percent.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_OriginalMesh.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_RemeshingView.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemashing_Subsampling20percent.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_CylinderGood.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_Gradation10Percent.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_NoBoundaryFixing10Percent.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_OriginalMesh.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_RemeshingView.pngLoading... Plugins/org.mitk.gui.qt.remeshing/documentation/UserManual/QmitkRemeshing_Subsampling20percent.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkClippingPlane_Overview2.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationPreferences.tiffLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities.doxLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities_IMGBooleanOperations.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities_IMGImageMasking.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities_IMGMorphologicalOperators.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities_IMGSurfaceToImage.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationUtilities_Overview.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DFMTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DOtsuTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DRGTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DThresholdTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DTools.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DULThresholdTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_3DWatershedTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMG2DFastMarchingUsage.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGApplication.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGDataManagerContextMenu.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconAddSubtract.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconCorrection.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconErase.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconFill.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconLiveWire.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconPaintWipe.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGIconRegionGrowing.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGPreferences.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_IMGSelection.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_PickingTool.pngLoading... Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentation_ToolOverview.pngLoading... Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cppLoading... Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cppLoading... Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.hLoading... Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.cppLoading... Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.hLoading... Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.uiLoading... |