Merge branch 'bug-15852-u7-platformproject_enable_easy_conversion_of_datatypes'

Author: swirkert

Core/Code/Algorithms/mitkTimeHelper.h

@@ -34,14 +34,14 @@ void GenerateTimeInInputRegion(const mitk::TimeGeometry *outputTimeGeometry, con
   // convert the start-index-time of output in start-index-time of input via millisecond-time
   mitk::TimePointType timeInMS = outputTimeGeometry->TimeStepToTimePoint(outputRegion.GetIndex(3));
   mitk::TimeStepType timestep = inputTimeGeometry->TimePointToTimeStep( timeInMS );
-  if( ( timeInMS > ScalarTypeNumericTraits::NonpositiveMin() ) && ( inputTimeGeometry->IsValidTimeStep( timestep ) ) )
+  if( ( timeInMS > itk::NumericTraits<mitk::ScalarType>::NonpositiveMin() ) && ( inputTimeGeometry->IsValidTimeStep( timestep ) ) )
     inputRegion.SetIndex( 3, timestep );
   else
     inputRegion.SetIndex( 3, 0 );
   // convert the end-index-time of output in end-index-time of input via millisecond-time
   timeInMS = outputTimeGeometry->TimeStepToTimePoint(outputRegion.GetIndex(3)+outputRegion.GetSize(3)-1);
   timestep = inputTimeGeometry->TimePointToTimeStep( timeInMS );
-  if( ( timeInMS > ScalarTypeNumericTraits::NonpositiveMin() ) && ( outputTimeGeometry->IsValidTimeStep( timestep ) ) )
+  if( ( timeInMS > itk::NumericTraits<mitk::ScalarType>::NonpositiveMin() ) && ( outputTimeGeometry->IsValidTimeStep( timestep ) ) )
     inputRegion.SetSize( 3, timestep - inputRegion.GetIndex(3) + 1 );
   else
     inputRegion.SetSize( 3, 1 );

Core/Code/Controllers/mitkRenderingManager.cpp

@@ -25,7 +25,7 @@ See LICENSE.txt or http://www.mitk.org for details.
 #include <vtkRenderWindow.h>
 
 #include <itkCommand.h>
-#include "mitkVector.h"
+#include "mitkNumericTypes.h"
 #include <itkAffineGeometryFrame.h>
 #include <itkScalableAffineTransform.h>
 #include <mitkVtkPropRenderer.h>

Core/Code/Controllers/mitkSliceNavigationController.cpp

@@ -789,7 +789,7 @@ ::ExecuteAction( Action* action, StateEvent const* stateEvent )
                 // get the position and gray value from the image and build up status bar text
                 if(image3D.IsNotNull())
                 {
-                  Index3D p;
+                  itk::Index<3> p;
                   image3D->GetGeometry()->WorldToIndex(worldposition, p);
                   stream.precision(2);
                   stream<<"Position: <" << std::fixed <<worldposition[0] << ", " << std::fixed << worldposition[1] << ", " << std::fixed << worldposition[2] << "> mm";

Core/Code/Controllers/mitkSlicesRotator.h

@@ -22,7 +22,7 @@ See LICENSE.txt or http://www.mitk.org for details.
 #pragma GCC visibility push(default)
 #include <itkEventObject.h>
 #pragma GCC visibility pop
-#include <mitkVector.h>
+#include <mitkNumericTypes.h>
 
 namespace mitk {
 

Core/Code/Controllers/mitkSlicesSwiveller.h

@@ -19,7 +19,7 @@ See LICENSE.txt or http://www.mitk.org for details.
 #define SLICESSWIVELLER_H_HEADER_INCLUDED
 
 #include <mitkSlicesCoordinator.h>
-#include <mitkVector.h>
+#include <mitkNumericTypes.h>
 
 #pragma GCC visibility push(default)
 #include <itkEventObject.h>

Core/Code/Controllers/mitkStepper.h

@@ -20,7 +20,7 @@ See LICENSE.txt or http://www.mitk.org for details.
 
 #include <MitkCoreExports.h>
 #include <mitkCommon.h>
-#include "mitkVector.h"
+#include "mitkNumericTypes.h"
 
 #include <itkObject.h>
 #include <itkObjectFactory.h>

Core/Code/DataManagement/itkVtkAbstractTransform.txx

@@ -16,7 +16,7 @@ See LICENSE.txt or http://www.mitk.org for details.
 
 #include "itkVtkAbstractTransform.h"
 #include <vtkAbstractTransform.h>
-#include <mitkVector.h>
+#include <mitkNumericTypes.h>
 
 namespace itk {
 
@@ -78,7 +78,7 @@ TransformPoint(const InputPointType &point) const
 
   OutputPointType outputpoint;
   vnl_vector<TScalarType> vnl_vec;
-  double vtkpt[3];
+  mitk::ScalarType vtkpt[3];
   mitk::itk2vtk(point, vtkpt);
   m_VtkAbstractTransform->TransformPoint(vtkpt, vtkpt);
   mitk::vtk2itk(vtkpt, outputpoint);
@@ -96,9 +96,9 @@ TransformVector(const InputVectorType &vect) const
 
   OutputVectorType outputvector;
   vnl_vector<TScalarType> vnl_vec;
-  double vtkpt[3]={0,0,0};
-  double vtkvec[3];
-  mitk::vnl2vtk<TScalarType, double>(vect.GetVnlVector(), vtkvec);
+  mitk::ScalarType vtkpt[3]={0,0,0};
+  mitk::ScalarType vtkvec[3];
+  mitk::vnl2vtk<TScalarType, mitk::ScalarType>(vect.GetVnlVector(), vtkvec);
   m_VtkAbstractTransform->TransformVectorAtPoint(vtkpt, vtkvec, vtkvec);
   mitk::vtk2itk(vtkvec, outputvector);
   return outputvector;
@@ -114,9 +114,9 @@ TransformVector(const InputVnlVectorType &vect) const
   assert(m_VtkAbstractTransform!=NULL);
 
   OutputVnlVectorType outputvector;
-  double vtkpt[3]={0,0,0};
-  double vtkvec[3];
-  mitk::vnl2vtk<TScalarType, double>(vect, vtkvec);
+  mitk::ScalarType vtkpt[3]={0,0,0};
+  mitk::ScalarType vtkvec[3];
+  mitk::vnl2vtk<TScalarType, mitk::ScalarType>(vect, vtkvec);
   m_VtkAbstractTransform->TransformVectorAtPoint(vtkpt, vtkvec, vtkvec);
   mitk::vtk2itk(vtkvec, outputvector);
   return outputvector;
@@ -133,7 +133,7 @@ TransformCovariantVector(const InputCovariantVectorType &/*vec*/) const
 
 //  for (unsigned int i = 0; i < NDimensions; i++)
 //    {
-//    result[i] = NumericTraits<ScalarType>::Zero;
+//    result[i] = NumericTraits<mitk::ScalarType>::Zero;
 //    for (unsigned int j = 0; j < NDimensions; j++)
 //      {
 //      result[i] += m_Inverse[j][i]*vec[j]; // Inverse transposed
@@ -151,7 +151,7 @@ BackTransform(const OutputPointType &point) const
   assert(m_VtkAbstractTransform!=NULL);
 
   OutputPointType outputpoint;
-  double vtkpt[3];
+  mitk::ScalarType vtkpt[3];
   mitk::itk2vtk(point, vtkpt);
   m_InverseVtkAbstractTransform->TransformPoint(vtkpt, vtkpt);
   mitk::vtk2itk(vtkpt, outputpoint);
@@ -167,8 +167,8 @@ BackTransform(const OutputVectorType &vect ) const
   assert(m_VtkAbstractTransform!=NULL);
 
   OutputVectorType outputvector;
-  double vtkpt[3]={0,0,0};
-  double vtkvec[3];
+  mitk::ScalarType vtkpt[3]={0,0,0};
+  mitk::ScalarType vtkvec[3];
   mitk::itk2vtk(vect, vtkvec);
   m_InverseVtkAbstractTransform->TransformVectorAtPoint(vtkpt, vtkvec, vtkvec);
   mitk::vtk2itk(vtkvec, outputvector);
@@ -184,8 +184,8 @@ BackTransform(const OutputVnlVectorType &vect ) const
   assert(m_InverseVtkAbstractTransform!=NULL);
 
   OutputVnlVectorType outputvector;
-  double vtkpt[3]={0,0,0};
-  double vtkvec[3];
+  mitk::ScalarType vtkpt[3]={0,0,0};
+  mitk::ScalarType vtkvec[3];
   mitk::itk2vtk(vect, vtkvec);
   m_InverseVtkAbstractTransform->TransformVectorAtPoint(vtkpt, vtkvec, vtkvec);
   mitk::vtk2itk(vtkvec, outputvector);
@@ -201,7 +201,7 @@ BackTransform(const OutputCovariantVectorType &vec) const
   itkExceptionMacro( << "implement before using!" );
 //  for (unsigned int i = 0; i < NDimensions; i++)
 //    {
-//    result[i] = NumericTraits<ScalarType>::Zero;
+//    result[i] = NumericTraits<mitk::ScalarType>::Zero;
 //    for (unsigned int j = 0; j < NDimensions; j++)
 //      {
 //      result[i] += m_Matrix[j][i]*vec[j]; // Direct matrix transposed

Core/Code/DataManagement/mitkAbstractTransformGeometry.cpp

@@ -58,7 +58,7 @@ mitk::ScalarType mitk::AbstractTransformGeometry::GetParametricExtentInMM(int di
   return m_Plane->GetExtentInMM(direction);
 }
 
-const mitk::Transform3D* mitk::AbstractTransformGeometry::GetParametricTransform() const
+const itk::Transform<mitk::ScalarType, 3, 3>* mitk::AbstractTransformGeometry::GetParametricTransform() const
 {
   return m_ItkVtkAbstractTransform;
 }

Core/Code/DataManagement/mitkAbstractTransformGeometry.h

@@ -123,7 +123,7 @@ namespace mitk {
 
     virtual mitk::ScalarType GetParametricExtentInMM(int direction) const;
 
-    virtual const Transform3D* GetParametricTransform() const;
+  virtual const itk::Transform<mitk::ScalarType, 3, 3>* GetParametricTransform() const;
 
     //##Documentation
     //## @brief Change the parametric bounds to @a oversampling times

Core/Code/DataManagement/mitkAffineTransform3D.h

@@ -0,0 +1,31 @@
+/*===================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center,
+Division of Medical and Biological Informatics.
+All rights reserved.
+
+This software is distributed WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE.
+
+See LICENSE.txt or http://www.mitk.org for details.
+
+===================================================================*/
+
+
+#ifndef MITKAFFINETRANSFORM3D_H_
+#define MITKAFFINETRANSFORM3D_H_
+
+
+#include <itkAffineGeometryFrame.h>
+
+namespace mitk
+{
+  typedef itk::AffineGeometryFrame<ScalarType, 3>::TransformType AffineTransform3D;
+}
+
+
+
+#endif /* MITKAFFINETRANSFORM3D_H_ */