Program: gdcm
Module: $RCSfile: gdcmGlobal.cxx,v $
Language: C++
- Date: $Date: 2005/02/11 15:22:18 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/11/28 15:20:33 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmVR.h"
#include "gdcmTS.h"
+#include "gdcmDictGroupName.h"
#include "gdcmDictSet.h"
#include "gdcmDicomDirElement.h"
namespace gdcm
{
//-----------------------------------------------------------------------------
-/// \brief Those global string that are return by reference everywhere in
+/// \brief Those global string that are returned by reference everywhere in
/// gdcm code used to be in gdcmCommon.h but due to a 'bug' in gcc/MacOSX
/// you cannot have static initialization in a multithreaded environment
/// since there is a lazy construction everything got skrew up somehow
/// Therefore the actual initialization is done in a cxx file (avoid
/// duplicated symbol), and an extern is used in gdcmCommon.h
+
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";
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 = " ";
//-----------------------------------------------------------------------------
-DictSet *Global::Dicts = (DictSet *)0;
-VR *Global::ValRes = (VR *)0;
-TS *Global::TranSyn = (TS *)0;
-DicomDirElement *Global::ddElem = (DicomDirElement *)0;
+DictSet *Global::Dicts = (DictSet *)0;
+VR *Global::ValRes = (VR *)0;
+TS *Global::TranSyn = (TS *)0;
+DictGroupName *Global::GroupName = (DictGroupName *)0;
+DicomDirElement *Global::ddElem = (DicomDirElement *)0;
//-----------------------------------------------------------------------------
/**
{
if (ValRes || TranSyn || Dicts || ddElem)
{
- gdcmWarningMacro( "VR or TS or Dicts already allocated");
+ gdcmStaticWarningMacro( "VR or TS or Dicts already allocated");
return;
}
- Dicts = new DictSet();
- ValRes = new VR();
- TranSyn = new TS();
- 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 ddElem;
+ Dicts->Delete();
+ ValRes->Delete();
+ TranSyn->Delete();
+ GroupName->Delete();
+ ddElem->Delete();
}
//-----------------------------------------------------------------------------
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
*/