Diffusion MITK 75ff222a1d15

Merge branch 'bug-15852-u2…
75ff222a1d15
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Conflicts:
Core/Code/Common/mitkTesting.h
Core/Code/DataManagement/mitkApplicationCursor.h
Core/Code/DataManagement/mitkGenericLookupTable.h
Core/Code/DataManagement/mitkGenericProperty.h
Core/Code/DataManagement/mitkLevelWindow.h
Core/Code/DataManagement/mitkVector.h
Core/Code/Interactions/mitkMouseMovePointSetInteractor.h
Core/Code/Interactions/mitkNodeDepententPointSetInteractor.h
Core/Code/Interactions/mitkPointSetInteractor.h
Core/Code/Testing/files.cmake
Core/Code/files.cmake
Modules/ClippingTools/mitkClippingPlaneDeformationTool.h
Modules/ClippingTools/mitkClippingPlaneRotationTool.h
Modules/ClippingTools/mitkClippingPlaneTranslationTool.h
Modules/ContourModel/DataManagement/mitkContourElement.h
Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h
Modules/IGT/Common/mitkTrackingTypes.h
Modules/IpPicSupport/mitkPicHelper.h
Modules/MitkExt/Algorithms/mitkAngleCorrectByPointFilter.h
Modules/MitkExt/Controllers/mitkMultiStepper.h
Modules/MitkExt/DataManagement/mitkCellOperation.h
Modules/MitkExt/Rendering/mitkEnhancedPointSetVtkMapper3D.h
Modules/MitkExt/Rendering/mitkSplineMapper2D.cpp
Modules/ToFProcessing/mitkToFTestingCommon.h

Details

Provenance

Authored on Mar 27 2014, 2:53 PM

Parents

rMITK08ada25f5042: outsourced all opencv specific type tests to own file.
rMITKabc06a413214: Merge branch 'bug-17589-current-opencv-version-fails-on-vs-2013'

Branches

Unknown

Tags

Unknown

Event Timeline

• wirkert committed rMITK75ff222a1d15: Merge branch 'bug-15852-u2… (authored by • wirkert).Mar 27 2014, 2:53 PM

Merged Changes

08ada25f5042 outsourced all opencv specific type tests to own file.
Author
• wirkert
Browse Repository
No Builds
No Audits
b37666c01645 Added comments for operator/ and operator*
Author
• wirkert
Browse Repository
No Builds
No Audits
23b92d9d98d8 Added scalar multiplication and division for points.
Author
• wirkert
Browse Repository
No Builds
No Audits
d8ce49fc65ab little changes to interface for point addition, subtraction.
Author
• wirkert
Browse Repository
No Builds
No Audits
357fcb74f13b Preliminary version to allow a = add(c, d);
Author
• wirkert
Browse Repository
No Builds
No Audits
0f255d75749f 1. Some more documentation 2. Made constructors explicit as far as possible…
Author
• wirkert
Browse Repository
No Builds
No Audits
5e987e4f0108 Roughly the same as in last commit for FromArray done for ToArray.
Author
• wirkert
Browse Repository
No Builds
No Audits
afb876ce4a16 ToArray done equivalently to FromArray (see last checkin). TODO: What to do…
Author
• wirkert
Browse Repository
No Builds
No Audits
a8918292f46b Interface change so that FromArray can be invoked directly onto a vector.
Author
• wirkert
Browse Repository
No Builds
No Audits
b383a69f4fa9 Merge branch 'bug-15852-platformproject_enable_easy_conversion_of_datatypes'…
Author
• wirkert
Browse Repository
No Builds
No Audits
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 (138)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

Core/

Code/

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

mitkPointSet.cpp

mitkProperties.h

mitkPropertyList.cpp

mitkRestorePlanePositionOperation.h

mitkRotationOperation.h

	mitkTypeBasics.cpp
	mitkVector.cpp

	mitkTypeBasics.h
	mitkVector.cpp

mitkTypeConversions.h

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

mitkEqualTest.cpp

mitkExtractSliceFilterTest.cpp

mitkGenericPropertyTest.cpp

mitkGeometry3DTest.cpp

mitkLogTest.cpp

mitkLookupTableTest.cpp

mitkPointSetTest.cpp

mitkSurfaceTest.cpp

mitkSurfaceToSurfaceFilterTest.cpp

mitkTinyXMLTest.cpp

mitkTypeConversionOpenCVTest.cpp

mitkTypeOperationTest.cpp

mitkTypePointConversionTest.cpp

mitkTypeVectorConversionTest.cpp

mitkVectorTest.cpp

	Testing/
	DataManagement/

	mitkTypeMatrixConversionTest.cpp
	mitkVector.cpp

Examples/

Plugins/

org.mitk.example.gui.imaging/

documentation/

UserManual/

regiongrowing.xpm

viewInitializationIcon.xpm

resources/

surfaceUtilities.xpm

Modules/

CameraCalibration/

mitkCameraIntrinsics.h

mitkTransform.h

ContourModel/

DataManagement/

mitkContourElement.h

O3: MITK Reviewer Group II

DataTypesExt/

Testing/

mitkMeshTest.cpp

mitkCylinder.cpp

mitkEllipsoid.cpp

DiffusionImaging/

DiffusionCore/

mitkDiffusionFunctionCollection.cpp

FiberTracking/

Algorithms/

itkFieldmapGeneratorFilter.h

Interactions/

mitkFiberBundleInteractor.h

Ext/

Controllers/

mitkTDMouseVtkCameraController.cpp

DataManagement/

mitkAffineTransformationOperation.h

mitkDrawOperation.h

mitkNamedPoint.h

Interactions/

mitkConnectPointsInteractor.h

mitkDisplayPointSetInteractor.cpp

mitkDisplayPointSetInteractor.h

mitkPointInteractor.h

mitkPointSelectorInteractor.h

mitkSeedsInteractor.h

mitkTDMouseEvent.cpp

mitkTDMouseEvent.h

mitkTDMouseEventThrower.cpp

mitkTDMouseEventThrower.h

Testing/

mitkPlaneFitTest.cpp

IGT/

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

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.measurementtoolbox/

src/

internal/

QmitkImageStatisticsView.cpp

O1: MITK Reviewer Group I

QmitkImageStatisticsView.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.meshdecimation/

documentation/

Manual/

QmitkMeshDecimation.dox

org.mitk.gui.qt.tofutil/

resources/

iconGenerationView.xpm

org.mitk.gui.qt.xnat/

documentation/

UserManual/

O3: MITK Reviewer Group II

resources/

O3: MITK Reviewer Group II

xnat_search_icon.xpm

O3: MITK Reviewer Group II

xnat_treebrowser_icon.xpm

O3: MITK Reviewer Group II

rMITK75ff222a1d15

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/mitkPointSet.cpp

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/mitkTypeConversions.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/mitkEqualTest.cpp

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

Core/Code/Testing/mitkGenericPropertyTest.cpp

Core/Code/Testing/mitkGeometry3DTest.cpp

Core/Code/Testing/mitkLogTest.cpp

Core/Code/Testing/mitkLookupTableTest.cpp

Core/Code/Testing/mitkPointSetTest.cpp

Core/Code/Testing/mitkSurfaceTest.cpp

Core/Code/Testing/mitkSurfaceToSurfaceFilterTest.cpp

Core/Code/Testing/mitkTinyXMLTest.cpp

Core/Code/Testing/mitkTypeConversionOpenCVTest.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

Examples/Plugins/org.mitk.example.gui.imaging/documentation/UserManual/regiongrowing.xpm

Examples/Plugins/org.mitk.example.gui.imaging/documentation/UserManual/viewInitializationIcon.xpm

Examples/Plugins/org.mitk.example.gui.imaging/resources/surfaceUtilities.xpm

Modules/CameraCalibration/mitkCameraIntrinsics.h

Modules/CameraCalibration/mitkTransform.h

Modules/ContourModel/DataManagement/mitkContourElement.h

Modules/DataTypesExt/Testing/mitkMeshTest.cpp

Modules/DataTypesExt/mitkCone.cpp

Modules/DataTypesExt/mitkCuboid.cpp

Modules/DataTypesExt/mitkCylinder.cpp

Modules/DataTypesExt/mitkEllipsoid.cpp

Modules/DataTypesExt/mitkMesh.cpp

Modules/DataTypesExt/mitkPlane.cpp

Modules/DiffusionImaging/DiffusionCore/mitkDiffusionFunctionCollection.cpp

Modules/DiffusionImaging/FiberTracking/Algorithms/itkFieldmapGeneratorFilter.h

Modules/DiffusionImaging/FiberTracking/Interactions/mitkFiberBundleInteractor.h

Modules/Ext/Controllers/mitkTDMouseVtkCameraController.cpp

Modules/Ext/DataManagement/mitkAffineTransformationOperation.h

Modules/Ext/DataManagement/mitkDrawOperation.h

Modules/Ext/DataManagement/mitkNamedPoint.h

Modules/Ext/Interactions/mitkConnectPointsInteractor.h

Modules/Ext/Interactions/mitkDisplayPointSetInteractor.cpp

Modules/Ext/Interactions/mitkDisplayPointSetInteractor.h

Modules/Ext/Interactions/mitkPointInteractor.h

Modules/Ext/Interactions/mitkPointSelectorInteractor.h

Modules/Ext/Interactions/mitkSeedsInteractor.h

Modules/Ext/Interactions/mitkTDMouseEvent.cpp

Modules/Ext/Interactions/mitkTDMouseEvent.h

Modules/Ext/Interactions/mitkTDMouseEventThrower.cpp

Modules/Ext/Interactions/mitkTDMouseEventThrower.h

Modules/Ext/Testing/mitkPlaneFitTest.cpp

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/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.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp

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

Plugins/org.mitk.gui.qt.meshdecimation/documentation/Manual/QmitkMeshDecimation.dox

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

Plugins/org.mitk.gui.qt.xnat/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.xnat/resources/icon.xpm

Plugins/org.mitk.gui.qt.xnat/resources/xnat_search_icon.xpm

Plugins/org.mitk.gui.qt.xnat/resources/xnat_treebrowser_icon.xpm