Some minor comments modifications

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index ca7ee0f5feace1bbd7c829219df895a8075d6527..8b58c4a8c422408c6e9361219d71db0f01e93376 100644 (file)
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(ALL_DICTS
   #NIH.dic     #the forbidden one...
   #  SPI.dic
   #  PHILIPS-Intera.dic # uncomment me if you want
-  GEMS.dic
+  #GEMS.dic #Commented out to avoid polluting 'non GEMS' images
   #GEMS-HiSpeed.dic
   #  GEMS-Advance.dic
   )

diff --git a/Doc/Website/Sidebar.html b/Doc/Website/Sidebar.html
index 40be20cf6125270cea96fda0872dbaa6ab763f65..239accde0d0de6d96e7bdec52f98b5883c75d6aa 100644 (file)
--- a/Doc/Website/Sidebar.html
+++ b/Doc/Website/Sidebar.html
@@ -29,7 +29,7 @@
       <A HREF="News.html#NewsCurrentVersion"
       target="rite">
       News</A>
-      <blink><font size=-2 color="#ffff00">Updated 2005.11.22</font></blink>
+      <blink><font size=-2 color="#ffff00">Updated 2006.02.20</font></blink>
    </TD></TR>
 
    <TR><TD BGCOLOR="#99ccff">

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index 1d8706f9596dce302f114a80b08d54af89ce1631..a6d64ce4113c6c2f8999d7c140c3a2951048b3b1 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/27 10:01:33 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2006/02/03 16:37:48 $
+  Version:   $Revision: 1.30 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -642,13 +642,8 @@ void DataEntry::Print(std::ostream &os, std::string const & )
       v = GetString();
       const VRKey &vr = GetVR();
 
-      if( vr == "US" || vr == "SS" )
-         s << " [" << GetString() << "]";
-      else if( vr == "UL" || vr == "SL" )
-         s << " [" << GetString() << "]";
-      else if ( vr == "FL" )
-         s << " [" << GetString() << "]";
-      else if ( vr == "FD" )
+      if( vr == "US" || vr == "SS" || vr == "UL" || vr == "SL" 
+       || vr == "FL" || vr == "FD")
          s << " [" << GetString() << "]";
       else
       { 

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index 371a1567bc859a41990792b67bb0f4004d2bec84..88069e5c9e76eb954a886cbe1ad1cd5ff9603b6a 100644 (file)
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -4,8 +4,8 @@
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
 
-  Date:      $Date: 2006/01/27 10:01:34 $
-  Version:   $Revision: 1.89 $
+  Date:      $Date: 2006/02/03 16:37:48 $
+  Version:   $Revision: 1.90 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1640,12 +1640,19 @@ void FileHelper::CheckMandatoryElements()
    // if (0028 0008)Number of Frames exists
    //    Push out (0020 0052),Frame of Reference UID
    //    (only meaningfull within a Serie)
+   
+   // Well ... 
+   // Maybe not!
+   // dciodvfy complains when missing (Type 1 element)
+   /// todo add it when missing (?)
+   /*
    DataEntry *e_0028_0008 = FileInternal->GetDataEntry(0x0028, 0x0008);
    if ( !e_0028_0008 )
    {
       Archive->Push(0x0020, 0x0052);
    }
- 
+  */
+   
    // Deal with element 0x0000 (group length) of each group.
    // First stage : get all the different Groups
  /*

diff --git a/vtk/vtkgdcmSerieViewer2.cxx b/vtk/vtkgdcmSerieViewer2.cxx
index 9104d44d1f3d85982ff565b16a0b10252701aac6..73b18dc590293e3ccc9d53d013b9c32456f96285 100755 (executable)
--- a/vtk/vtkgdcmSerieViewer2.cxx
+++ b/vtk/vtkgdcmSerieViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmSerieViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/26 16:01:06 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2006/02/03 16:37:50 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -219,6 +219,7 @@ int main(int argc, char *argv[])
       {
          std::cout << "Sort list : " << nbFiles << " long" << std::endl;
          sh->OrderFileList(l);  // sort the list
+         std::cout << "List sorted" << std::endl;
          break;  // The first one is OK. user will have to check
       }
       else