replace the different values "??", "Unkn", "Unknown".
* src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h,
gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx,
gdcmVR.cxx : use the GDCM_UNKNOWN constant.
* Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad
-- BeNours
+2005-01-05 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+ * src/gdcmCommon.h : add the GDCM_UNKNOWN constant. This constant is to
+ replace the different values "??", "Unkn", "Unknown".
+ * src/gdcmDicomDirElement.h, gdcmDictEntry.h, gdcmDictSet.h,
+ gdcmDocEntry.cxx, gdcmDocEntrySet.[h|cxx], gdcmDocument.h, gdcmSQItem.cxx,
+ gdcmVR.cxx : use the GDCM_UNKNOWN constant.
+ * Appears a bug in gdcmDictEntry : IsVRUnknown always returns false... bad
+
2004-12-16 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* src/gdcmBase.[h|cxx] : new base class. Contains the PrintLevel and an
empty Print Method
Program: gdcm
Module: $RCSfile: TestFromScratch.cxx,v $
Language: C++
- Date: $Date: 2004/12/10 17:10:22 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
{
// Do not bother with field from private dict
- if( v->GetName() != "unkn" )
+ if( v->GetName() != "gdcm::Unknown" )
{
h2->ReplaceOrCreateByNumber(
v->GetValue(),
Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2004/11/30 17:14:12 $
- Version: $Revision: 1.42 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define DICT_TS "dicomTS.dic"
#define DICT_VR "dicomVR.dic"
+const std::string GDCM_UNKNOWN = "gdcm::Unknown";
const std::string GDCM_UNFOUND = "gdcm::Unfound";
const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
Program: gdcm
Module: $RCSfile: gdcmDicomDirElement.h,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:36 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/// Elements chained list, related to the SerieElements of DICOMDIR
ListDicomDirSerieElem DicomDirSerieList;
/// Elements chained list, related to the ImageElements of DICOMDIR
-
ListDicomDirImageElem DicomDirImageList;
};
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmDictEntry.h,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
public:
DictEntry(uint16_t group,
uint16_t element,
- TagName const & vr = "Unknown",
- TagName const & fourth = "Unknown",
- TagName const & name = "Unknown");
+ TagName const & vr = GDCM_UNKNOWN,
+ TagName const & fourth = GDCM_UNKNOWN,
+ TagName const & name = GDCM_UNKNOWN);
static TagKey TranslateToKey(uint16_t group, uint16_t element);
Program: gdcm
Module: $RCSfile: gdcmDictSet.h,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.30 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Dict* GetVirtualDict() { return &VirtualEntry; };
DictEntry* NewVirtualDictEntry(uint16_t group, uint16_t element,
- TagName vr = "Unknown",
- TagName fourth = "Unknown",
- TagName name = "Unknown");
+ TagName vr = GDCM_UNKNOWN,
+ TagName fourth = GDCM_UNKNOWN,
+ TagName name = GDCM_UNKNOWN);
static std::string BuildDictPath();
Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.35 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.36 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
uint16_t z = 0;
uint16_t shortLgr = lgr;
- if (vr == "unkn")
+ if (vr == GDCM_UNKNOWN)
{
// Unknown was 'written'
// deal with Little Endian
Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 20:16:58 $
- Version: $Revision: 1.27 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.28 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
DictEntry *newTag = pubDict->GetDictEntryByName(name);
if (!newTag)
{
- newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", name);
+ newTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", GDCM_UNKNOWN, name);
}
DocEntry* newEntry = new DocEntry(newTag);
Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.h,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.29 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ 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
std::string GetEntryByName(TagName const & name);
DictEntry* NewVirtualDictEntry( uint16_t group,
uint16_t element,
- TagName const & vr = "unkn",
- TagName const & fourth = "unkn",
- TagName const & name = "unkn" );
+ TagName const & vr = GDCM_UNKNOWN,
+ TagName const & fourth = GDCM_UNKNOWN,
+ TagName const & name = GDCM_UNKNOWN );
protected:
// DocEntry related utilities
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2004/12/16 11:37:02 $
- Version: $Revision: 1.69 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.70 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
ValEntry* ReplaceOrCreateByNumber(std::string const & value,
uint16_t group, uint16_t elem,
- TagName const & vr = "unkn");
+ TagName const & vr = GDCM_UNKNOWN);
BinEntry* ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
uint16_t group, uint16_t elem,
- TagName const & vr = "unkn");
+ TagName const & vr = GDCM_UNKNOWN);
SeqEntry* ReplaceOrCreateByNumber(uint16_t group, uint16_t elem);
Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/12/16 13:46:37 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.44 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
dictEntry =
Global::GetDicts()->NewVirtualDictEntry(group, element,
- "UN", "??", "??");
+ "UN", GDCM_UNKNOWN, GDCM_UNKNOWN);
}
// we assume the constructor didn't fail
entry = new ValEntry(dictEntry);
Program: gdcm
Module: $RCSfile: gdcmVR.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 14:48:19 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//std::cout << "VR::IsVROfGdcmBinaryRepresentable===================="
// << tested << std::endl;
- if ( tested == "unkn")
+ if ( tested == GDCM_UNKNOWN)
return true;
if ( ! Count(tested) )
projects / gdcm.git / commitdiff