X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmVR.cxx;h=b45fbbb667d92a5066785bf53ad748a3d5360a50;hb=45c601b1fe996ebe3bf221541448f693a399173b;hp=12370084c5d39d408fb226c2cc210acb751e21db;hpb=9f596ccd6001b165eca959c6a7b104eb10ff9911;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 12370084..b45fbbb6 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,23 +1,41 @@
-// gdcmVR.cxx
-//-----------------------------------------------------------------------------
-#include <fstream>
-
-#include <iostream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.19 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
 
+#include <fstream>
+#include <iostream>
+
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Constructor
  */
-gdcmVR::gdcmVR(void) 
+VR::VR() 
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
+   std::string filename=DictSet::BuildDictPath() + std::string(DICT_VR);
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmVR::gdcmVR: can't open dictionary",filename.c_str());
+   dbg.Error(!from, "VR::VR: can't open dictionary",filename.c_str());
 
    char buff[1024];
    std::string key;
@@ -25,14 +43,14 @@ gdcmVR::gdcmVR(void)
 
    while (!from.eof()) 
    {
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ';');
       name = buff;
 
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, '\n');
 
       if(key!="")
@@ -43,10 +61,12 @@ gdcmVR::gdcmVR(void)
    from.close();
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
-gdcmVR::~gdcmVR() {
+VR::~VR()
+{
    vr.clear();
 }
 
@@ -56,7 +76,7 @@ gdcmVR::~gdcmVR() {
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void gdcmVR::Print(std::ostream &os) 
+void VR::Print(std::ostream &os) 
 {
    std::ostringstream s;
 
@@ -73,46 +93,55 @@ void gdcmVR::Print(std::ostream &os)
  * \brief   Get the count for an element
  * @param   key key to count
  */
-int gdcmVR::Count(VRKey key) 
+int VR::Count(VRKey key) 
 {
    return vr.count(key);
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks wether the given argument
- *          corresponds to the Value Representation of a \ref gdcmBinEntry .
+ *          corresponds to the Value Representation of a \ref BinEntry .
  *          This predicate is the negation of
- *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
- * @param   tested value represenation to check for.
+ *          \ref VR::IsVROfGdcmStringRepresentable .
+ * @param   tested value representation to check for.
  */
-bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+bool VR::IsVROfGdcmBinaryRepresentable(VRKey tested)
 {
+   //std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
+   //   << tested << std::endl;
+
+   if ( tested == "unkn")
+      return true;
+
    if ( ! Count(tested) )
    {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
       return false;
    }
 
    if ( IsVROfGdcmStringRepresentable(tested) )
    {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: binary VR !");
+      dbg.Verbose(0, "VR::IsVROfGdcmBinaryRepresentable: binary VR !");
       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 represenation to check for.
+ *          corresponds to the Value Representation of a \ref ValEntry
+ *          but NOT a \ref BinEntry.
+ * @param   tested value representation to check for.
  */
-bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
+bool VR::IsVROfGdcmStringRepresentable(VRKey tested)
 {
+
    if ( ! Count(tested) )
    {
-      dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");
+      dbg.Verbose(0, "VR::IsVROfGdcmStringRepresentable: tested not a VR!");
       return false;
    }
 
@@ -120,7 +149,7 @@ bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
        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 == "SS" || tested == "UL" || tested == "US" || tested == "UN")
    {
       return true;
    }
@@ -134,3 +163,5 @@ bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm