Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/07/02 13:55:28 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2004/10/08 04:43:38 $
+ Version: $Revision: 1.18 $
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.htm for details.
+ 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
=========================================================================*/
-#include <fstream>
-
-#include <iostream>
-
#include "gdcmVR.h"
#include "gdcmUtil.h"
#include "gdcmDictSet.h"
#include "gdcmDebug.h"
+#include <fstream>
+#include <iostream>
+
//-----------------------------------------------------------------------------
/**
* \brief Constructor
*/
-gdcmVR::gdcmVR(void)
+gdcmVR::gdcmVR()
{
std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
std::ifstream from(filename.c_str());
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!="")
from.close();
}
+//-----------------------------------------------------------------------------
/**
* \brief Destructor
*/
-gdcmVR::~gdcmVR() {
+gdcmVR::~gdcmVR()
+{
vr.clear();
}
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 .
- * @param tested value represenation to check for.
+ * @param tested value representation to check for.
*/
bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey 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!");
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.
+ * @param tested value representation to check for.
*/
bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
{
+
if ( ! Count(tested) )
{
dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");