According to Benoit's suggestion, and without any objection from anybody

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index cd6ec36b48bc77078dffe8723c58d6c785a33137..96fe85f43345dcd0c31df36247d1a796a238179c 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 20:03:27 $
-  Version:   $Revision: 1.183 $
+  Date:      $Date: 2005/01/08 15:03:59 $
+  Version:   $Revision: 1.187 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -255,8 +255,7 @@ size_t File::GetImageDataIntoVector (void *destination, size_t maxSize)
    {
       if ( PixelReadConverter->GetRGBSize() > maxSize )
       {
-         dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
-                        "than caller's expected MaxSize");
+         gdcmVerboseMacro( "Pixel data bigger than caller's expected MaxSize");
          return 0;
       }
       memcpy( destination,
@@ -268,8 +267,7 @@ size_t File::GetImageDataIntoVector (void *destination, size_t maxSize)
    // Either no LUT conversion necessary or LUT conversion failed
    if ( PixelReadConverter->GetRawSize() > maxSize )
    {
-      dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
-                     "than caller's expected MaxSize");
+      gdcmVerboseMacro( "Pixel data bigger than caller's expected MaxSize");
       return 0;
    }
    memcpy( destination,
@@ -373,16 +371,29 @@ bool File::WriteRawData(std::string const &fileName)
   std::ofstream fp1(fileName.c_str(), std::ios::out | std::ios::binary );
    if (!fp1)
    {
-      dbg.Verbose(2, "Fail to open (write) file:", fileName.c_str());
+      gdcmVerboseMacro( "Fail to open (write) file:" << fileName.c_str());
       return false;
    }
 
-   if(PixelWriteConverter->GetUserData())
-      fp1.write((char*)PixelWriteConverter->GetUserData(), PixelWriteConverter->GetUserDataSize());
-   else if(PixelReadConverter->GetRGB())
-      fp1.write((char*)PixelReadConverter->GetRGB(), PixelReadConverter->GetRGBSize());
-   else if(PixelReadConverter->GetRaw())
-      fp1.write((char*)PixelReadConverter->GetRaw(), PixelReadConverter->GetRawSize());
+   if( PixelWriteConverter->GetUserData() )
+   {
+      fp1.write( (char*)PixelWriteConverter->GetUserData(), 
+                 PixelWriteConverter->GetUserDataSize() );
+   }
+   else if ( PixelReadConverter->GetRGB() )
+   {
+      fp1.write( (char*)PixelReadConverter->GetRGB(), 
+                 PixelReadConverter->GetRGBSize());
+   }
+   else if ( PixelReadConverter->GetRaw() )
+   {
+      fp1.write( (char*)PixelReadConverter->GetRaw(), 
+                 PixelReadConverter->GetRawSize());
+   }
+   else
+   {
+      gdcmErrorMacro( "Nothing written." );
+   }
 
    fp1.close();
 
@@ -519,10 +530,10 @@ bool File::Write(std::string const &fileName)
  * @param   group     group number of the Dicom Element to modify
  * @param   element element number of the Dicom Element to modify
  */
-bool File::SetEntryByNumber(std::string const &content,
-                            uint16_t group, uint16_t element)
+bool File::SetEntry(std::string const &content,
+                    uint16_t group, uint16_t element)
 { 
-   return HeaderInternal->SetEntryByNumber(content,group,element);
+   return HeaderInternal->SetEntry(content,group,element);
 }
 
 
@@ -535,10 +546,10 @@ bool File::SetEntryByNumber(std::string const &content,
  * @param   group     group number of the Dicom Element to modify
  * @param   element element number of the Dicom Element to modify
  */
-bool File::SetEntryByNumber(uint8_t *content, int lgth,
-                            uint16_t group, uint16_t element)
+bool File::SetEntry(uint8_t *content, int lgth,
+                    uint16_t group, uint16_t element)
 {
-   return HeaderInternal->SetEntryByNumber(content,lgth,group,element);
+   return HeaderInternal->SetEntry(content,lgth,group,element);
 }
 
 /**
@@ -550,10 +561,10 @@ bool File::SetEntryByNumber(uint8_t *content, int lgth,
  * \return  pointer to the modified/created Header Entry (NULL when creation
  *          failed).
  */ 
-bool File::ReplaceOrCreateByNumber(std::string const &content,
-                                   uint16_t group, uint16_t element)
+bool File::ReplaceOrCreate(std::string const &content,
+                           uint16_t group, uint16_t element)
 {
-   return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL;
+   return HeaderInternal->ReplaceOrCreate(content,group,element) != NULL;
 }
 
 /*
@@ -566,10 +577,10 @@ bool File::ReplaceOrCreateByNumber(std::string const &content,
  * \return  pointer to the modified/created Header Entry (NULL when creation
  *          failed).
  */
-bool File::ReplaceOrCreateByNumber(uint8_t *binArea, int lgth,
-                                   uint16_t group, uint16_t element)
+bool File::ReplaceOrCreate(uint8_t *binArea, int lgth,
+                           uint16_t group, uint16_t element)
 {
-   return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL;
+   return HeaderInternal->ReplaceOrCreate(binArea,lgth,group,element) != NULL;
 }
 
 /**
@@ -615,18 +626,16 @@ bool File::CheckWriteIntegrity()
          case WMODE_RAW :
             if( decSize!=PixelWriteConverter->GetUserDataSize() )
             {
-               dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect (Raw)");
-               //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (Raw)\n"
-               //          << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n";
+               gdcmVerboseMacro( "Data size is incorrect (Raw)" << decSize 
+                    << " / " << PixelWriteConverter->GetUserDataSize() );
                return false;
             }
             break;
          case WMODE_RGB :
             if( rgbSize!=PixelWriteConverter->GetUserDataSize() )
             {
-               dbg.Verbose(0, "File::CheckWriteIntegrity: Data size is incorrect (RGB)");
-               //std::cerr << "File::CheckWriteIntegrity: Data size is incorrect (RGB)\n"
-               //          << decSize << " / " << PixelWriteConverter->GetUserDataSize() << "\n";
+               gdcmVerboseMacro( "Data size is incorrect (RGB)" << decSize
+                   << " / " << PixelWriteConverter->GetUserDataSize() );
                return false;
             }
             break;
@@ -792,9 +801,9 @@ void File::RestoreWriteFileType()
 void File::SetWriteToLibido()
 {
    ValEntry *oldRow = dynamic_cast<ValEntry *>
-                (HeaderInternal->GetDocEntryByNumber(0x0028, 0x0010));
+                (HeaderInternal->GetDocEntry(0x0028, 0x0010));
    ValEntry *oldCol = dynamic_cast<ValEntry *>
-                (HeaderInternal->GetDocEntryByNumber(0x0028, 0x0011));
+                (HeaderInternal->GetDocEntry(0x0028, 0x0011));
    
    if( oldRow && oldCol )
    {
@@ -821,7 +830,7 @@ void File::SetWriteToLibido()
 void File::SetWriteToNoLibido()
 {
    ValEntry *recCode = dynamic_cast<ValEntry *>
-                (HeaderInternal->GetDocEntryByNumber(0x0008,0x0010));
+                (HeaderInternal->GetDocEntry(0x0008,0x0010));
    if( recCode )
    {
       if( recCode->GetValue() == "ACRNEMA_LIBIDO_1.1" )
@@ -842,7 +851,7 @@ void File::RestoreWriteOfLibido()
 
 ValEntry *File::CopyValEntry(uint16_t group,uint16_t element)
 {
-   DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element);
+   DocEntry *oldE = HeaderInternal->GetDocEntry(group, element);
    ValEntry *newE;
 
    if(oldE)
@@ -852,7 +861,7 @@ ValEntry *File::CopyValEntry(uint16_t group,uint16_t element)
    }
    else
    {
-      newE = GetHeader()->NewValEntryByNumber(group,element);
+      newE = GetHeader()->NewValEntry(group,element);
    }
 
    return(newE);
@@ -860,7 +869,7 @@ ValEntry *File::CopyValEntry(uint16_t group,uint16_t element)
 
 BinEntry *File::CopyBinEntry(uint16_t group,uint16_t element)
 {
-   DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element);
+   DocEntry *oldE = HeaderInternal->GetDocEntry(group, element);
    BinEntry *newE;
 
    if(oldE)
@@ -870,7 +879,7 @@ BinEntry *File::CopyBinEntry(uint16_t group,uint16_t element)
    }
    else
    {
-      newE = GetHeader()->NewBinEntryByNumber(group,element);
+      newE = GetHeader()->NewBinEntry(group,element);
    }
 
    return(newE);
@@ -910,8 +919,7 @@ uint8_t *File::GetRaw()
       raw = PixelReadConverter->GetRaw();
       if ( ! raw )
       {
-         dbg.Verbose(0, "File::GetRaw: read/decompress of "
-                        "pixel data apparently went wrong.");
+         gdcmVerboseMacro( "Read/decompress of pixel data apparently went wrong.");
          return 0;
       }
    }