Typo.

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 0f45498099b28f4e9172afe84d993b8849d9b3e3..2af9aaf2b5825d8b469ea27fb8c5420f4dbef67d 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/02 09:40:58 $
-  Version:   $Revision: 1.139 $
+  Date:      $Date: 2005/06/03 16:08:16 $
+  Version:   $Revision: 1.140 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -211,6 +211,7 @@ bool DicomDir::Load(std::string const &fileName )
       }
       NewMeta();
       gdcmWarningMacro( "Parse directory and create the DicomDir : " << Filename );
+
       ParseDirectory();
    }
    return true;
@@ -529,14 +530,6 @@ bool DicomDir::AnonymizeDicomDir()
    return true;
 }
 
-
-
-
-
-
-
-
-
 //-----------------------------------------------------------------------------
 // Protected
 /**

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index b15e4ec115334279c0fd46c5f401d4ad27e933b3..3fc1414adf560767ec1e8ec77e98bc0a5c81d16f 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/06/02 14:20:14 $
-  Version:   $Revision: 1.240 $
+  Date:      $Date: 2005/06/03 16:08:16 $
+  Version:   $Revision: 1.241 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -192,26 +192,33 @@ bool File::IsReadable()
    const std::string &res = GetEntryValue(0x0028, 0x0005);
    if ( res != GDCM_UNFOUND && atoi(res.c_str()) > 4 )
    {
+      gdcmWarningMacro("Wrong Image Dimensions" << res);
       return false; // Image Dimensions
    }
    if ( !GetDocEntry(0x0028, 0x0100) )
    {
+      gdcmWarningMacro("Bits Allocated (0028|0100) not found"); 
       return false; // "Bits Allocated"
    }
    if ( !GetDocEntry(0x0028, 0x0101) )
    {
+      gdcmWarningMacro("Bits Stored (0028|0101) not found");
       return false; // "Bits Stored"
    }
    if ( !GetDocEntry(0x0028, 0x0102) )
    {
+      gdcmWarningMacro("Hight Bit (0028|0102) not found"); 
       return false; // "High Bit"
    }
    if ( !GetDocEntry(0x0028, 0x0103) )
    {
+      gdcmWarningMacro("Pixel Representation (0028|0103) not found");
       return false; // "Pixel Representation" i.e. 'Sign'
    }
    if ( !GetDocEntry(GrPixel, NumPixel) )
    {
+      gdcmWarningMacro("Pixel Dicom Element " << std::hex <<
+                        GrPixel << "|" << NumPixel << "not found");
       return false; // Pixel Dicom Element not found :-(
    }
    return true;

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 1d85f6ace2edcf00e2131affec114accb354dff0..893cc48ec86aa8d80841d3f4865a134e3cd8b4f2 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/05/27 21:19:03 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2005/06/03 16:08:16 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -175,19 +175,19 @@ void SerieHelper::SetDirectory(std::string const &dir, bool recursive)
  *          But as I don't know how to do it, I leave it this way
  *          BTW, this is also a Strategy, I don't know this is the best approach :)
  */
-void SerieHelper::OrderFileList(FileList *CoherentFileList)
+void SerieHelper::OrderFileList(FileList *coherentFileList)
 {
-   if( ImagePositionPatientOrdering( CoherentFileList ) )
+   if( ImagePositionPatientOrdering( coherentFileList ) )
    {
       return ;
    }
-   else if( ImageNumberOrdering(CoherentFileList ) )
+   else if( ImageNumberOrdering(coherentFileList ) )
    {
       return ;
    }
    else  
    {
-      FileNameOrdering(CoherentFileList );
+      FileNameOrdering(coherentFileList );
    }
 }
 
@@ -221,7 +221,7 @@ FileList *SerieHelper::GetNextCoherentFileList()
 /**
  * \brief   Get the Coherent Files list according to its Serie UID
  * @param SerieUID SerieUID
- * \return  pointer to the Coherent Filseslist if found, otherwhise NULL
+ * \return  pointer to the Coherent Files list if found, otherwhise NULL
  */
 FileList *SerieHelper::GetCoherentFileList(std::string SerieUID)
 {
@@ -241,6 +241,7 @@ FileList *SerieHelper::GetCoherentFileList(std::string SerieUID)
  *   -# Image Position Patient
  *   -# Image Number
  *   -# More to come :-)
+ * WARNING : FileList = std::vector<File* >
  * @param fileList Coherent File list (same Serie UID) to sort
  * @return false only if the header is bugged !
  */
@@ -422,7 +423,7 @@ bool SerieHelper::FileNameOrdering(FileList *fileList)
 /**
  * \brief   Canonical printer.
  */
-void SerieHelper::Print(std::ostream &os, std::string const & indent)
+void SerieHelper::Print(std::ostream &os, std::string const &indent)
 {
    // For all the Coherent File lists of the gdcm::Serie
    CoherentFileListmap::iterator itl = CoherentFileListHT.begin();

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 4ce6f299be4fbb5414db13e07ed3efaacee633c5..13db02af8e9b6b6e82c55e967830af1a7d3a9762 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/05/27 21:19:04 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/06/03 16:08:16 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,7 +36,7 @@ typedef std::vector<File* > FileList;
  * - This class should be used for a stack of 2D dicom images.
  *   It allows to explore (recursively or not) a directory and 
  *   makes a set of 'Coherent Files' list (coherent : same Serie UID)
- *   It allows to sort any of the Coherent File list on the image postion
+ *   It allows to sort any of the Coherent File list on the image position
  */
 class GDCM_EXPORT SerieHelper 
 {