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++)
{
#if defined USE_GDCM
-void GetXCoherentInfoGdcmReader::Process()
+
+void GetXCoherentInfoGdcmReader::Process2()
{
+ printf("EED GetXCoherentInfoGdcmReader::Process >>>>>> \n" );
+ GDCM_NAME_SPACE::FileList lstFiles;
+ int i,size=bbGetInputIn().size();
+ for (i=0;i<size;i++)
+ {
+ printf("a: %s\n",bbGetInputIn()[i].c_str() );
+ f = GDCM_NAME_SPACE::File::New();
+ f->SetFileName( bbGetInputIn()[i] );
+ bool res = f->Load();
+ if ( res==true )
+ {
+ lstFiles.push_back(f);
+ }
+ } // for
+ sh = GDCM_NAME_SPACE::SerieHelper::New();
+ sh->ImagePositionPatientOrdering( &lstFiles );
+ size=lstFiles.size();
+ for (i=0;i<size;i++)
+ {
+ printf("d: %s\n", lstFiles[i]->GetFileName().c_str() );
+ } // for
+}
+
+void GetXCoherentInfoGdcmReader::Process()
+{
// Read the *first* image file (a SET of file names is given as input)
f = GDCM_NAME_SPACE::File::New();
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;
for(i=0; i< 6; i++)
{
v_iop.push_back(iop[i]);
- }
+ } // for i
bbSetOutputIOP(v_iop );
-
- std::vector<double> v_ipp;
- float ipp[3];
- f->GetImagePositionPatient(ipp);
-
- for(i=0; i< 3; i++)
- {
- v_ipp.push_back(ipp[i]);
- }
- bbSetOutputIPP(v_ipp );
-
-// Add *all the files* to the SerieHelper
- sh = GDCM_NAME_SPACE::SerieHelper::New();
- std::vector<std::string> gii = bbGetInputIn();
-
- for(std::vector<std::string>::iterator it = gii.begin();
- it != gii.end();
- ++it)
- {
- sh->AddFileName(*it);
- }
-
-
- GDCM_NAME_SPACE::FileList::const_iterator it;
- GDCM_NAME_SPACE::FileList *l;
-
- // Should only contain one!
- l = sh->GetFirstSingleSerieUIDFileSet();
-
+
+// EED 2022-12-15
+// std::vector<double> v_ipp;
+// float ipp[3];
+// f->GetImagePositionPatient(ipp);
+// for(i=0; i< 3; i++)
+// {
+// v_ipp.push_back(ipp[i]);
+// } // for i
+// bbSetOutputIPP(v_ipp );
+
+// EED 2023-01-13
+ GDCM_NAME_SPACE::FileList lstFiles;
+ GDCM_NAME_SPACE::FileList *l;
+
+ if (bbGetInputRespectSerieUID()==false)
+ {
+ int i,size=bbGetInputIn().size();
+ for (i=0;i<size;i++)
+ {
+ f = GDCM_NAME_SPACE::File::New();
+ f->SetFileName( bbGetInputIn()[i] );
+ bool res = f->Load();
+ if ( res==true )
+ {
+ lstFiles.push_back(f);
+ }
+ } // for i
+ sh = GDCM_NAME_SPACE::SerieHelper::New();
+ l = &lstFiles;
+ sh->ImagePositionPatientOrdering( l );
+ } else{
+ // Add *all the files* to the SerieHelper
+ sh = GDCM_NAME_SPACE::SerieHelper::New();
+ std::vector<std::string> gii = bbGetInputIn();
+ for(std::vector<std::string>::iterator it = gii.begin();
+ it != gii.end();
+ ++it)
+ {
+ sh->AddFileName(*it);
+ } //for vector
+ GDCM_NAME_SPACE::FileList::const_iterator it;
+ // Should only contain one!
+ l = sh->GetFirstSingleSerieUIDFileSet();
+ if (l==NULL)
+ {
+ return;
+ }
+ } // if bbGetInputForceRead
+
double zspacing = 0.;
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() );
std::string strTagValue; // read on disc
int iTag,sizeDicomTagsVector=bbGetInputDicomTags().size();
GDCM_NAME_SPACE::FileList::const_iterator iitt = l->begin();
- //iitt ++;
- for ( ; iitt != l->end(); ++iitt)
+ float px,py,pz;
+
+ std::vector<std::string> lstFileNames;
+
+ for ( ; iitt != l->end(); ++iitt)
{
+ lstFileNames.push_back( (*iitt)->GetFileName() );
+ // EED 2022-12-15
+ if ( iitt == l->begin() ) // The first ordered element IPP
+ {
+ group = 0;
+ elem = 0;
+ strTagValue = std::string("void");
+ sscanf("D0020_0032","D%04hx_%04hx",&group,&elem);
+ strTagValue = (*iitt)->GetEntryString(group,elem);
+ sscanf(strTagValue.c_str(),"%f\\%f\\%f\\%f", &px , &py , &pz);
+ std::vector<double> v_ipp;
+ v_ipp.push_back( (double)px );
+ v_ipp.push_back( (double)py );
+ v_ipp.push_back( (double)pz );
+ bbSetOutputIPP(v_ipp );
+ } // if first elemetn get IPP
+
MapInfoDicom mapinfodicom;
-
for (iTag=0; iTag<sizeDicomTagsVector; iTag++)
{
key = bbGetInputDicomTags()[iTag];
strTagValue = (*iitt)->GetEntryString(group,elem);
mapinfodicom.insert ( std::pair<std::string,std::string>(key,strTagValue) );
} // for iTag
-
vectormapinfodicom.push_back( mapinfodicom );
} // for iitt
bbSetOutputDicomInfo( vectormapinfodicom );
+ bbSetOutputOutFileNames( lstFileNames );
- if (reader!=NULL)
- {
- reader->Delete();
- 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();
- bbSetOutputOut( reader->GetOutput() );
+ if (bbGetInputReadRaw()==true)
+ {
+ if (reader!=NULL)
+ {
+ reader->Delete();
+ 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();
+ bbSetOutputOut( reader->GetOutput() );
+ } // if bGetInputReadRaw
}
#endif
// endif USE_GDCM
+
#if defined USE_GDCM2
void GetXCoherentInfoGdcmReader::Process()
{
+// printf("GetXCoherentInfoGdcmReader %d files.\n", bbGetInputIn().size() );
// Read the *first* image file (a SET of file names is given as input)
gdcm::Reader *read = new gdcm::Reader();
reader->SetFileName( bbGetInputIn()[0].c_str() );
-
bool res = read->Read();
if ( !res )
{
return;
}
-
-
// Get info from the first image file
const gdcm::File &f = read->GetFile();
int i;
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;
+ std::vector<double> v_ipp;
const gdcm::DataElement &deIpp = f.GetDataSet().GetDataElement(gdcm::Tag((0x0020,0x0032)));
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::bbUserSetDefaultValues()
{
+ reader=NULL;
std::vector<std::string> init;
init.push_back("");
bbSetInputIn(init);
+ bbSetInputReadRaw(true);
+ bbSetInputRespectSerieUID(true);
//reader=NULL; /// \TODO fixme JPR
}
void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
{
-
}
#if defined USE_GDCM
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
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff