X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=77bbf2313bea542f05c03e027f7fcb9587f2307e;hb=97811f429fdf36ed2d7404e41ce7817c65e96e32;hp=596ac9ee37a958771c2c8958ca9983ae55755f46;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 596ac9ee..77bbf231 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/27 08:39:08 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/10/18 08:35:51 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,138 +16,152 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-
-#include <iostream>
-
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
 
+#include <fstream>
+#include <iostream>
+
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the 'Value Representation'
+///        Dictionnary, if relevant file is not found on user's disk
+void FillDefaultVRDict(VRHT &vr);
+
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Constructor
  */
-gdcmVR::gdcmVR(void) 
+VR::VR() 
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
+   std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
-
-   char buff[1024];
-   std::string key;
-   std::string name;
-
-   while (!from.eof()) 
+   if ( !from )
    {
-      eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      eatwhite(from);
-      from.getline(buff, 1024, ';');
-      name = buff;
-
-      eatwhite(from);
-      from.getline(buff, 1024, '\n');
-
-      if(key!="")
+      gdcmWarningMacro("Can't open dictionary" << filename.c_str());
+      FillDefaultVRDict(vr);
+   }
+   else
+   {
+      char buff[1024];
+      VRKey key;
+      VRAtr name;
+   
+      while (!from.eof()) 
       {
-         vr[key]=name;
+         from >> std::ws;
+         from.getline(buff, 1024, ' ');
+         key = buff;
+         from >> std::ws;
+         from.getline(buff, 1024, ';');
+         name = buff;
+   
+         from >> std::ws;
+         from.getline(buff, 1024, '\n');
+   
+         if ( key != "" )
+         {
+            vr[key] = name;
+         }
       }
+      from.close();
    }
-   from.close();
 }
 
 /**
  * \brief Destructor
  */
-gdcmVR::~gdcmVR() {
-   vr.clear();
-}
-
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Print all 
- * @param   os The output stream to be written to.
- */
-void gdcmVR::Print(std::ostream &os) 
+VR::~VR()
 {
-   std::ostringstream s;
-
-   for (gdcmVRHT::iterator it = vr.begin(); it != vr.end(); ++it)
-   {
-      s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
-   }
-   os << s.str();
+   vr.clear();
 }
 
 //-----------------------------------------------------------------------------
 // Public
-/**
- * \brief   Get the count for an element
- * @param   key key to count
- */
-int gdcmVR::Count(gdcmVRKey key) 
-{
-   return vr.count(key);
-}
 
 /**
- * \brief   Simple predicate that checks wether the given argument
- *          corresponds to the Value Representation of a \ref gdcmBinEntry .
- *          This predicate is the negation of
- *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a \ref DataEntry .
  * @param   tested value representation to check for.
  */
-bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
+bool VR::IsVROfBinaryRepresentable(VRKey const &tested)
 {
-   //std::cout << "gdcmVR::IsVROfGdcmBinaryRepresentable===================="
-   //   << tested << std::endl;
-
-   if ( tested == "unkn")
-      return true;
-
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+   //if ( tested == GDCM_UNKNOWN)
+   //{
+   //std::cout << "---------- never used --------------" << tested 
+   //          << std::endl;
+   //   return true;
+   //}
+
+   if ( IsVROfStringRepresentable(tested) )
       return false;
-   }
 
-   if ( IsVROfGdcmStringRepresentable(tested) )
-   {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: binary VR !");
+   if ( IsVROfSequence(tested) )
       return false;
-   }
 
    return true;
 }
 
 /**
- * \brief   Simple predicate that checks wether the given argument
- *          corresponds to the Value Representation of a \ref gdcmValEntry
- *          but NOT a \ref gdcmBinEntry.
- * @param   tested value representation to check for.
+ * \brief   Simple predicate that checks whether the given argument
+ *          corresponds to the Value Representation of a representable
+ *          string.
+ * @param   tested value representation to be checked.
  */
-bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
+bool VR::IsVROfStringRepresentable(VRKey const &tested)
 {
+   return tested == "AE" ||
+          tested == "AS" ||
+          tested == "CS" ||
+          tested == "DA" ||
+          tested == "DS" ||
+          tested == "IS" || 
+          tested == "LO" ||
+          tested == "LT" ||
+          tested == "PN" ||
+          tested == "SH" ||
+          tested == "SL" ||
+          tested == "SS" ||
+          tested == "ST" ||
+          tested == "TM" ||
+          tested == "UI" ||
+          tested == "UL" ||
+          tested == "US" ||
+          tested == "UT";
+
+   // Should be quicker --> But it doesn't work : revert to old code
+/*
+   return tested != "FL" &&
+          tested != "FD" &&
+          tested != "OB" &&
+          tested != "OW" &&
+          tested != "AT" && // Attribute Tag ?!?
+          tested != "SQ" ;
+*/
+}
 
-   if ( ! Count(tested) )
-   {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");
-      return false;
-   }
-
-   if (tested == "AE" || tested == "AS" || tested == "DA" || tested == "PN" ||
-       tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
-       tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
-       tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
-       tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
-   {
-      return true;
-   }
-   return false;
+unsigned short VR::GetAtomicElementLength(VRKey const &vr)
+{
+   // Unsigned & signed short
+   if( vr == "US" || vr == "SS" )
+      return 2;
+   // Unsigned & signed long
+   if( vr == "UL" || vr == "SL" )
+      return 4;
+   // Float
+   if( vr == "FL" )
+      return 4;
+   // Double
+   if( vr == "FD" )
+      return 8;
+   // Word string
+   if( vr == "OW" )
+      return 2;
+   return 1;
 }
 
 //-----------------------------------------------------------------------------
@@ -157,3 +171,21 @@ bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void VR::Print(std::ostream &os) 
+{
+   std::ostringstream s;
+
+   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+   {
+      s << "VR : " << it->first << " = " << it->second << std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm