sizeZ = 1;
vtkImageData *newImage = vtkImageData::New();
newImage->Initialize();
- newImage->SetScalarTypeToUnsignedChar();
newImage->SetSpacing( 1,1,1 );
newImage->SetDimensions( sizeX,sizeY,sizeZ );
- newImage->SetWholeExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 );
newImage->SetExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ newImage->SetWholeExtent(0, sizeX-1,0,sizeY-1,0,sizeZ-1 );
+ newImage->SetScalarTypeToUnsignedChar();
newImage->SetNumberOfScalarComponents(1);
newImage->AllocateScalars();
newImage->Update();
+#else
+ newImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
+
memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 );
for (i=0; i<sizeX; i++)
{
f->SetFileName( bbGetInputIn()[0] );
} else {
f->SetFileName( "" );
- }
+ } // if
bool res = f->Load();
if ( !res )
f->Delete();
bbSetOutputOut( CreateDefaultImage() );
return;
- }
+ } // if res
// Get info from the first image file
int i;
std::vector<double> v_iop;
f->GetImageOrientationPatient(iop);
for(i=0; i< 6; i++)
+ {
v_iop.push_back(iop[i]);
+ } // for i
bbSetOutputIOP(v_iop );
std::vector<double> v_ipp;
f->GetImagePositionPatient(ipp);
for(i=0; i< 3; i++)
+ {
v_ipp.push_back(ipp[i]);
+ } // for i
bbSetOutputIPP(v_ipp );
// Add *all the files* to the SerieHelper
++it)
{
sh->AddFileName(*it);
- }
+ } //for vector
GDCM_NAME_SPACE::FileList::const_iterator it;
l = sh->GetFirstSingleSerieUIDFileSet();
int nbFiles;
- double zspacing = 0.;
- nbFiles = l->size() ;
+ double zspacing = 0.;
+ nbFiles = l->size() ;
sh->OrderFileList(l); // this one should compute the *actual* Z Spacing!
- zspacing = sh->GetZSpacing();
+ zspacing = sh->GetZSpacing();
std::vector<double> v_pixelspacing;
v_pixelspacing.push_back( f->GetXSpacing() );
v_pixelspacing.push_back( f->GetYSpacing() );
// v_pixelspacing.push_back(f->GetZSpacing());
// }
bbSetOutputPixelSpacing(v_pixelspacing);
-
if (reader!=NULL)
{
reader->Delete();
- reader=NULL;
+ reader = NULL;
}
reader = vtkGdcmReader::New();
-
//EED 21 mars 2012 FLIP probleme ..PLOP..
reader->SetFlipY(false);
-
-
//reader->SetFileName( bbGetInputIn().c_str() );
reader->SetCoherentFileList(l);
reader->Update();
+ reader->GetOutput();
+
+printf("EED GetXCoherentInfoGdcmReader::Process \n");
bbSetOutputOut( reader->GetOutput() );
}
#endif
gdcm::Element<gdcm::VR::DS,gdcm::VM::VM6> iop;
iop.Read( ss );
for(i=0; i< 6; i++)
- v_iop.push_back((float)(iop[i]));
+ {
+ v_iop.push_back((float)(iop[i]));
+ }
bbSetOutputIOP(v_iop );
std::vector<double> v_ipp;
deIpp.GetValue().Print(ss);
gdcm::Element<gdcm::VR::DS,gdcm::VM::VM3> ipp;
ipp.Read( ss );
- for(i=0; i< 3; i++)
+ for(i=0; i< 3; i++)
+ {
v_ipp.push_back((float)(ipp[i]));
+ } // for 3
bbSetOutputIPP(v_ipp );
// Add *all the files* to the IPPsorter
void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing()
{
if(reader)
+ {
reader->Delete();
+ } // if reader
if(f)
+ {
f->Delete();
+ } // if f
if(sh)
+ {
sh->Delete();
+ } // if sh
}
#endif
void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing()
{
if(reader)
+ {
reader->Delete();
+ }
}
#endif