Diffusion MITK 82f575df6ab7

Merge branch 'master' into bug-18250-MovieMaker
82f575df6ab7
Actions

Description

Merge branch 'master' into bug-18250-MovieMaker

Conflicts:
Plugins/org.mitk.gui.qt.ext/resources/org_mitk_icons.qrc

Details

Provenance

kislinsk

Authored on Nov 6 2014, 12:17 PM

Parents

rMITK86412883240b: WIP
rMITK37f1fc8a66e6: Merge branch 'bug-18392-add-missing-icon'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK82f575df6ab7: Merge branch 'master' into bug-18250-MovieMaker (authored by kislinsk).Nov 6 2014, 12:17 PM

Merged Changes

37f1fc8a66e6 Merge branch 'bug-18392-add-missing-icon'
Author
• goch
Browse Repository
No Builds
No Audits
6a53c02c6140 Added even more icons
Author
• goch
Browse Repository
No Builds
No Audits
e86ade273a0d Merge branch 'bug-17925-ClosingFreezeUSPlugin'
Author
franza
Browse Repository
No Builds
No Audits
dd00924f3fb6 COMP: added blank line to trigger Dart client because of random fail of test
Author
franza
Browse Repository
No Builds
No Audits
8639b9087a67 Merge branch 'bug-17925-ClosingFreezeUSPlugin'
Author
franza
Browse Repository
No Builds
No Audits
ac75b1341031 added a check if the objects are null before calling mitk::equal to avoid error…
Author
franza
Browse Repository
No Builds
No Audits
88591c23ae9c removed warning because this could also mean that there simply is no device
Author
franza
Browse Repository
No Builds
No Audits
fc3053a05bd3 now deactivating all US devices when closing the widget.
Author
franza
Browse Repository
No Builds
No Audits
f8e823067f69 added a feature to get all services which are shown in the widget
Author
franza
Browse Repository
No Builds
No Audits
b246ea4a3a35 Merge branch 'bug-17972-VolumeRenderingHistogram'
Author
neher
Browse Repository
No Builds
No Audits
44cd467e8a08 Merge branch 'bug-18233-PfcToImage'
Author
neher
Browse Repository
No Builds
No Audits
e470b675b48c Merge branch 'bug-17878-DisablingShaderMsg'
Author
• kilgus
Browse Repository
No Builds
No Audits
e429652a455b Merge branch 'bug-18388-ScreenshotMakerFix'
Author
• engelhsa
Browse Repository
No Builds
No Audits
3ecf6ada04d2 Removed disabling shader message.
Author
• kilgus
Browse Repository
No Builds
No Audits
cc5d11573524 Merge branch 'bug-18382-CrashPreventionInSurfaceInterpolationController'
Author
• kolbch
Browse Repository
No Builds
No Audits
eaf8ad5b277f Merge branch 'bug-18189-PointSet-Filename-Proposal'
Author
• engelhsa
Browse Repository
No Builds
No Audits
acbd46ed2e57 replace fix file name with data node name
Author
• engelhsa
Browse Repository
No Builds
No Audits
5f58c3280e64 Added missing render window update and fixed colors of crosshair
Author
• engelhsa
Browse Repository
No Builds
No Audits
61155e8c4202 Merge branch 'bug-18188-clippingplane-interactionbug'
Author
riecker
Browse Repository
No Builds
No Audits
cdfed9b24e91 Merge branch 'bug-18216-dicom-crash'
Author
• heime
Browse Repository
No Builds
No Audits
2522e6305873 changed typo in warning
Author
• heime
Browse Repository
No Builds
No Audits
d0050f9512c0 Merge branch 'bug-18339-checkPlane'
Author
• webechr
Browse Repository
No Builds
No Audits
28ca1de420e0 Merge branch 'bug-18384-AdaptingErrorMsgForRotatedPlanarFigures'
Author
• kilgus
Browse Repository
No Builds
No Audits
9c6d2703c750 Adapted error message for rotated planar figure statistics.
Author
• kilgus
Browse Repository
No Builds
No Audits
1521c4844df4 Merge branch 'bug-11072-ShowNameOfFeatureImageInStatisticsView'
Author
• knorr
Browse Repository
No Builds
No Audits
5f72856ed731 check if a click is on the initial plane, else reject this interaction.
Author
• webechr
Browse Repository
No Builds
No Audits
74692e1e76a0 Added Feature Image Name Above Mask Name. Therefor, we changed the Layout.
Author
• knorr
Browse Repository
No Builds
No Audits
d4353c69d513 supports char, uchar, short, ushort, int, uint, long, ulong, float and double…
Author
neher
Browse Repository
No Builds
No Audits
8d490e336a81 added warning
Author
• heime
Browse Repository
No Builds
No Audits
096cbbdeb802 check if m_SelectedSegmentation is there before contour is removed
Author
• kolbch
Browse Repository
No Builds
No Audits
a5c725b5b6ca Checking DICOM modality to prevent crash
Author
• heime
Browse Repository
No Builds
No Audits
a78babae1fe1 Merge branch 'bug-16328-Add_md5_check_for_tiny_xml_patch'
Author
• wirkert
Browse Repository
No Builds
No Audits
8093fc7b4b12 Deactivating the interaction buttons when creating a new clipping plane or…
Author
riecker
Browse Repository
No Builds
No Audits
3320c18a6497 Added check if tinyxml patch is applied to correct version of tinyxml (2.6.2)…
Author
• wirkert
Browse Repository
No Builds
No Audits
03738efb377d writing child pfs to image instead of diabling button for pfcs
Author
neher
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

Packages

CMakeExternals/

Patchtinyxml-2.6.2.cmake

O1: MITK Reviewer Group I

Core/

Code/

IO/

mitkDicomSeriesReader.cpp

Modules/

AlgorithmsExt/

mitkSimpleHistogram.cpp

IGT/

CMakeLists.txt

QtWidgets/

QmitkServiceListWidget.cpp

O3: MITK Reviewer Group II

QmitkServiceListWidget.h

O3: MITK Reviewer Group II

QtWidgetsExt/

QmitkPointListWidget.cpp

O3: MITK Reviewer Group II

Segmentation/

Interactions/

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.h

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkSurfaceInterpolationController.cpp

VtkShaders/

mitkVtkShaderRepository.cpp

Plugins/

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkFiberExtractionView.cpp

QmitkFiberProcessingView.cpp

org.mitk.gui.qt.ext/

resources/

icons/

awesome/

scalable/

	actions/
	status/

	go-down.svg
	dialog-question.svg

O1: MITK Reviewer Group I

	go-up.svg
	dialog-question.svg

O1: MITK Reviewer Group I

	view-list-details.svg
	dialog-question.svg

O1: MITK Reviewer Group I

	view-list-icons.svg
	dialog-question.svg

O1: MITK Reviewer Group I

actions/

view-refresh.svg

O1: MITK Reviewer Group I

tango/

scalable/

actions/

	go-bottom.svg
	go-up.svg

O1: MITK Reviewer Group I

	go-first.svg
	go-up.svg

O1: MITK Reviewer Group I

	go-last.svg
	go-up.svg

O1: MITK Reviewer Group I

	go-top.svg
	go-previous.svg

O1: MITK Reviewer Group I

view-list-details.svg

O1: MITK Reviewer Group I

view-list-icons.svg

O1: MITK Reviewer Group I

view-refresh.svg

O1: MITK Reviewer Group I

org_mitk_icons.qrc

O1: MITK Reviewer Group I

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsViewControls.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.moviemaker/

src/

internal/

QmitkScreenshotMaker.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.segmentation/

src/

internal/

QmitkDeformableClippingPlaneView.cpp

O1: MITK Reviewer Group I

QmitkDeformableClippingPlaneView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

rMITK82f575df6ab7

View Options

CMakeExternals/Patchtinyxml-2.6.2.cmake

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Modules/AlgorithmsExt/mitkSimpleHistogram.cpp

View Options

Modules/IGT/CMakeLists.txt

View Options

Modules/QtWidgets/QmitkServiceListWidget.cpp

View Options

Modules/QtWidgets/QmitkServiceListWidget.h

View Options

Modules/QtWidgetsExt/QmitkPointListWidget.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

View Options

Modules/VtkShaders/mitkVtkShaderRepository.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberExtractionView.cpp

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/go-down.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/go-up.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-list-details.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-list-icons.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-refresh.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-bottom.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-first.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-last.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-top.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-list-details.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-list-icons.svg

View Options

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-refresh.svg

View Options

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

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

View Options

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

View Options

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h

View Options

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Merge branch 'master' into bug-18250-MovieMaker82f575df6ab7Actions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rMITK82f575df6ab7

CMakeExternals/Patchtinyxml-2.6.2.cmake

Core/Code/IO/mitkDicomSeriesReader.cpp

Modules/AlgorithmsExt/mitkSimpleHistogram.cpp

Modules/IGT/CMakeLists.txt

Modules/QtWidgets/QmitkServiceListWidget.cpp

Modules/QtWidgets/QmitkServiceListWidget.h

Modules/QtWidgetsExt/QmitkPointListWidget.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.h

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Modules/VtkShaders/mitkVtkShaderRepository.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberExtractionView.cpp

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/go-down.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/go-up.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-list-details.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-list-icons.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/awesome/scalable/actions/view-refresh.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-bottom.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-first.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-last.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/go-top.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-list-details.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-list-icons.svg

Plugins/org.mitk.gui.qt.ext/resources/icons/tango/scalable/actions/view-refresh.svg

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

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui

Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Merge branch 'master' into bug-18250-MovieMaker
82f575df6ab7
Actions