* Reorder source code

[gdcm.git] / src / gdcmGlobal.cxx

diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx
index fdcb4181efe063834fb0a39da62ce720a0db4974..6411383e263f1013340426c33d55824ff3a8f6cf 100644 (file)
--- a/src/gdcmGlobal.cxx
+++ b/src/gdcmGlobal.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/07 22:03:30 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/02/02 15:07:41 $
+  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
@@ -26,41 +26,34 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
+// Those global string that are return 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";
 
-/**
- * \ingroup Globals
- * \brief Pointer to a container, holding _all_ the Dicom Dictionaries.
- */
+//-----------------------------------------------------------------------------
 DictSet         *Global::Dicts  = (DictSet *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the 'Value Representations'.
- */
 VR              *Global::ValRes     = (VR *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to a hash table containing the Transfer Syntax codes
- *          and their english description 
- */
 TS              *Global::TranSyn     = (TS *)0;
-
-/**
- * \ingroup Globals
- * \brief   Pointer to the hash table containing the Dicom Elements
- *          necessary to describe each part of a DICOMDIR 
- */
 DicomDirElement *Global::ddElem = (DicomDirElement *)0;
 
+//-----------------------------------------------------------------------------
 /**
- * \ingroup Globals
  * \brief   Global container
  */
 Global Glob;
 
+//-------------------------------------------------------------------------
+// Constructor / Destructor
 /**
- * \ingroup Global
  * \brief   constructor : populates the various H Tables
  */
 Global::Global()
@@ -77,7 +70,6 @@ Global::Global()
 }
 
 /**
- * \ingroup Global
  * \brief   canonical destructor 
  */
 Global::~Global()
@@ -87,36 +79,49 @@ Global::~Global()
    delete TranSyn;
    delete ddElem;
 }
+
+//-----------------------------------------------------------------------------
+// Public
+/**
+ * \brief   returns a pointer to Dictionaries Table 
+ */
+DictSet *Global::GetDicts()
+{
+   return Dicts;
+}
+
 /**
- * \ingroup Global
  * \brief   returns a pointer to the 'Value Representation Table' 
  */
 VR *Global::GetVR()
 {
    return ValRes;
 }
+
 /**
- * \ingroup Global
- * \brief   returns a pointer to the 'Transfert Syntax Table' 
+ * \brief   returns a pointer to the 'Transfer Syntax Table' 
  */
 TS *Global::GetTS()
 {
    return TranSyn;
 }
+
 /**
- * \ingroup Global
- * \brief   returns a pointer to Dictionaries Table 
- */
-DictSet *Global::GetDicts()
-{
-   return Dicts;
-}
-/**
- * \ingroup Global
  * \brief   returns a pointer to the DicomDir related elements Table 
  */
 DicomDirElement *Global::GetDicomDirElements()
 {
    return ddElem;
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm