* gdcmDirList : to parse a hard drive directory in recursive (or not)

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 6dfb630cf92002c072039c36509d3b5d9eb1fc8a..a48f1a5423fed18a7a8192376a369a9fbec45d57 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -4,6 +4,8 @@
 #include "gdcmUtil.h"
 #include "jpeg/ljpg/jpegless.h"
 
+typedef std::pair<TagHeaderEntryHT::iterator,TagHeaderEntryHT::iterator> IterHT;
+
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -26,6 +28,7 @@
 gdcmFile::gdcmFile(gdcmHeader *header) {
    Header=header;
    SelfHeader=false;
+   PixelRead=-1; // no ImageData read yet.
 
    if (Header->IsReadable())
       SetPixelDataSizeFromHeader();
@@ -48,6 +51,7 @@ gdcmFile::gdcmFile(gdcmHeader *header) {
 gdcmFile::gdcmFile(std::string & filename) {
    Header=new gdcmHeader(filename.c_str());
    SelfHeader=true;
+   PixelRead=-1; // no ImageData read yet.
 
    if (Header->IsReadable())
       SetPixelDataSizeFromHeader();
@@ -56,6 +60,7 @@ gdcmFile::gdcmFile(std::string & filename) {
 gdcmFile::gdcmFile(const char * filename) {
    Header=new gdcmHeader(filename);
    SelfHeader=true;
+   PixelRead=-1; // no ImageData read yet.
 
    if (Header->IsReadable())
       SetPixelDataSizeFromHeader();
@@ -181,6 +186,7 @@ void * gdcmFile::GetImageData (void) {
    PixelData = (void *) malloc(lgrTotale);
    if (PixelData)
       GetImageDataIntoVector(PixelData, lgrTotale);
+   PixelRead=0; // no PixelRaw
    return(PixelData);
 }
 
@@ -207,7 +213,7 @@ void * gdcmFile::GetImageData (void) {
  */
 size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
    size_t l = GetImageDataIntoVectorRaw (destination, MaxSize);
-   
+   PixelRead=0 ; // no PixelRaw
    if (!Header->HasLUT())
       return lgrTotale; 
                             
@@ -275,6 +281,7 @@ void * gdcmFile::GetImageDataRaw (void) {
    PixelData = (void *) malloc(lgrTotale);
    if (PixelData)
       GetImageDataIntoVectorRaw(PixelData, lgrTotale);
+   PixelRead=1; // PixelRaw
    return(PixelData);
 }
 
@@ -306,6 +313,7 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
 
    int nb, nbu, highBit, signe;
    std::string str_nbFrames, str_nb, str_nbu, str_highBit, str_signe;
+   PixelRead=1 ; // PixelRaw
  
    if ( lgrTotale > MaxSize ) {
       dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: pixel data bigger"
@@ -555,7 +563,7 @@ bool gdcmFile::WriteRawData (std::string fileName) {
    FILE * fp1;
    fp1 = fopen(fileName.c_str(),"wb");
    if (fp1 == NULL) {
-      printf("Echec ouverture (ecriture) Fichier [%s] \n",fileName.c_str());
+      printf("Fail to open (write) file [%s] \n",fileName.c_str());
       return (false);
    }   
    fwrite (PixelData,lgrTotale, 1, fp1);
@@ -634,6 +642,13 @@ bool gdcmFile::WriteAcr (std::string fileName) {
 bool gdcmFile::WriteBase (std::string fileName, FileType type) {
 
    FILE * fp1;
+   
+   if (PixelRead==-1 && type != DICOMDIR) {
+      std::cout << "U never Read the pixels; U cannot write the file" 
+                << std::endl;
+      return false;               
+   }
+
    fp1 = fopen(fileName.c_str(),"wb");
    if (fp1 == NULL) {
       printf("Failed to open (write) File [%s] \n",fileName.c_str());
@@ -655,6 +670,9 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
    // if recognition code tells us we dealt with a LibIDO image
    // we reproduce on disk the switch between lineNumber and columnNumber
    // just before writting ...
+   
+   // TODO : the best trick would be *change* the recognition code
+   //        but pb expected if user deals with, e.g. COMPLEX images
 
    std::string rows, columns; 
    if ( Header->GetFileType() == ACR_LIBIDO){
@@ -664,7 +682,38 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
          Header->SetEntryByNumber(rows   ,  0x0028, 0x0011);
    }   
    // ----------------- End of Special Patch ----------------
+   
+   // TODO : get the grPixel, numPixel values (for some ACR-NEMA images only)
+   
+   guint16 grPixel =Header->GetGrPixel();
+   guint16 numPixel=Header->GetNumPixel();;
+    
+   // Update Pixel Data Length
+   // the *last* of the (GrPixel, NumPixel), if many.
+          
+   TagKey key = gdcmDictEntry::TranslateToKey(grPixel, numPixel); 
+   TagHeaderEntryHT::iterator p2;
+   gdcmHeaderEntry * PixelElement;
+   
+   IterHT it= Header->GetEntry().equal_range(key); // get a pair of iterators first-last synonym   
 
+   if (Header->GetEntry().count(key) == 1) // only the first is significant
+      p2=it.first; // iterator on the first (unique) synonym
+   else
+      p2=it.second;// iterator on the last synonym
+   
+   PixelElement=p2->second;        // H Table target column (2-nd col)
+  // PixelElement->SetPrintLevel(2);
+  // PixelElement->Print();      
+ 
+   if (PixelRead==1)
+      PixelElement->SetLength(lgrTotaleRaw);
+   else if (PixelRead==0)
+      PixelElement->SetLength(lgrTotale);
+   
+   //PixelElement->SetPrintLevel(2);
+   //PixelElement->Print();    
+ 
    Header->Write(fp1, type);
 
    // --------------------------------------------------------------
@@ -678,7 +727,7 @@ bool gdcmFile::WriteBase (std::string fileName, FileType type) {
          Header->SetEntryByNumber(columns, 0x0028, 0x0011);
    }   
    // ----------------- End of Special Patch ----------------
-
+   
    fwrite(PixelData, lgrTotale, 1, fp1);
    fclose (fp1);
    return(true);