Diffusion MITK b383a69f4fa9

Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes'…
b383a69f4fa9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes' into bug-15852-u2-platformproject_enable_easy_conversion_of_datatypes

Conflicts:
Core/Code/DataManagement/itkVtkAbstractTransform.txx
Core/Code/DataManagement/mitkDataTypeBasics.h
Core/Code/DataManagement/mitkPoint.h
Core/Code/DataManagement/mitkTypeBasics.cpp
Core/Code/DataManagement/mitkTypeBasics.h
Core/Code/DataManagement/mitkVector.cpp
Core/Code/DataManagement/mitkVector.h
Core/Code/Testing/files.cmake
Core/Code/Testing/mitkSurfaceToSurfaceFilterTest.cpp
Core/Code/Testing/mitkTypeOperationTest.cpp
Core/Code/Testing/mitkTypePointConversionTest.cpp
Core/Code/files.cmake
Modules/ContourModel/DataManagement/mitkContourElement.h
Modules/MitkExt/DataManagement/mitkVecmathHelper.h
Modules/MitkExt/Interactions/mitkTDMouseEventThrower.cpp
Modules/Segmentation/DataManagement/mitkContour.h
Modules/Simulation/mitkSimulationService.h

Details

Provenance

Authored on Nov 11 2013, 2:15 PM

Parents

rMITK6baaab854415: Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes'…
rMITKf945546c688a: Merge branch 'bug-16021-DeactivateFastMarchingAfterConfirm'

Branches

Unknown

Tags

Unknown

Event Timeline

• wirkert committed rMITKb383a69f4fa9: Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes'… (authored by • wirkert).Nov 11 2013, 2:15 PM

Merged Changes

6baaab854415 Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes' of…
Author
• wirkert
Browse Repository
No Builds
No Audits
b154b6c229fe Very small formatting change.
Author
• wirkert
Browse Repository
No Builds
No Audits
a04b6e50c85d fixed typo
Author
franza
Browse Repository
No Builds
No Audits
817b06fb28a9 Feedback from Sascha: Implemented ToArray and FromArray as free-floating…
Author
• wirkert
Browse Repository
No Builds
No Audits
08215bb6a957 The multiplication and division method as implemented made no sense. Switched…
Author
• wirkert
Browse Repository
No Builds
No Audits
a9955e491df4 put type operations into namespace mitk.
Author
• wirkert
Browse Repository
No Builds
No Audits
1edf5452a93d Added div mul and sub methods + tests.
Author
• wirkert
Browse Repository
No Builds
No Audits
10ee6ff2a53f Added an example how +/-/*/: operations could look like for arbitrary itk…
Author
• wirkert
Browse Repository
No Builds
No Audits
a3eca27d14ad some small changes in the comments.
Author
• wirkert
Browse Repository
No Builds
No Audits
4ee53affaada Removed conversions of not equal types (e.g.: vector3F = vector3D), as it is no…
Author
• wirkert
Browse Repository
No Builds
No Audits
90f01d3b3bd4 More refractoring to using new convenience method TestForEquality.
Author
• wirkert
Browse Repository
No Builds
No Audits
b2c7759d22d5 First version which assigns opencv vectors by trying out new templated…
Author
• wirkert
Browse Repository
No Builds
No Audits
c5f4d569ee73 Tidied up.
Author
• wirkert
Browse Repository
No Builds
No Audits
5ed2527b4a04 Removed capability to assign differently sized vectors and replaced it with an…
Author
• wirkert
Browse Repository
No Builds
No Audits
49ff6456dd55 First version which also converts vnl_vector <-> mitk::Vector
Author
• wirkert
Browse Repository
No Builds
No Audits
078d51d098bd Added functionality to convert between different datatypes. E.g.: vector3F =…
Author
• wirkert
Browse Repository
No Builds
No Audits
adf63cfec0f3 Added user-defined conversion from mitk::Vector to vnl_vector_fixed. Added a…
Author
• wirkert
Browse Repository
No Builds
No Audits
ee1f0bea95db Refactored static function names + added one test to ensure correct conversion…
Author
• wirkert
Browse Repository
No Builds
No Audits
e96ed2b53c1b Added functionality to convert between different types (e.g., itk::Vector<float…
Author
• wirkert
Browse Repository
No Builds
No Audits
92ed8c09a96e Tests for vnl_vector constructor corner cases added (vnl_vector bigger or…
Author
• wirkert
Browse Repository
No Builds
No Audits
f512076cae0c Started work on mitk 2 vnl conversions.
Author
• wirkert
Browse Repository
No Builds
No Audits
895847a4d911 First two tests for new mitk::Vector added.
Author
• wirkert
Browse Repository
No Builds
No Audits
b25bc8369df6 Split up mitkTypConversionTest into for test files one for Point, Vector and…
Author
• wirkert
Browse Repository
No Builds
No Audits
25b45bbc93cf Made Matrix its own class.
Author
• wirkert
Browse Repository
No Builds
No Audits
dec599dfe9f5 Made Vector its own class and added one typedef from keno.
Author
• wirkert
Browse Repository
No Builds
No Audits
8172ba760467 correct names for files.cmake added.
Author
• wirkert
Browse Repository
No Builds
No Audits
0710e4b70464 Removed unnecessary includes in point and general cleanup in the basic types…
Author
• wirkert
Browse Repository
No Builds
No Audits
8e3b3595c3a6 Renamed mitkDataTypeBasics to mitkTypeBasics Added one file for basic mitk…
Author
• wirkert
Browse Repository
No Builds
No Audits
e32df6acb9e3 Changed name from central mitk types (Point, Vector, Matrix, ...) file from…
Author
• wirkert
Browse Repository
No Builds
No Audits
d873be9511e2 Changes to make it run with gcc.
Author
• wirkert
Browse Repository
No Builds
No Audits

Changes (135)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

Core/

Code/

Common/

Controllers/

mitkRenderingManager.cpp

mitkSlicesRotator.h

mitkSlicesSwiveller.h

DataManagement/

itkVtkAbstractTransform.txx

mitkAnnotationProperty.h

mitkApplicationCursor.h

mitkClippingProperty.h

mitkGenericLookupTable.h

mitkGenericProperty.h

mitkGeometry3D.h

mitkLevelWindow.h

mitkOldTypeConversions.h

mitkPlaneOperation.h

mitkPointOperation.h

mitkProperties.h

mitkPropertyList.cpp

mitkRestorePlanePositionOperation.h

mitkRotationOperation.h

	mitkTypeBasics.cpp
	mitkVector.cpp

	mitkTypeBasics.h
	mitkVector.cpp

mitkTypeOperations.h

	mitkTypes.h
	mitkVector.h

Interactions/

mitkAffineInteractor.h

mitkCoordinateSupplier.h

mitkDisplayCoordinateOperation.h

mitkDisplayPositionEvent.h

mitkMouseMovePointSetInteractor.h

mitkNodeDepententPointSetInteractor.h

mitkPointSetInteractor.h

mitkPositionEvent.cpp

mitkPositionEvent.h

mitkPositionTracker.cpp

mitkWheelEvent.cpp

mitkWheelEvent.h

Testing/

mitkAffineTransformBaseTest.cpp

mitkClippedSurfaceBoundsCalculatorTest.cpp

mitkExtractSliceFilterTest.cpp

mitkGenericPropertyTest.cpp

mitkGeometry3DTest.cpp

mitkLogTest.cpp

mitkPointSetTest.cpp

mitkSurfaceTest.cpp

mitkSurfaceToSurfaceFilterTest.cpp

mitkTypeOperationTest.cpp

mitkTypePointConversionTest.cpp

mitkTypeVectorConversionTest.cpp

mitkVectorTest.cpp

	Testing/
	DataManagement/

	mitkTypeMatrixConversionTest.cpp
	mitkVector.cpp

Modules/

CameraCalibration/

mitkCameraIntrinsics.h

mitkTransform.h

ClippingTools/

mitkClippingPlaneDeformationTool.h

mitkClippingPlaneRotationTool.h

mitkClippingPlaneTranslationTool.h

ContourModel/

DataManagement/

mitkContourElement.h

O3: MITK Reviewer Group II

DiffusionImaging/

DiffusionCore/

mitkDiffusionFunctionCollection.cpp

FiberTracking/

Algorithms/

itkFieldmapGeneratorFilter.h

Interactions/

mitkFiberBundleInteractor.h

IGT/

Common/

mitkTrackingTypes.h

DataManagement/

mitkNavigationData.h

Testing/

mitkNavigationDataToMessageFilterTest.cpp

TrackingDevices/

mitkClaronInterface.cpp

mitkInternalTrackingTool.h

mitkTrackingTool.h

mitkVirtualTrackingTool.h

InputDevices/

SpaceNavigator/

mitkSpaceNavigatorAddOn.cpp

mitkSpaceNavigatorAddOn.h

mitkSpaceNavigatorDriver.h

mitkSpaceNavigatorEvent.cpp

mitkSpaceNavigatorEvent.h

mitkSpaceNavigatorVtkCameraController.cpp

WiiMote/

mitkWiiMoteAddOn.h

mitkWiiMoteButtonEvent.h

mitkWiiMoteCalibrationEvent.h

mitkWiiMoteIREvent.h

mitkWiiMoteInteractor.cpp

mitkWiiMoteMultiIREvent.h

mitkWiiMoteThread.h

IpPicSupport/

mitkPicHelper.h

MitkExt/

Algorithms/

mitkAngleCorrectByPointFilter.h

Controllers/

mitkMultiStepper.h

mitkTDMouseVtkCameraController.cpp

DataManagement/

mitkAffineTransformationOperation.h

mitkCellOperation.h

mitkCylinder.cpp

mitkDrawOperation.h

mitkEllipsoid.cpp

mitkNamedPoint.h

Interactions/

mitkConnectPointsInteractor.h

mitkDisplayPointSetInteractor.cpp

mitkDisplayPointSetInteractor.h

mitkPointInteractor.h

mitkPointSelectorInteractor.h

mitkSeedsInteractor.h

mitkTDMouseEvent.cpp

mitkTDMouseEvent.h

mitkTDMouseEventThrower.cpp

mitkTDMouseEventThrower.h

Rendering/

mitkEnhancedPointSetVtkMapper3D.h

mitkSplineMapper2D.cpp

Testing/

mitkMeshTest.cpp

mitkPlaneFitTest.cpp

OpenCVVideoSupport/

mitkUndistortCameraImage.h

PlanarFigure/

Interactions/

mitkPlanarFigureInteractor.h

O1: MITK Reviewer Group I

SceneSerializationBase/

BasePropertySerializer/

mitkClippingPropertySerializer.cpp

O1: MITK Reviewer Group I

Segmentation/

DataManagement/

O1: MITK Reviewer Group I

mitkExtrudedContour.cpp

O1: MITK Reviewer Group I

Interactions/

mitkContourInteractor.h

O1: MITK Reviewer Group I

mitkExtrudedContourInteractor.h

O1: MITK Reviewer Group I

mitkFastMarchingTool.xpm

O1: MITK Reviewer Group I

mitkLiveWireTool2D.xpm

O1: MITK Reviewer Group I

ToFProcessing/

Testing/

mitkKinectReconstructionTest.cpp

mitkToFDistanceImageToPointSetFilterTest.cpp

mitkToFDistanceImageToSurfaceFilterTest.cpp

mitkToFProcessingCommon.h

mitkToFTestingCommon.h

Plugins/

org.mitk.gui.common/

src/

mitkIRenderWindowPart.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.examples/

documentation/

UserManual/

regiongrowing.xpm

viewInitializationIcon.xpm

resources/

surfaceUtilities.xpm

org.mitk.gui.qt.tofutil/

resources/

iconGenerationView.xpm

rMITKb383a69f4fa9

Core/Code/Common/mitkTesting.h

Core/Code/Controllers/mitkRenderingManager.cpp

Core/Code/Controllers/mitkSlicesRotator.h

Core/Code/Controllers/mitkSlicesSwiveller.h

Core/Code/Controllers/mitkStepper.h

Core/Code/DataManagement/itkVtkAbstractTransform.txx

Core/Code/DataManagement/mitkAnnotationProperty.h

Core/Code/DataManagement/mitkApplicationCursor.h

Core/Code/DataManagement/mitkClippingProperty.h

Core/Code/DataManagement/mitkGenericLookupTable.h

Core/Code/DataManagement/mitkGenericProperty.h

Core/Code/DataManagement/mitkGeometry3D.h

Core/Code/DataManagement/mitkLevelWindow.h

Core/Code/DataManagement/mitkLine.h

Core/Code/DataManagement/mitkMatrix.h

Core/Code/DataManagement/mitkOldTypeConversions.h

Core/Code/DataManagement/mitkPlaneOperation.h

Core/Code/DataManagement/mitkPoint.h

Core/Code/DataManagement/mitkPointOperation.h

Core/Code/DataManagement/mitkProperties.h

Core/Code/DataManagement/mitkPropertyList.cpp

Core/Code/DataManagement/mitkRestorePlanePositionOperation.h

Core/Code/DataManagement/mitkRotationOperation.h

Core/Code/DataManagement/mitkTypeBasics.cpp

Core/Code/DataManagement/mitkTypeBasics.h

Core/Code/DataManagement/mitkTypeOperations.h

Core/Code/DataManagement/mitkTypedefs.h

Core/Code/DataManagement/mitkTypes.h

Core/Code/DataManagement/mitkVector.cpp

Core/Code/DataManagement/mitkVector.h

Core/Code/Interactions/mitkAffineInteractor.h

Core/Code/Interactions/mitkCoordinateSupplier.h

Core/Code/Interactions/mitkDisplayCoordinateOperation.h

Core/Code/Interactions/mitkDisplayPositionEvent.h

Core/Code/Interactions/mitkKeyEvent.h

Core/Code/Interactions/mitkMouseMovePointSetInteractor.h

Core/Code/Interactions/mitkNodeDepententPointSetInteractor.h

Core/Code/Interactions/mitkPointSetInteractor.h

Core/Code/Interactions/mitkPositionEvent.cpp

Core/Code/Interactions/mitkPositionEvent.h

Core/Code/Interactions/mitkPositionTracker.cpp

Core/Code/Interactions/mitkWheelEvent.cpp

Core/Code/Interactions/mitkWheelEvent.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkAffineTransformBaseTest.cpp

Core/Code/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

Core/Code/Testing/mitkGenericPropertyTest.cpp

Core/Code/Testing/mitkGeometry3DTest.cpp

Core/Code/Testing/mitkLogTest.cpp

Core/Code/Testing/mitkPointSetTest.cpp

Core/Code/Testing/mitkSurfaceTest.cpp

Core/Code/Testing/mitkSurfaceToSurfaceFilterTest.cpp

Core/Code/Testing/mitkTypeMatrixConversionTest.cpp

Core/Code/Testing/mitkTypeOperationTest.cpp

Core/Code/Testing/mitkTypePointConversionTest.cpp

Core/Code/Testing/mitkTypeVectorConversionTest.cpp

Core/Code/Testing/mitkVectorTest.cpp

Core/Code/files.cmake

Modules/CameraCalibration/mitkCameraIntrinsics.h

Modules/CameraCalibration/mitkTransform.h

Modules/ClippingTools/mitkClippingPlaneDeformationTool.h

Modules/ClippingTools/mitkClippingPlaneRotationTool.h

Modules/ClippingTools/mitkClippingPlaneTranslationTool.h

Modules/ContourModel/DataManagement/mitkContourElement.h

Modules/DiffusionImaging/DiffusionCore/mitkDiffusionFunctionCollection.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFieldmapGeneratorFilter.h

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h

Modules/IGT/Common/mitkTrackingTypes.h

Modules/IGT/DataManagement/mitkNavigationData.h

Modules/IGT/Testing/mitkNavigationDataToMessageFilterTest.cpp

Modules/IGT/TrackingDevices/mitkClaronInterface.cpp

Modules/IGT/TrackingDevices/mitkInternalTrackingTool.h

Modules/IGT/TrackingDevices/mitkTrackingTool.h

Modules/IGT/TrackingDevices/mitkVirtualTrackingTool.h

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorAddOn.cpp

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorAddOn.h

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorDriver.h

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorEvent.cpp

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorEvent.h

Modules/InputDevices/SpaceNavigator/mitkSpaceNavigatorVtkCameraController.cpp

Modules/InputDevices/WiiMote/mitkWiiMoteAddOn.h

Modules/InputDevices/WiiMote/mitkWiiMoteButtonEvent.h

Modules/InputDevices/WiiMote/mitkWiiMoteCalibrationEvent.h

Modules/InputDevices/WiiMote/mitkWiiMoteIREvent.h

Modules/InputDevices/WiiMote/mitkWiiMoteInteractor.cpp

Modules/InputDevices/WiiMote/mitkWiiMoteMultiIREvent.h

Modules/InputDevices/WiiMote/mitkWiiMoteThread.h

Modules/IpPicSupport/mitkPicHelper.h

Modules/MitkExt/Algorithms/mitkAngleCorrectByPointFilter.h

Modules/MitkExt/Controllers/mitkMultiStepper.h

Modules/MitkExt/Controllers/mitkTDMouseVtkCameraController.cpp

Modules/MitkExt/DataManagement/mitkAffineTransformationOperation.h

Modules/MitkExt/DataManagement/mitkCellOperation.h

Modules/MitkExt/DataManagement/mitkCone.cpp

Modules/MitkExt/DataManagement/mitkCuboid.cpp

Modules/MitkExt/DataManagement/mitkCylinder.cpp

Modules/MitkExt/DataManagement/mitkDrawOperation.h

Modules/MitkExt/DataManagement/mitkEllipsoid.cpp

Modules/MitkExt/DataManagement/mitkMesh.cpp

Modules/MitkExt/DataManagement/mitkNamedPoint.h

Modules/MitkExt/DataManagement/mitkPlane.cpp

Modules/MitkExt/Interactions/mitkConnectPointsInteractor.h

Modules/MitkExt/Interactions/mitkDisplayPointSetInteractor.cpp

Modules/MitkExt/Interactions/mitkDisplayPointSetInteractor.h

Modules/MitkExt/Interactions/mitkPointInteractor.h

Modules/MitkExt/Interactions/mitkPointSelectorInteractor.h

Modules/MitkExt/Interactions/mitkSeedsInteractor.h

Modules/MitkExt/Interactions/mitkTDMouseEvent.cpp

Modules/MitkExt/Interactions/mitkTDMouseEvent.h

Modules/MitkExt/Interactions/mitkTDMouseEventThrower.cpp

Modules/MitkExt/Interactions/mitkTDMouseEventThrower.h

Modules/MitkExt/Rendering/mitkEnhancedPointSetVtkMapper3D.h

Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp

Modules/MitkExt/Testing/mitkMeshTest.cpp

Modules/MitkExt/Testing/mitkPlaneFitTest.cpp

Modules/OpenCVVideoSupport/mitkUndistortCameraImage.h

Modules/PlanarFigure/Interactions/mitkPlanarFigureInteractor.h

Modules/SceneSerializationBase/BasePropertySerializer/mitkClippingPropertySerializer.cpp

Modules/Segmentation/DataManagement/mitkContour.h

Modules/Segmentation/DataManagement/mitkExtrudedContour.cpp

Modules/Segmentation/Interactions/mitkContourInteractor.h

Modules/Segmentation/Interactions/mitkExtrudedContourInteractor.h

Modules/Segmentation/Interactions/mitkFastMarchingTool.xpm

Modules/Segmentation/Interactions/mitkLiveWireTool2D.xpm

Modules/ToFProcessing/Testing/mitkKinectReconstructionTest.cpp

Modules/ToFProcessing/Testing/mitkToFDistanceImageToPointSetFilterTest.cpp

Modules/ToFProcessing/Testing/mitkToFDistanceImageToSurfaceFilterTest.cpp

Modules/ToFProcessing/mitkToFProcessingCommon.h

Modules/ToFProcessing/mitkToFTestingCommon.h

Plugins/org.mitk.gui.common/src/mitkIRenderWindowPart.h

Plugins/org.mitk.gui.qt.examples/documentation/UserManual/regiongrowing.xpm

Plugins/org.mitk.gui.qt.examples/documentation/UserManual/viewInitializationIcon.xpm

Plugins/org.mitk.gui.qt.examples/resources/surfaceUtilities.xpm

Plugins/org.mitk.gui.qt.tofutil/resources/iconGenerationView.xpm