From bfb05457f0fad7329768d34492a2a2149195471a Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 24 Feb 2009 20:34:01 +0000
Subject: [PATCH] *** empty log message ***

---
 cmake/CREAMacro_FindAndUseLibraries.cmake | 14 ++++++++++++++
 src/creaVtk.h                             |  4 +++-
 src/creaVtk.txx                           | 22 ++++++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index a5954de..77273c2 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -18,6 +18,20 @@ ENDIF(USE_CREA)
 #-----------------------------------------------------------------------------
 
 
+#-----------------------------------------------------------------------------
+IF(USE_QT4)
+  IF(NOT Qt4_FOUND)
+    FIND_PACKAGE(Qt4 REQUIRED)
+    INCLUDE(${QT_USE_FILE})
+    CREA_DEFINE( USE_QT )
+    #    SET(QT_LIBRARIES
+    #      ${QT_LIBRARIES}
+    #      ) 
+    #  MARK_AS_ADVANCED(Qt4_DIR)
+  ENDIF(NOT Qt4_FOUND)
+ENDIF(USE_QT4)
+#-----------------------------------------------------------------------------
+
 #-----------------------------------------------------------------------------
 IF(USE_VTK)
   INCLUDE(${CREA_CMAKE_DIR}/CREAMacro_FindAndUseVTK.cmake)
diff --git a/src/creaVtk.h b/src/creaVtk.h
index 175769e..3b205d1 100644
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -11,7 +11,9 @@ namespace crea
 
   template <class T>
   vtkImageData* CREA_EXPORT NewVtkImageDataFromRaw( T* data,
-						    size_t size);
+						    int nx, 
+						    int ny,
+						    int nz);
 
   template <class T>
   vtkIdType GetVtkIdType(T&) { return VTK_VOID; }
diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index a7d6a04..4d39387 100644
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -1,25 +1,39 @@
 #include <vtkDataArrayTemplate.h>
 #include <vtkPointData.h>
-
+#include <typeinfo> 
 namespace crea
 {
   
   template <class T>
   vtkImageData* CREA_EXPORT NewVtkImageDataFromRaw( T* data,
-						    size_t size)
+						    int nx, 
+						    int ny,
+						    int nz)
   {
+    std::cout << "NV "<<nx<<" " <<ny<<" " << nz<<std::endl;
+    std::cout << typeid(T).name() << std::endl;
     vtkImageData *image = vtkImageData::New();    
     image->SetNumberOfScalarComponents(1);
     image->SetScalarType(GetVtkIdType<T>(*data));
+    image->SetDimensions(nx,ny,nz);
+    image->SetSpacing(1,1,1);
+    std::cout << "alloc"<<std::endl;
     image->AllocateScalars();
+    std::cout << "alloc ok"<<std::endl;
     vtkDataArrayTemplate<T>* array 
       = (vtkDataArrayTemplate<T>*)vtkDataArrayTemplate<T>::New();
-    array->SetNumberOfComponents( 1 );
+    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.
+    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
-    image->GetPointData( )->SetScalars( array );
+   std::cout << "SetScalars"<<std::endl;
+     image->GetPointData( )->SetScalars( array );
+   std::cout << "Delete"<<std::endl;
     array->Delete( );
     return image;
   }
-- 
2.45.1