//=====================================================================
ImageReader::ImageReader()
:
- mUnreadableImage(0),
+ mUnreadableImage(NULL),
mLastFilename("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
{
// std::cout << "#### ImageReader::ImageReader()"<<std::endl;
- if (mUnreadableImage!=0) return;
+ if (mUnreadableImage!=NULL) return;
Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New() , "PNG", ".png")));
- Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg")));
- Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New())));
- Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New())));
+ Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "TIFF", ".tiff")));
+ Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New(), "JPEG", ".jpeg")));
+ Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New(), "BMP", ".bmp")));
Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkSLCReader::New())));
Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkMetaImageReader::New(),"MHD",".mhd")));
// Register(new VtkImageReader(vtkGESignalReader::New()));
dim[0] = dim[1] = 128;
dim[2] = 1;
mUnreadableImage->SetDimensions ( dim );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
mUnreadableImage->SetScalarTypeToUnsignedChar();
- mUnreadableImage->AllocateScalars();
+ mUnreadableImage->AllocateScalars();
+#else
+ mUnreadableImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
+
for (int i=0;i<dim[0];i++)
- for (int j=0;j<dim[1];j++)
- mUnreadableImage->SetScalarComponentFromFloat(i,j,0,0,0);
+ {
+ for (int j=0;j<dim[1];j++)
+ {
+ mUnreadableImage->SetScalarComponentFromFloat(i,j,0,0,0);
+ } // for j
+ } // for i
+
for (int i=0;i<dim[0];i++)
- {
- mUnreadableImage->SetScalarComponentFromFloat(i,i,0,0,255);
- mUnreadableImage->SetScalarComponentFromFloat(dim[0]-1-i,i,0,0,255);
- }
+ {
+ mUnreadableImage->SetScalarComponentFromFloat(i,i,0,0,255);
+ mUnreadableImage->SetScalarComponentFromFloat(dim[0]-1-i,i,0,0,255);
+ } // for i
}
//=====================================================================
//delete (*i);
// }
// mReader.clear();
- if (mUnreadableImage!=0)
- {
- mUnreadableImage->Delete();
- mUnreadableImage = 0;
- }
+ if (mUnreadableImage!=NULL)
+ {
+ mUnreadableImage->Delete();
+ mUnreadableImage = NULL;
+ }
}
//=====================================================================
void ImageReader::Register(boost::shared_ptr<AbstractImageReader> r)
{
mReader.push_back(r);
-
}
void ImageReader::UnRegister(const std::string i_val)
std::vector<std::string >::iterator i ;
for (i=mUnReader.begin(); i!=mUnReader.end(); i++)
{
-
if ( (*i).c_str() == filename)
{
ok = false;
// Returns true iff the file is readable
bool ImageReader::CanRead( const std::string& filename )
{
+
bool ok = false;
if( !ShallNotRead(filename))
// Reads the file (CanRead must be called before : no test here)
vtkImageData* ImageReader::ReadImage( const std::string& filename)
{
- if (mLastFilename!=filename)
- {
- if (!CanRead(filename))
- {
- vtkImageData* im = vtkImageData::New();
- im->ShallowCopy(mUnreadableImage);
- return im;
- }
- }
- vtkImageData* i = mLastReader->ReadImage(mLastFilename);
- if (i==0)
- {
- i = vtkImageData::New();
- i->ShallowCopy(mUnreadableImage);
- }
- return i;
+ if (mLastFilename!=filename)
+ {
+ if (!CanRead(filename))
+ {
+ vtkImageData* im = vtkImageData::New();
+ im->ShallowCopy(mUnreadableImage);
+ return im;
+ } // CanRead
+ } // for mLastFilename
+ vtkImageData* i = mLastReader->ReadImage(mLastFilename);
+ if (i==NULL)
+ {
+ i = vtkImageData::New();
+ i->ShallowCopy(mUnreadableImage);
+ } // i
+
+ return i;
}
//=====================================================================
// Another function to read attributes for a file