X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=a094ff7755079e1bac4ebe2a4c10ddce853e38e0;hb=3915df27234aa815febbb24195c426c1f73f8f91;hp=e09b38ad76babdbde24a6467eac2807a2d378957;hpb=4ae4c8a57a71c86165a9889e2569e249197f48c0;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index e09b38a..a094ff7 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -105,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;
@@ -116,21 +117,20 @@ void GetXCoherentInfoGdcmReader::Process()
       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]);
-	} // for i
-   bbSetOutputIPP(v_ipp );
+    
+// 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 );
 
 // 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)
@@ -140,13 +140,10 @@ void GetXCoherentInfoGdcmReader::Process()
 
    GDCM_NAME_SPACE::FileList::const_iterator it;
    GDCM_NAME_SPACE::FileList *l;
-
    // Should only contain one!
    l = sh->GetFirstSingleSerieUIDFileSet();
-
 	if (l==NULL)
 	{	
-		printf("EED GetXCoherentInfoGdcmReader::Process Warnning not coherent list/file \n");
 		return;
 	}
 
@@ -169,10 +166,26 @@ void GetXCoherentInfoGdcmReader::Process()
 	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;
+    
+    for ( ; iitt != l->end(); ++iitt)
    	{
+        // 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++)
 		{
@@ -185,24 +198,26 @@ void GetXCoherentInfoGdcmReader::Process()
 		  	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 (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 (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
@@ -210,6 +225,7 @@ void GetXCoherentInfoGdcmReader::Process()
 #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() );
@@ -293,12 +309,12 @@ void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);  
+   bbSetInputReadRaw(true);  
    //reader=NULL;   /// \TODO fixme JPR
 }
 
 void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
 {
-	
 }
 
 #if defined USE_GDCM