X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.cxx;h=bc56a312b4f7872fa1d8a66aa70553171ac8558e;hb=9b08ef2e93023e33dad3326a0c7d6b5db7b72cd4;hp=9e2ad9bba34af51f0946ef9b1d7121fe1ad090a2;hpb=4f1339cf2b02a0b5dbad52de043ec93f86956982;p=gdcm.git

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index 9e2ad9bb..bc56a312 100644
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -4,8 +4,8 @@
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
 
-  Date:      $Date: 2005/04/29 15:11:56 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2005/05/20 08:27:55 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -695,6 +695,9 @@ bool FileHelper::CheckWriteIntegrity()
       int numberBitsAllocated = FileInternal->GetBitsAllocated();
       if ( numberBitsAllocated == 0 || numberBitsAllocated == 12 )
       {
+         gdcmWarningMacro( "numberBitsAllocated changed from " 
+                          << numberBitsAllocated << " to 16 " 
+                          << " for consistency purpose" );
          numberBitsAllocated = 16;
       }
 
@@ -1099,6 +1102,7 @@ BinEntry *FileHelper::CopyBinEntry(uint16_t group, uint16_t elem,
  
 void FileHelper::CheckMandatoryElements()
 {
+
    // just to remember : 'official' 0002 group
 
    //0002 0000 UL 1 Meta Group Length
@@ -1166,7 +1170,49 @@ void FileHelper::CheckMandatoryElements()
       Archive->Push(e_0028_0100);
    }
 
-   // --- Check UID-related Entries ---
+   // Check if user wasn't drunk ;-)
+
+   std::ostringstream s;
+   // check 'Bits Allocated' vs decent values
+   int nbBitsAllocated = FileInternal->GetBitsAllocated();
+   if ( nbBitsAllocated == 0 || nbBitsAllocated > 32)
+   {
+      ValEntry *e_0028_0100 = CopyValEntry(0x0028,0x0100);
+      e_0028_0100->SetValue("16");
+      Archive->Push(e_0028_0100); 
+      gdcmWarningMacro("(0028,0100) changed from "
+         << nbBitsAllocated << " to 16 for consistency purpose");
+      nbBitsAllocated = 16; 
+   }
+   // check 'Bits Stored' vs 'Bits Allocated'   
+   int nbBitsStored = FileInternal->GetBitsStored();
+   if ( nbBitsStored == 0 || nbBitsStored > nbBitsAllocated )
+   {
+      s << nbBitsAllocated;
+      ValEntry *e_0028_0101 = CopyValEntry(0x0028,0x0101);
+      e_0028_0101->SetValue( s.str() );
+      Archive->Push(e_0028_0101);
+      gdcmWarningMacro("(0028,0101) changed from "
+                       << nbBitsStored << " to " << nbBitsAllocated
+                       << " for consistency purpose" );
+      nbBitsStored = nbBitsAllocated; 
+    }
+   // check 'Hight Bit Position' vs 'Bits Allocated' and 'Bits Stored'
+   int highBitPosition = FileInternal->GetHighBitPosition();
+   if ( highBitPosition == 0 || 
+        highBitPosition > nbBitsAllocated-1 ||
+        highBitPosition < nbBitsStored-1  )
+   {
+      ValEntry *e_0028_0102 = CopyValEntry(0x0028,0x0102);
+
+      s << nbBitsStored - 1; 
+      e_0028_0102->SetValue( s.str() );
+      Archive->Push(e_0028_0102);
+      gdcmWarningMacro("(0028,0102) changed from "
+                       << highBitPosition << " to " << nbBitsAllocated-1
+                       << " for consistency purpose");
+   }
+  // --- Check UID-related Entries ---
 
    // If 'SOP Class UID' exists ('true DICOM' image)
    // we create the 'Source Image Sequence' SeqEntry
@@ -1176,7 +1222,7 @@ void FileHelper::CheckMandatoryElements()
    if ( e_0008_0016 != 0 )
    {
       // Create 'Source Image Sequence' SeqEntry
-      SeqEntry *s = new SeqEntry (
+      SeqEntry *sis = new SeqEntry (
             Global::GetDicts()->GetDefaultPubDict()->GetEntry(0x0008, 0x2112) );
       SQItem *sqi = new SQItem(1);
       // (we assume 'SOP Instance UID' exists too) 
@@ -1193,9 +1239,9 @@ void FileHelper::CheckMandatoryElements()
       e_0008_1155->SetValue( e_0008_0018->GetValue());
       sqi->AddEntry(e_0008_1155);
 
-      s->AddSQItem(sqi,1); 
+      sis->AddSQItem(sqi,1); 
       // temporarily replaces any previous 'Source Image Sequence' 
-      Archive->Push(s);
+      Archive->Push(sis);
  
       // 'Image Type' (The written image is no longer an 'ORIGINAL' one)
       ValEntry *e_0008_0008 = CopyValEntry(0x0008,0x0008);
@@ -1370,6 +1416,24 @@ void FileHelper::RestoreWriteMandatory()
    Archive->Restore(0x0002,0x0016);
    Archive->Restore(0x0002,0x0100);
    Archive->Restore(0x0002,0x0102);
+
+   Archive->Restore(0x0008,0x0012);
+   Archive->Restore(0x0008,0x0013);
+   Archive->Restore(0x0008,0x0016);
+   Archive->Restore(0x0008,0x0018);
+   Archive->Restore(0x0008,0x0060);
+   Archive->Restore(0x0008,0x0070);
+   Archive->Restore(0x0008,0x0080);
+   Archive->Restore(0x0008,0x0090);
+   Archive->Restore(0x0008,0x2112);
+
+   Archive->Restore(0x0010,0x0010);
+   Archive->Restore(0x0010,0x0030);
+   Archive->Restore(0x0010,0x0040);
+
+   Archive->Restore(0x0020,0x000d);
+   Archive->Restore(0x0020,0x000e);
+
 }
 
 //-----------------------------------------------------------------------------