Changment of cursor color value to keep the same color than before VTK8

[clitk.git] / common / clitkTransformUtilities.h

diff --git a/common/clitkTransformUtilities.h b/common/clitkTransformUtilities.h
index b9a540a672a23602a33a8b919ed208eba4156823..562ed63a67e11facfdcc07ff960fd5456394613a 100644 (file)
--- a/common/clitkTransformUtilities.h
+++ b/common/clitkTransformUtilities.h
@@ -23,7 +23,9 @@
 #include "itkPoint.h"
 #include "clitkImageCommon.h"
 #include "clitkCommon.h"
- 
+#define VTK_EXCLUDE_STRSTREAM_HEADERS
+#include <vtkMatrix4x4.h>
+#include <vtkSmartPointer.h>
  
 namespace clitk
 {
@@ -32,6 +34,7 @@ namespace clitk
   //============================================================================
   itk::Matrix<double, 3, 3> GetForwardAffineMatrix2D(itk::Array<double> transformParameters);
   itk::Matrix<double, 4, 4> GetForwardAffineMatrix3D(itk::Array<double> transformParameters);
+  template <unsigned int Dimension > itk::Matrix<double, Dimension+1, Dimension+1> GetForwardAffineMatrix(itk::Array<double> transformParameters);
 
   itk::Matrix<double, 3, 3> GetBackwardAffineMatrix2D(itk::Array<double> transformParameters);
   itk::Matrix<double, 4, 4> GetBackwardAffineMatrix3D(itk::Array<double> transformParameters);
@@ -253,8 +256,9 @@ namespace clitk
     return matrix; 
   }
    
-  inline itk::Matrix<double, 4, 4> ReadMatrix3D(std::string fileName)
-  {
+  itk::Matrix<double, 4, 4> ReadMatrix3D(std::string fileName);
+ 
+  inline vtkMatrix4x4* ReadVTKMatrix3D(std::string fileName) {
     // read input matrix
     std::ifstream is;
     openFileForReading(is, fileName);
@@ -265,18 +269,18 @@ namespace clitk
     while (!is.eof()) {
       nb.push_back(x);
       skipComment(is);
-      is >> x;  
+      is >> x;
     }
-     
-    //copy it to the matrix
-    itk::Matrix<double, 4, 4> matrix;
+
+    vtkSmartPointer<vtkMatrix4x4> matrix = vtkSmartPointer<vtkMatrix4x4>::New();
     unsigned int index=0;
     for (unsigned int i=0;i<4;i++)
       for (unsigned int j=0;j<4;j++)
-       matrix[i][j]=nb[index++];
-    return matrix; 
+         matrix->SetElement(i,j, nb[index++]);
+
+    return matrix;
   }
- 
+
   inline itk::Matrix<double, 3, 3> ReadMatrix2D(std::string fileName)
   {
     // read input matrix