Program: gdcm
Module: $RCSfile: gdcmGlobal.cxx,v $
Language: C++
- Date: $Date: 2005/09/06 15:31:17 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2006/03/22 13:19:25 $
+ Version: $Revision: 1.32 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
const std::string GDCM_UNREAD = "gdcm::UnRead";
const std::string GDCM_NOTASCII = "gdcm::NotAscii";
+const std::string GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded";
+
+const std::string GDCM_VRUNKNOWN = " ";
+
+#ifdef _WIN32
+const char GDCM_FILESEPARATOR = '\\';
+#else
+const char GDCM_FILESEPARATOR = '/';
+#endif
+
//-----------------------------------------------------------------------------
DictSet *Global::Dicts = (DictSet *)0;
VR *Global::ValRes = (VR *)0;
DictGroupName *Global::GroupName = (DictGroupName *)0;
DicomDirElement *Global::ddElem = (DicomDirElement *)0;
+Dict *Global::DefaultPubDict = (Dict *)0;
+
//-----------------------------------------------------------------------------
/**
* \brief Global container
*/
Global::Global()
{
- if (ValRes || TranSyn || Dicts || ddElem)
+ if (ValRes || TranSyn || Dicts || ddElem || GroupName )
{
- gdcmWarningMacro( "VR or TS or Dicts already allocated");
+ gdcmStaticWarningMacro( "VR or TS or Dicts or ... already allocated");
return;
}
- Dicts = new DictSet();
- ValRes = new VR();
- TranSyn = new TS();
- GroupName = new DictGroupName();
- ddElem = new DicomDirElement();
+ Dicts = DictSet::New();
+ ValRes = VR::New();
+ TranSyn = TS::New();
+ GroupName = DictGroupName::New();
+ ddElem = DicomDirElement::New();
}
/**
*/
Global::~Global()
{
- delete Dicts;
- delete ValRes;
- delete TranSyn;
- delete GroupName;
- delete ddElem;
+ Dicts->Delete();
+ ValRes->Delete();
+ TranSyn->Delete();
+ GroupName->Delete();
+ ddElem->Delete();
}
//-----------------------------------------------------------------------------
// Public
-/**
- * \brief returns a pointer to Dictionaries Table
- */
-DictSet *Global::GetDicts()
-{
- return Dicts;
-}
-
-/**
- * \brief returns a pointer to the 'Value Representation Table'
- */
-VR *Global::GetVR()
-{
- return ValRes;
-}
-
-/**
- * \brief returns a pointer to the 'Transfer Syntax Table'
- */
-TS *Global::GetTS()
-{
- return TranSyn;
-}
-
-/**
- * \brief returns a pointer to the Group name correspondance table
- */
-DictGroupName *Global::GetDictGroupName()
-{
- return GroupName;
-}
-
-/**
- * \brief returns a pointer to the DicomDir related elements Table
- */
-DicomDirElement *Global::GetDicomDirElements()
-{
- return ddElem;
-}
//-----------------------------------------------------------------------------
// Protected