*/
-
-#include <vtkDataArrayTemplate.h>
+//EED 2022-07-21
+// https://www.slicer.org/wiki/Documentation/Labs/VTK7
+// #include <vtkDataArrayTemplate.h>
+ #include <vtkAOSDataArrayTemplate.h>
#include <vtkCharArray.h>
#include <vtkSignedCharArray.h>
#include <creaMessageManager.h>
namespace crea
{
- template <class T>
+ template <typename T>
/*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data,
int nx,
int ny,
// Shouldn't we pass NumberOfScalarComponents to deal with RGB, RGBA images as well? // JPR
- image->SetNumberOfScalarComponents(1);
int vtktype = vtkTypeTraits<T>::VTKTypeID();
- image->SetScalarType(vtktype);
image->SetDimensions(nx, ny ,nz);
image->SetSpacing(1, 1, 1);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5)
+ image->SetNumberOfScalarComponents(1);
+ image->SetScalarType(vtktype);
image->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6)
+ image->AllocateScalars(vtktype,1);
+#endif
+
+
vtkDataArray* array = 0;
switch (vtktype)
{
<<vtkTypeTraits<T>::SizedName()
<<" non implemented");
}
- vtkDataArrayTemplate<T>* tarray
- = dynamic_cast<vtkDataArrayTemplate<T>*>(array);
+
+//EED 2022-07-21
+// https://www.slicer.org/wiki/Documentation/Labs/VTK7
+// vtkDataArrayTemplate<T>* tarray = dynamic_cast<vtkDataArrayTemplate<T>*>(array);
+ vtkAOSDataArrayTemplate<T>* tarray = dynamic_cast<vtkAOSDataArrayTemplate<T>*>(array);
+
array->SetNumberOfComponents( 1 );
size_t size = (long)nx*(long)ny*(long)nz;
// The last param of SetArray is set to 1 to keep the class from deleting the array