Merge branch 'bug-15852-platformproject_scalartype_float_to_double' into bug…
0c1895a9674e
Actions

Description

Merge branch 'bug-15852-platformproject_scalartype_float_to_double' into bug-15852-u3-platformproject_scalartype_float_to_double

Conflicts:
Core/Code/Testing/files.cmake
Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Details

Provenance

• wirkert

Authored on Aug 26 2013, 5:22 PM

Parents

rMITK9d1a44fad4af: PlanePositionManagerTest was not correctly ported to new test system…
rMITKaba2e3242c34: Merge branch 'bug-15915-TrkFilesComp'

Branches

Unknown

Tags

Unknown

Event Timeline

• wirkert committed rMITK0c1895a9674e: Merge branch 'bug-15852-platformproject_scalartype_float_to_double' into bug… (authored by • wirkert).Aug 26 2013, 5:22 PM

Merged Changes

9d1a44fad4af PlanePositionManagerTest was not correctly ported to new test system, resulting…
Author
• wirkert
Browse Repository
No Builds
No Audits
132c36c36141 Merge commit 'a5caf1c4e80c50d7f6227130ba4c8ceb214f04c8' into bug-15852…
Author
• wirkert
Browse Repository
No Builds
No Audits
b4f6ae719e86 Merge commit '1ca9ed4430640e46dc647f64a5294803bacbd55d' into bug-15852…
Author
• wirkert
Browse Repository
No Builds
No Audits
a5caf1c4e80c index on bug-15852-platformproject_enable_easy_conversion_of_datatypes: eb07436…
Author
• wirkert
Browse Repository
No Builds
No Audits
eb07436a798c Lots of probably uncritical float -> ScalarType changes.
Author
• wirkert
Browse Repository
No Builds
No Audits
eadb94bb1072 Switched from itk::Point to mitk::Point in Contour. This might need a further…
Author
• wirkert
Browse Repository
No Builds
No Audits
e7b92ee2a1ed Merge branch 'personal/wirkert/platformProject' into bug-15852…
Author
• wirkert
Browse Repository
No Builds
No Audits
06e4ba9becee Began refactoring of mitkVector:
Author
• wirkert
Browse Repository
No Builds
No Audits
2b6a3d6df1b8 Added support for mitkPoint 2 POD conversion. Started work on vtk 2 mitk…
Author
• wirkert
Browse Repository
No Builds
No Audits
0e63bea07c13 Reverted one unnecessary change.
Author
• wirkert
Browse Repository
No Builds
No Audits
fb42840c8e9b Experimentally created mitk::Point class to see which adaptions are necessary…
Author
• wirkert
Browse Repository
No Builds
No Audits
27b65674c1b3 New tests added for vnl conversion + restructuring.
Author
• wirkert
Browse Repository
No Builds
No Audits
038e1a69a87c Restructurings in test organisation
Author
• wirkert
Browse Repository
No Builds
No Audits
1ca9ed443064 Scalartype from float to double and created some first tests for platformproject
Author
• wirkert
Browse Repository
No Builds
No Audits

Changes (45)

Path

Size

Packages

Core/

Code/

DataManagement/

itkVtkAbstractTransform.txx

IO/

mitkDicomSeriesReader.cpp

mitkDicomSeriesReader.h

mitkItkImageFileReader.cpp

Rendering/

mitkPointSetGLMapper2D.cpp

mitkPointSetVtkMapper2D.cpp

vtkMitkRectangleProp.cpp

Testing/

mitkBaseDataTest.cpp

mitkExtractSliceFilterTest.cpp

mitkPlanePositionManagerTest.cpp

mitkVectorTest.cpp

files.cmake

Modules/

CameraCalibration/

mitkCameraIntrinsics.cpp

mitkTransform.cpp

mitkTransform.h

DiffusionImaging/

Connectomics/

Algorithms/

mitkConnectomicsSyntheticNetworkGenerator.cpp

IODataStructures/

mitkConnectomicsNetworkReader.cpp

FiberTracking/

IODataStructures/

FiberBundleX/

mitkFiberBundleXReader.cpp

Quantification/

IODataStructures/

TbssImages/

mitkNrrdTbssRoiImageReader.cpp

mitkTbssImporter.cpp

IGT/

IGTFilters/

mitkCameraVisualization.h

mitkNavigationDataObjectVisualizationFilter.cpp

mitkNavigationDataPlayerBase.cpp

IGTTrackingDevices/

mitkInternalTrackingTool.cpp

MitkExt/

Rendering/

mitkMeshMapper2D.cpp

PlanarFigure/

DataManagement/

mitkPlanarCircle.cpp

O1: MITK Reviewer Group I

mitkPlanarEllipse.cpp

O1: MITK Reviewer Group I

IO/

mitkPlanarFigureReader.cpp

O1: MITK Reviewer Group I

SceneSerializationBase/

BasePropertySerializer/

mitkAnnotationPropertySerializer.cpp

O1: MITK Reviewer Group I

mitkClippingPropertySerializer.cpp

O1: MITK Reviewer Group I

mitkPoint3dPropertySerializer.cpp

O1: MITK Reviewer Group I

mitkPoint4dPropertySerializer.cpp

O1: MITK Reviewer Group I

mitkVector3DPropertySerializer.cpp

O1: MITK Reviewer Group I

Segmentation/

Algorithms/

mitkCalculateSegmentationVolume.cpp

O1: MITK Reviewer Group I

DataManagement/

mitkContour.cpp

O1: MITK Reviewer Group I

mitkContour.h

O1: MITK Reviewer Group I

mitkContourModel.cpp

O1: MITK Reviewer Group I

Rendering/

mitkContourModelGLMapper2D.cpp

O1: MITK Reviewer Group I

SurfaceInterpolation/

mitkSurfaceInterpolationController.cpp

rMITK0c1895a9674e

View Options

Core/Code/DataManagement/itkVtkAbstractTransform.txx

View Options

Core/Code/DataManagement/mitkImage.cpp

View Options

Core/Code/DataManagement/mitkPointSet.h

View Options

Core/Code/DataManagement/mitkSlicedData.cpp

View Options

Core/Code/DataManagement/mitkSlicedData.h

View Options

Core/Code/DataManagement/mitkVector.cpp

View Options

Core/Code/DataManagement/mitkVector.h

View Options

Core/Code/IO/mitkDicomSeriesReader.cpp

View Options

Core/Code/IO/mitkDicomSeriesReader.h

View Options

Core/Code/IO/mitkItkImageFileReader.cpp

View Options

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

View Options

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

View Options

Core/Code/Rendering/vtkMitkRectangleProp.cpp

View Options

Core/Code/Testing/mitkBaseDataTest.cpp

View Options

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

View Options

Core/Code/Testing/mitkPlanePositionManagerTest.cpp

View Options

Core/Code/Testing/mitkVectorTest.cpp

View Options

Core/Code/files.cmake

View Options

Modules/CameraCalibration/mitkCameraIntrinsics.cpp

View Options

Modules/CameraCalibration/mitkTransform.cpp

View Options

Modules/CameraCalibration/mitkTransform.h

View Options

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsSyntheticNetworkGenerator.cpp

View Options

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetworkReader.cpp

View Options

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

View Options

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp

View Options

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkTbssImporter.cpp

View Options

Modules/IGT/IGTFilters/mitkCameraVisualization.h

View Options

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.cpp

View Options

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.cpp

View Options

Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.cpp

View Options

Modules/MitkExt/Rendering/mitkMeshMapper2D.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp

View Options

Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.cpp

View Options

Modules/PlanarFigure/IO/mitkPlanarFigureReader.cpp

View Options

Modules/SceneSerializationBase/BasePropertySerializer/mitkAnnotationPropertySerializer.cpp

View Options

Modules/SceneSerializationBase/BasePropertySerializer/mitkClippingPropertySerializer.cpp

View Options

Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3dPropertySerializer.cpp

View Options

Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint4dPropertySerializer.cpp

View Options

Modules/SceneSerializationBase/BasePropertySerializer/mitkVector3DPropertySerializer.cpp

View Options

Modules/Segmentation/Algorithms/mitkCalculateSegmentationVolume.cpp

View Options

Modules/Segmentation/DataManagement/mitkContour.cpp

View Options

Modules/Segmentation/DataManagement/mitkContour.h

View Options

Modules/Segmentation/DataManagement/mitkContourModel.cpp

View Options

Modules/Segmentation/Rendering/mitkContourModelGLMapper2D.cpp

View Options

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Merge branch 'bug-15852-platformproject_scalartype_float_to_double' into bug…0c1895a9674eActions

Description

Details

Event Timeline

Merged Changes

Changes (45)

rMITK0c1895a9674e

Core/Code/DataManagement/itkVtkAbstractTransform.txx

Core/Code/DataManagement/mitkImage.cpp

Core/Code/DataManagement/mitkPointSet.h

Core/Code/DataManagement/mitkSlicedData.cpp

Core/Code/DataManagement/mitkSlicedData.h

Core/Code/DataManagement/mitkVector.cpp

Core/Code/DataManagement/mitkVector.h

Core/Code/IO/mitkDicomSeriesReader.cpp

Core/Code/IO/mitkDicomSeriesReader.h

Core/Code/IO/mitkItkImageFileReader.cpp

Core/Code/Rendering/mitkPointSetGLMapper2D.cpp

Core/Code/Rendering/mitkPointSetVtkMapper2D.cpp

Core/Code/Rendering/vtkMitkRectangleProp.cpp

Core/Code/Testing/mitkBaseDataTest.cpp

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

Core/Code/Testing/mitkPlanePositionManagerTest.cpp

Core/Code/Testing/mitkVectorTest.cpp

Core/Code/files.cmake

Modules/CameraCalibration/mitkCameraIntrinsics.cpp

Modules/CameraCalibration/mitkTransform.cpp

Modules/CameraCalibration/mitkTransform.h

Modules/DiffusionImaging/Connectomics/Algorithms/mitkConnectomicsSyntheticNetworkGenerator.cpp

Modules/DiffusionImaging/Connectomics/IODataStructures/mitkConnectomicsNetworkReader.cpp

Modules/DiffusionImaging/FiberTracking/IODataStructures/FiberBundleX/mitkFiberBundleXReader.cpp

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkNrrdTbssRoiImageReader.cpp

Modules/DiffusionImaging/Quantification/IODataStructures/TbssImages/mitkTbssImporter.cpp

Modules/IGT/IGTFilters/mitkCameraVisualization.h

Modules/IGT/IGTFilters/mitkNavigationDataObjectVisualizationFilter.cpp

Modules/IGT/IGTFilters/mitkNavigationDataPlayerBase.cpp

Modules/IGT/IGTTrackingDevices/mitkInternalTrackingTool.cpp

Modules/MitkExt/Rendering/mitkMeshMapper2D.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarCircle.cpp

Modules/PlanarFigure/DataManagement/mitkPlanarEllipse.cpp

Modules/PlanarFigure/IO/mitkPlanarFigureReader.cpp

Modules/SceneSerializationBase/BasePropertySerializer/mitkAnnotationPropertySerializer.cpp

Modules/SceneSerializationBase/BasePropertySerializer/mitkClippingPropertySerializer.cpp

Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint3dPropertySerializer.cpp

Modules/SceneSerializationBase/BasePropertySerializer/mitkPoint4dPropertySerializer.cpp

Modules/SceneSerializationBase/BasePropertySerializer/mitkVector3DPropertySerializer.cpp

Modules/Segmentation/Algorithms/mitkCalculateSegmentationVolume.cpp

Modules/Segmentation/DataManagement/mitkContour.cpp

Modules/Segmentation/DataManagement/mitkContour.h

Modules/Segmentation/DataManagement/mitkContourModel.cpp

Modules/Segmentation/Rendering/mitkContourModelGLMapper2D.cpp

Modules/SurfaceInterpolation/mitkSurfaceInterpolationController.cpp

Merge branch 'bug-15852-platformproject_scalartype_float_to_double' into bug…
0c1895a9674e
Actions