Merge branch 'bug-16694-forwarddeclaration' into bug-16694-forwarddeclaration…
723e8557943d
Actions

Description

Merge branch 'bug-16694-forwarddeclaration' into bug-16694-forwarddeclaration-integration

Details

Provenance

Authored on Apr 9 2014, 4:21 PM

Parents

rMITK932233ee7044: forward declarations in diffusion and tutorials
rMITK16df7b384c53: Merge branch 'bug-17536-FixQmitkSelectableGLWidgetClassDeclaration2'

Branches

Unknown

Tags

Unknown

Event Timeline

• heime committed rMITK723e8557943d: Merge branch 'bug-16694-forwarddeclaration' into bug-16694-forwarddeclaration… (authored by • heime).Apr 9 2014, 4:21 PM

Merged Changes

932233ee7044 forward declarations in diffusion and tutorials
Author
• heime
Browse Repository
No Builds
No Audits
11cca687810a forward declaration of mitk Image in mitkDatanode
Author
• heime
Browse Repository
No Builds
No Audits

Changes (63)

Path

Size

Packages

Core/

Code/

Controllers/

mitkPlanePositionManager.h

mitkRenderingManager.cpp

mitkSliceNavigationController.cpp

DataManagement/

mitkLevelWindowManager.cpp

mitkNodePredicateDimension.cpp

IO/

mitkDicomSeriesReader.cpp

mitkDicomSeriesReader.h

mitkDicomSeriesReader.txx

Rendering/

mitkGeometry2DDataMapper2D.cpp

mitkGeometry2DDataMapper2D.h

mitkPointSetVtkMapper2D.cpp

mitkTextOverlay2D.cpp

mitkTextOverlay2D.h

Testing/

DICOMTesting/

DumpDICOMMitkImage.cpp

Testing/

mitkDICOMPreloadedVolumeTest.cpp

mitkDICOMTestingSanityTest.cpp

VerifyDICOMMitkImageDump.cpp

mitkTestDICOMLoading.cpp

mitkTestDICOMLoading.h

mitkDICOMLocaleTest.cpp

mitkDicomSeriesReaderTest.cpp

mitkImageVtkMapper2DSwivelTest.cpp

Examples/

Plugins/

org.mitk.example.gui.customviewer.views/

src/

internal/

DicomView.cpp

SimpleRenderWindowView.cpp

org.mitk.example.gui.regiongrowing/

src/

internal/

QmitkRegionGrowingView.h

Tutorial/

Step4/

Step4.cpp

Modules/

ContourModel/

IO/

mitkContourModelWriter.cpp

O3: MITK Reviewer Group II

mitkContourModelWriter.h

O3: MITK Reviewer Group II

Rendering/

mitkContourModelMapper2D.cpp

O3: MITK Reviewer Group II

PlanarFigure/

IO/

mitkPlanarFigureWriter.cpp

O1: MITK Reviewer Group I

Interactions/

mitkPlanarFigureInteractor.cpp

O1: MITK Reviewer Group I

Rendering/

mitkPlanarFigureVtkMapper3D.cpp

O1: MITK Reviewer Group I

Testing/

mitkViewportRenderingTest.cpp

O1: MITK Reviewer Group I

QtWidgetsExt/

QmitkBoundingObjectWidget.cpp

O3: MITK Reviewer Group II

QmitkSliceWidget.cpp

O3: MITK Reviewer Group II

QmitkSliceWidget.h

O3: MITK Reviewer Group II

SceneSerialization/

BaseDataSerializer/

mitkImageSerializer.cpp

O1: MITK Reviewer Group I

Segmentation/

Interactions/

mitkAutoSegmentationTool.cpp

O1: MITK Reviewer Group I

mitkAutoSegmentationTool.h

O1: MITK Reviewer Group I

mitkOtsuTool3D.cpp

O1: MITK Reviewer Group I

mitkOtsuTool3D.h

O1: MITK Reviewer Group I

mitkPickingTool.h

O1: MITK Reviewer Group I

mitkPixelManipulationTool.cpp

O1: MITK Reviewer Group I

mitkPixelManipulationTool.h

O1: MITK Reviewer Group I

mitkWatershedTool.cpp

O1: MITK Reviewer Group I

mitkWatershedTool.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.cmdlinemodules/

src/

internal/

QmitkCmdLineModuleGui.cpp

O3: MITK Reviewer Group II

QmitkUiLoader.cpp

O3: MITK Reviewer Group II

org.mitk.gui.qt.dicom/

src/

internal/

DicomEventHandler.cpp

org.mitk.gui.qt.diffusionimaging/

src/

internal/

QmitkDwiSoftwarePhantomView.h

QmitkFieldmapGeneratorView.cpp

QmitkTbssSkeletonizationView.cpp

QmitkTbssSkeletonizationView.h

org.mitk.gui.qt.imagenavigator/

src/

internal/

QmitkImageNavigatorView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.measurementtoolbox/

src/

internal/

QmitkMeasurementView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.segmentation/

src/

internal/

SegmentationUtilities/

ImageMasking/

QmitkImageMaskingWidget.cpp

O1: MITK Reviewer Group I

QmitkImageMaskingWidget.h

O1: MITK Reviewer Group I

SurfaceToImage/

QmitkSurfaceToImageWidget.cpp

O1: MITK Reviewer Group I

QmitkSurfaceToImageWidget.h

O1: MITK Reviewer Group I

rMITK723e8557943d

View Options

Core/Code/Controllers/mitkPlanePositionManager.h

View Options

Core/Code/Controllers/mitkRenderingManager.cpp

View Options

Core/Code/Controllers/mitkSliceNavigationController.cpp

View Options

Core/Code/DataManagement/mitkDataNode.cpp

View Options

Core/Code/DataManagement/mitkDataNode.h

View Options

Core/Code/DataManagement/mitkDataStorage.cpp

View Options

Core/Code/DataManagement/mitkLevelWindow.cpp

View Options

Core/Code/DataManagement/mitkLevelWindowManager.cpp

View Options

Core/Code/DataManagement/mitkNodePredicateDimension.cpp

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/IO/mitkDicomSeriesReader.h

View Options

Core/Code/IO/mitkDicomSeriesReader.txx

View Options

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

View Options

Core/Code/Rendering/mitkGeometry2DDataMapper2D.h

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkTextOverlay2D.cpp

View Options

Core/Code/Rendering/mitkTextOverlay2D.h

View Options

Core/Code/Testing/DICOMTesting/DumpDICOMMitkImage.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

View Options

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

View Options

Core/Code/Testing/DICOMTesting/VerifyDICOMMitkImageDump.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.h

View Options

Core/Code/Testing/mitkDICOMLocaleTest.cpp

View Options

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

View Options

Core/Code/Testing/mitkImageVtkMapper2DSwivelTest.cpp

View Options

Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/DicomView.cpp

View Options

Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/SimpleRenderWindowView.cpp

View Options

Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/QmitkRegionGrowingView.h

View Options

Examples/Tutorial/Step4/Step4.cpp

View Options

Modules/ContourModel/IO/mitkContourModelWriter.cpp

View Options

Modules/ContourModel/IO/mitkContourModelWriter.h

View Options

Modules/ContourModel/Rendering/mitkContourModelMapper2D.cpp

View Options

Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp

View Options

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

View Options

Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.cpp

View Options

Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp

View Options

Modules/QtWidgetsExt/QmitkBoundingObjectWidget.cpp

View Options

Modules/QtWidgetsExt/QmitkSliceWidget.cpp

View Options

Modules/QtWidgetsExt/QmitkSliceWidget.h

View Options

Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.cpp

View Options

Modules/Segmentation/Interactions/mitkAutoSegmentationTool.cpp

View Options

Modules/Segmentation/Interactions/mitkAutoSegmentationTool.h

View Options

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

View Options

Modules/Segmentation/Interactions/mitkOtsuTool3D.h

View Options

Modules/Segmentation/Interactions/mitkPickingTool.h

View Options

Modules/Segmentation/Interactions/mitkPixelManipulationTool.cpp

View Options

Modules/Segmentation/Interactions/mitkPixelManipulationTool.h

View Options

Modules/Segmentation/Interactions/mitkWatershedTool.cpp

View Options

Modules/Segmentation/Interactions/mitkWatershedTool.h

View Options

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkCmdLineModuleGui.cpp

View Options

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkUiLoader.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDwiSoftwarePhantomView.h

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h

View Options

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp

View Options

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

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.h

Merge branch 'bug-16694-forwarddeclaration' into bug-16694-forwarddeclaration…723e8557943dActions

Description

Details

Event Timeline

Merged Changes

Changes (63)

rMITK723e8557943d

Core/Code/Controllers/mitkPlanePositionManager.h

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Controllers/mitkSliceNavigationController.cpp

Core/Code/DataManagement/mitkDataNode.cpp

Core/Code/DataManagement/mitkDataNode.h

Core/Code/DataManagement/mitkDataStorage.cpp

Core/Code/DataManagement/mitkLevelWindow.cpp

Core/Code/DataManagement/mitkLevelWindowManager.cpp

Core/Code/DataManagement/mitkNodePredicateDimension.cpp

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/IO/mitkDicomSeriesReader.h

Core/Code/IO/mitkDicomSeriesReader.txx

Core/Code/Rendering/mitkGeometry2DDataMapper2D.cpp

Core/Code/Rendering/mitkGeometry2DDataMapper2D.h

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Core/Code/Rendering/mitkTextOverlay2D.cpp

Core/Code/Rendering/mitkTextOverlay2D.h

Core/Code/Testing/DICOMTesting/DumpDICOMMitkImage.cpp

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMPreloadedVolumeTest.cpp

Core/Code/Testing/DICOMTesting/Testing/mitkDICOMTestingSanityTest.cpp

Core/Code/Testing/DICOMTesting/VerifyDICOMMitkImageDump.cpp

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.h

Core/Code/Testing/mitkDICOMLocaleTest.cpp

Core/Code/Testing/mitkDicomSeriesReaderTest.cpp

Core/Code/Testing/mitkImageVtkMapper2DSwivelTest.cpp

Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/DicomView.cpp

Examples/Plugins/org.mitk.example.gui.customviewer.views/src/internal/SimpleRenderWindowView.cpp

Examples/Plugins/org.mitk.example.gui.regiongrowing/src/internal/QmitkRegionGrowingView.h

Examples/Tutorial/Step4/Step4.cpp

Modules/ContourModel/IO/mitkContourModelWriter.cpp

Modules/ContourModel/IO/mitkContourModelWriter.h

Modules/ContourModel/Rendering/mitkContourModelMapper2D.cpp

Modules/PlanarFigure/IO/mitkPlanarFigureWriter.cpp

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.cpp

Modules/PlanarFigure/Rendering/mitkPlanarFigureVtkMapper3D.cpp

Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp

Modules/QtWidgetsExt/QmitkBoundingObjectWidget.cpp

Modules/QtWidgetsExt/QmitkSliceWidget.cpp

Modules/QtWidgetsExt/QmitkSliceWidget.h

Modules/SceneSerialization/BaseDataSerializer/mitkImageSerializer.cpp

Modules/Segmentation/Interactions/mitkAutoSegmentationTool.cpp

Modules/Segmentation/Interactions/mitkAutoSegmentationTool.h

Modules/Segmentation/Interactions/mitkOtsuTool3D.cpp

Modules/Segmentation/Interactions/mitkOtsuTool3D.h

Modules/Segmentation/Interactions/mitkPickingTool.h

Modules/Segmentation/Interactions/mitkPixelManipulationTool.cpp

Modules/Segmentation/Interactions/mitkPixelManipulationTool.h

Modules/Segmentation/Interactions/mitkWatershedTool.cpp

Modules/Segmentation/Interactions/mitkWatershedTool.h

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkCmdLineModuleGui.cpp

Plugins/org.mitk.gui.qt.cmdlinemodules/src/internal/QmitkUiLoader.cpp

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDwiSoftwarePhantomView.h

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

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

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp

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

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/ImageMasking/QmitkImageMaskingWidget.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.cpp

Plugins/org.mitk.gui.qt.segmentation/src/internal/SegmentationUtilities/SurfaceToImage/QmitkSurfaceToImageWidget.h

Merge branch 'bug-16694-forwarddeclaration' into bug-16694-forwarddeclaration…
723e8557943d
Actions