Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D' into bug-17209…
dee2c59dc492
Actions

Description

Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D' into bug-17209-RemoveTimeBoundsFromGeometry3D-V2

Conflicts:
Core/Code/IO/mitkImageWriter.cpp
Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp
Modules/QtWidgetsExt/QmitkSliceWidget.cpp

Details

Provenance

goetzm

Authored on Apr 30 2014, 1:55 PM

Parents

rMITK7f715177297a: Fixed Time interval for images with only one time step
rMITK6dbf5119788c: Merge branch 'bug-17757-DumpDicomsMiniApp'

Branches

Unknown

Tags

Unknown

Event Timeline

goetzm committed rMITKdee2c59dc492: Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D' into bug-17209… (authored by goetzm).Apr 30 2014, 1:55 PM

Merged Changes

7f715177297a Fixed Time interval for images with only one time step
Author
goetzm
Browse Repository
No Builds
No Audits
89891af9f696 Removed TimeBounds from Geometry3D
Author
goetzm
Browse Repository
No Builds
No Audits

Changes (32)

Path

Size

Core/

Code/

Controllers/

mitkSliceNavigationController.cpp

DataManagement/

mitkBaseData.cpp

mitkDataStorage.cpp

mitkDisplayGeometry.cpp

mitkDisplayGeometry.h

mitkGeometry3D.cpp

mitkGeometry3D.h

mitkImage.cpp

mitkProportionalTimeGeometry.cpp

mitkProportionalTimeGeometry.h

mitkSlicedGeometry3D.cpp

mitkSlicedGeometry3D.h

mitkTimeGeometry.h

IO/

mitkSurfaceVtkWriter.txx

Interactions/

mitkCoordinateSupplier.cpp

Rendering/

mitkPointSetGLMapper2D.cpp

mitkSurfaceGLMapper2D.cpp

Testing/

DICOMTesting/

mitkTestDICOMLoading.cpp

mitkDataStorageTest.cpp

mitkTextOverlay3DRendering2DTest.cpp

Modules/

Ext/

Algorithms/

mitkAngleCorrectByPointFilter.cpp

mitkCylindricToCartesianFilter.cpp

mitkProbeFilter.cpp

IO/

mitkUnstructuredGridVtkWriter.txx

IOExt/

Internal/

mitkUnstructuredGridVtkWriter.txx

ImageExtraction/

mitkExtractDirectedPlaneImageFilter.cpp

mitkExtractDirectedPlaneImageFilterNew.cpp

IpPicSupport/

Testing/

mitkPicFileReaderTest.cpp

mitkPicHelper.cpp

IpPicSupportIO/

Internal/

mitkPicHelper.cpp

MapperExt/

mitkMeshMapper2D.cpp

mitkVectorImageMapper2D.cpp

rMITKdee2c59dc492

View Options

Core/Code/Controllers/mitkSliceNavigationController.cpp

View Options

Core/Code/DataManagement/mitkBaseData.cpp

View Options

Core/Code/DataManagement/mitkDataStorage.cpp

View Options

Core/Code/DataManagement/mitkDisplayGeometry.cpp

View Options

Core/Code/DataManagement/mitkDisplayGeometry.h

View Options

Core/Code/DataManagement/mitkGeometry3D.cpp

View Options

Core/Code/DataManagement/mitkGeometry3D.h

View Options

Core/Code/DataManagement/mitkImage.cpp

View Options

Core/Code/DataManagement/mitkProportionalTimeGeometry.cpp

View Options

Core/Code/DataManagement/mitkProportionalTimeGeometry.h

View Options

Core/Code/DataManagement/mitkSlicedGeometry3D.cpp

View Options

Core/Code/DataManagement/mitkSlicedGeometry3D.h

View Options

Core/Code/DataManagement/mitkTimeGeometry.h

View Options

Core/Code/IO/mitkSurfaceVtkWriter.txx

View Options

Core/Code/Interactions/mitkCoordinateSupplier.cpp

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

View Options

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

View Options

Core/Code/Testing/mitkDataStorageTest.cpp

View Options

Core/Code/Testing/mitkTextOverlay3DRendering2DTest.cpp

View Options

Modules/Ext/Algorithms/mitkAngleCorrectByPointFilter.cpp

View Options

Modules/Ext/Algorithms/mitkCylindricToCartesianFilter.cpp

View Options

Modules/Ext/Algorithms/mitkProbeFilter.cpp

View Options

Modules/Ext/IO/mitkUnstructuredGridVtkWriter.txx

View Options

Modules/IOExt/Internal/mitkUnstructuredGridVtkWriter.txx

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp

View Options

Modules/IpPicSupport/Testing/mitkPicFileReaderTest.cpp

View Options

Modules/IpPicSupport/mitkPicHelper.cpp

View Options

Modules/IpPicSupportIO/Internal/mitkPicHelper.cpp

View Options

Modules/MapperExt/mitkMeshMapper2D.cpp

View Options

Modules/MapperExt/mitkVectorImageMapper2D.cpp

Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D' into bug-17209…dee2c59dc492Actions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rMITKdee2c59dc492

Core/Code/Controllers/mitkSliceNavigationController.cpp

Core/Code/DataManagement/mitkBaseData.cpp

Core/Code/DataManagement/mitkDataStorage.cpp

Core/Code/DataManagement/mitkDisplayGeometry.cpp

Core/Code/DataManagement/mitkDisplayGeometry.h

Core/Code/DataManagement/mitkGeometry3D.cpp

Core/Code/DataManagement/mitkGeometry3D.h

Core/Code/DataManagement/mitkImage.cpp

Core/Code/DataManagement/mitkProportionalTimeGeometry.cpp

Core/Code/DataManagement/mitkProportionalTimeGeometry.h

Core/Code/DataManagement/mitkSlicedGeometry3D.cpp

Core/Code/DataManagement/mitkSlicedGeometry3D.h

Core/Code/DataManagement/mitkTimeGeometry.h

Core/Code/IO/mitkSurfaceVtkWriter.txx

Core/Code/Interactions/mitkCoordinateSupplier.cpp

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp

Core/Code/Testing/DICOMTesting/mitkTestDICOMLoading.cpp

Core/Code/Testing/mitkDataStorageTest.cpp

Core/Code/Testing/mitkTextOverlay3DRendering2DTest.cpp

Modules/Ext/Algorithms/mitkAngleCorrectByPointFilter.cpp

Modules/Ext/Algorithms/mitkCylindricToCartesianFilter.cpp

Modules/Ext/Algorithms/mitkProbeFilter.cpp

Modules/Ext/IO/mitkUnstructuredGridVtkWriter.txx

Modules/IOExt/Internal/mitkUnstructuredGridVtkWriter.txx

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp

Modules/IpPicSupport/Testing/mitkPicFileReaderTest.cpp

Modules/IpPicSupport/mitkPicHelper.cpp

Modules/IpPicSupportIO/Internal/mitkPicHelper.cpp

Modules/MapperExt/mitkMeshMapper2D.cpp

Modules/MapperExt/mitkVectorImageMapper2D.cpp

Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D' into bug-17209…
dee2c59dc492
Actions