X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=2bbf54205c3d2cb9b3e58a091ea1a840de45d107;hb=1709248f43dcb7745909d1d59109f553ee0ae700;hp=c1d16ba58fb15afc84ccce9badb0f3705362fa51;hpb=e269992d2d446784afc40073782311deaa25008f;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index c1d16ba..2bbf542 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -87,7 +87,6 @@ vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage()
 #if defined USE_GDCM
 void GetXCoherentInfoGdcmReader::Process()
 {
-
  // Read the *first* image file (a SET of file names is given as input) 
    f = GDCM_NAME_SPACE::File::New();
 
@@ -97,7 +96,7 @@ void GetXCoherentInfoGdcmReader::Process()
 	} else {
 		f->SetFileName( "" );
 	} // if
-   
+
    bool res = f->Load();  
    if ( !res )
    {
@@ -106,6 +105,7 @@ void GetXCoherentInfoGdcmReader::Process()
       	bbSetOutputOut( CreateDefaultImage() );
       	return;
    } // if res
+
  // Get info from the first image file
    int i;
    std::vector<double> v_iop;
@@ -131,7 +131,7 @@ void GetXCoherentInfoGdcmReader::Process()
 // 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)
@@ -139,16 +139,18 @@ void GetXCoherentInfoGdcmReader::Process()
       sh->AddFileName(*it);
    } //for vector
 
-
    GDCM_NAME_SPACE::FileList::const_iterator it;
    GDCM_NAME_SPACE::FileList *l;
 
    // Should only contain one!
    l = sh->GetFirstSingleSerieUIDFileSet();
 
-   int nbFiles;
-   double zspacing 	= 0.;
-   nbFiles 			= l->size() ;
+	if (l==NULL)
+	{	
+		return;
+	}
+
+   double zspacing = 0.;
    sh->OrderFileList(l); // this one should compute the *actual* Z Spacing!
    zspacing 		= sh->GetZSpacing();
    std::vector<double> v_pixelspacing;
@@ -159,21 +161,51 @@ void GetXCoherentInfoGdcmReader::Process()
 //      v_pixelspacing.push_back(f->GetZSpacing());
 //   }
    bbSetOutputPixelSpacing(v_pixelspacing);
-   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();
 
-printf("EED GetXCoherentInfoGdcmReader::Process \n");
-   bbSetOutputOut( reader->GetOutput() );
+	VectorMapInfoDicom vectormapinfodicom;
+	uint16_t group;
+	uint16_t elem;
+	std::string key;
+	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)
+   	{
+		MapInfoDicom mapinfodicom;
+	  	for (iTag=0; iTag<sizeDicomTagsVector; iTag++)
+		{
+			key = bbGetInputDicomTags()[iTag];
+			group = elem = 0;
+			if ( (key.size()==10) && (key[0] == 'D') && (key[5] == '_') )
+			{
+			 	sscanf(key.c_str(),"D%04hx_%04hx ",&group,&elem);  
+			}// if key
+		  	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 );
+
+	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
@@ -184,7 +216,6 @@ void GetXCoherentInfoGdcmReader::Process()
  // 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 )
    	{
@@ -193,8 +224,6 @@ void GetXCoherentInfoGdcmReader::Process()
       	return;
    	}
     
-
-
  // Get info from the first image file
    const gdcm::File &f = read->GetFile();
    int i;
@@ -205,17 +234,17 @@ void GetXCoherentInfoGdcmReader::Process()
    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]));
-	}
+   }
    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
@@ -263,9 +292,11 @@ void GetXCoherentInfoGdcmReader::Process()
 
 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
 {
+   reader=NULL;
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);  
+   bbSetInputReadRaw(true);  
    //reader=NULL;   /// \TODO fixme JPR
 }