#3493 BUG IPP bbgdcmvtk GetXCoherentInfoGdcmReader box

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetXCoherentInfoGdcmReader.cxx

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index e553a6767bf18b87f86a6400daee1e241d3c3ae8..a094ff7755079e1bac4ebe2a4c10ddce853e38e0 100644 (file)
--- 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,9 +140,12 @@ 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)
+       {       
+               return;
+       }
 
    double zspacing = 0.;
    sh->OrderFileList(l); // this one should compute the *actual* Z Spacing!
@@ -163,12 +166,27 @@ 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++)
                {
                        key = bbGetInputDicomTags()[iTag];
@@ -180,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
@@ -205,10 +225,10 @@ 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() );
-  
        bool res = read->Read();  
        if ( !res )
        {
@@ -217,8 +237,6 @@ void GetXCoherentInfoGdcmReader::Process()
        return;
        }
     
-
-
  // Get info from the first image file
    const gdcm::File &f = read->GetFile();
    int i;
@@ -229,17 +247,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
@@ -287,16 +305,16 @@ void GetXCoherentInfoGdcmReader::Process()
 
 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
 {
-       reader=NULL;
+   reader=NULL;
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);  
+   bbSetInputReadRaw(true);  
    //reader=NULL;   /// \TODO fixme JPR
 }
 
 void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
 {
-       
 }
 
 #if defined USE_GDCM