X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaVtk.txx;h=c4e7167747d135f05c2d48269e4b445efb39bc82;hb=08d413da4e6a2345cf06424418857a4f6715daf9;hp=4d39387958debb94ce4b6316ccdff53b8986af9d;hpb=bfb05457f0fad7329768d34492a2a2149195471a;p=crea.git

diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index 4d39387..c4e7167 100644
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -1,39 +1,83 @@
 #include <vtkDataArrayTemplate.h>
+
+#include <vtkCharArray.h>
+#include <vtkSignedCharArray.h>
+#include <vtkUnsignedCharArray.h>
+#include <vtkShortArray.h>
+#include <vtkUnsignedShortArray.h>
+#include <vtkIntArray.h>
+#include <vtkUnsignedIntArray.h>
+#include <vtkLongArray.h>
+#include <vtkUnsignedLongArray.h>
+#include <vtkFloatArray.h>
+#include <vtkDoubleArray.h>
+
 #include <vtkPointData.h>
-#include <typeinfo> 
+#include <vtkTypeTraits.h>
+#include <creaMessageManager.h>
 namespace crea
-{
-  
+{  
   template <class T>
-  vtkImageData* CREA_EXPORT NewVtkImageDataFromRaw( T* data,
+  /*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data, 
 						    int nx, 
 						    int ny,
-						    int nz)
+						    int nz,
+						    bool do_not_desalloc)
   {
-    std::cout << "NV "<<nx<<" " <<ny<<" " << nz<<std::endl;
-    std::cout << typeid(T).name() << std::endl;
-    vtkImageData *image = vtkImageData::New();    
+    //    std::cout << "NV "<<nx<<" " <<ny<<" " << nz<<std::endl;
+    //    std::cout <<  vtkTypeTraits<T>::SizedName() << std::endl;
+    vtkImageData *image = vtkImageData::New();
+
+    // Shouldn't we pass NumberOfScalarComponents to deal with RGB, RGBA images as well? // JPR
+
     image->SetNumberOfScalarComponents(1);
-    image->SetScalarType(GetVtkIdType<T>(*data));
-    image->SetDimensions(nx,ny,nz);
-    image->SetSpacing(1,1,1);
-    std::cout << "alloc"<<std::endl;
+
+    int vtktype = vtkTypeTraits<T>::VTKTypeID();
+    image->SetScalarType(vtktype);
+    image->SetDimensions(nx, ny ,nz);
+    image->SetSpacing(1, 1, 1);
     image->AllocateScalars();
-    std::cout << "alloc ok"<<std::endl;
-    vtkDataArrayTemplate<T>* array 
-      = (vtkDataArrayTemplate<T>*)vtkDataArrayTemplate<T>::New();
-    std::cout << "data array alloc ok"<<std::endl;
-    //    array->SetNumberOfComponents( 1 );
-    std::cout << "nb compo ok"<<std::endl;
-    // The last param of SetArray is set to 1 to keep the class from deleting the array when it cleans up or reallocates memory.
+    vtkDataArray* array = 0;
+    switch (vtktype)
+      {
+      case VTK_CHAR:
+	array = vtkCharArray::New(); break;
+      case VTK_SIGNED_CHAR:
+	array = vtkSignedCharArray::New(); break;
+      case VTK_UNSIGNED_CHAR:
+	array = vtkUnsignedCharArray::New(); break;
+      case VTK_SHORT:
+	array = vtkShortArray::New(); break;
+      case VTK_UNSIGNED_SHORT:
+	array = vtkUnsignedShortArray::New(); break;
+      case VTK_INT:
+	array = vtkIntArray::New(); break;      
+      case VTK_UNSIGNED_INT:
+	array = vtkUnsignedIntArray::New(); break;
+      case VTK_LONG:
+	array = vtkLongArray::New(); break;
+      case VTK_UNSIGNED_LONG:
+	array = vtkUnsignedLongArray::New(); break;
+      case VTK_FLOAT:
+	array = vtkFloatArray::New(); break;
+      case VTK_DOUBLE:
+	array = vtkDoubleArray::New(); break;
+      default:
+	creaGlobalError("NewVtkImageDataFromRaw : type "
+		  <<vtkTypeTraits<T>::SizedName()
+		  <<" non implemented");
+      }
+    vtkDataArrayTemplate<T>* tarray 
+      		= dynamic_cast<vtkDataArrayTemplate<T>*>(array);
+    array->SetNumberOfComponents( 1 );
     size_t size = (long)nx*(long)ny*(long)nz;
-    std::cout << "SetArray"<<std::endl;
-    array->SetArray( data, size, 1 );
-    //Pay attention in particular to the last param of SetArray:
-    //http://www.vtk.org/doc/nightly/html/classvtkUnsignedShortArray.html#z798_0
-   std::cout << "SetScalars"<<std::endl;
-     image->GetPointData( )->SetScalars( array );
-   std::cout << "Delete"<<std::endl;
+    // The last param of SetArray is set to 1 to keep the class from deleting the array 
+    // when it cleans up or reallocates memory.
+    int dndesa = 0;
+    if (do_not_desalloc)
+    	dndesa = 1;
+    tarray->SetArray( data, size, dndesa );
+    image->GetPointData( )->SetScalars( tarray );
     array->Delete( );
     return image;
   }