Some normalizations :

[gdcm.git] / src / gdcmGlobal.cxx

diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx
index 7be5abe6d0ab6225952ebad9e4bb199e499be7ae..5d8c4e7195124f8fa38fe2d917b2d8935338cbf6 100644 (file)
--- a/src/gdcmGlobal.cxx
+++ b/src/gdcmGlobal.cxx
@@ -1,91 +1,122 @@
-// gdcmGlobal.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmGlobal.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/01/23 10:12:34 $
+  Version:   $Revision: 1.16 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmGlobal.h"
+
 #include "gdcmDebug.h"
-#include <stdio.h>
-#include <ctype.h>   // For isspace
-#include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
+#include "gdcmVR.h"
+#include "gdcmTS.h"
+#include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
+
+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.
  */
-gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
+DictSet         *Global::Dicts  = (DictSet *)0;
 
 /**
- * \ingroup Globals
  * \brief   Pointer to a hash table containing the 'Value Representations'.
  */
-gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
+VR              *Global::ValRes     = (VR *)0;
 
 /**
- * \ingroup Globals
  * \brief   Pointer to a hash table containing the Transfer Syntax codes
  *          and their english description 
  */
-gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
+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 
  */
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
+DicomDirElement *Global::ddElem = (DicomDirElement *)0;
 
 /**
- * \ingroup Globals
  * \brief   Global container
  */
-gdcmGlobal gdcmGlob;
+Global Glob;
 
 /**
- * \ingroup gdcmGlobal
  * \brief   constructor : populates the various H Tables
  */
-gdcmGlobal::gdcmGlobal(void) {
-   if (VR || TS || Dicts || ddElem)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   Dicts  = new gdcmDictSet();
-   VR     = new gdcmVR();
-   TS     = new gdcmTS();
-   ddElem = new gdcmDicomDirElement();
+Global::Global()
+{
+   if (ValRes || TranSyn || Dicts || ddElem)
+   {
+      gdcmVerboseMacro( "VR or TS or Dicts already allocated");
+      return;
+   }
+   Dicts   = new DictSet();
+   ValRes  = new VR();
+   TranSyn = new TS();
+   ddElem  = new DicomDirElement();
 }
 
 /**
- * \ingroup gdcmGlobal
  * \brief   canonical destructor 
  */
-gdcmGlobal::~gdcmGlobal() {
+Global::~Global()
+{
    delete Dicts;
-   delete VR;
-   delete TS;
+   delete ValRes;
+   delete TranSyn;
    delete ddElem;
 }
 /**
- * \ingroup gdcmGlobal
  * \brief   returns a pointer to the 'Value Representation Table' 
  */
-gdcmVR *gdcmGlobal::GetVR(void) {
-   return VR;
+VR *Global::GetVR()
+{
+   return ValRes;
 }
 /**
- * \ingroup gdcmGlobal
- * \brief   returns a pointer to the 'Transfert Syntax Table' 
+ * \brief   returns a pointer to the 'Transfer Syntax Table' 
  */
-gdcmTS *gdcmGlobal::GetTS(void) {
-   return TS;
+TS *Global::GetTS()
+{
+   return TranSyn;
 }
 /**
- * \ingroup gdcmGlobal
  * \brief   returns a pointer to Dictionaries Table 
  */
-gdcmDictSet *gdcmGlobal::GetDicts(void) {
+DictSet *Global::GetDicts()
+{
    return Dicts;
 }
 /**
- * \ingroup gdcmGlobal
  * \brief   returns a pointer to the DicomDir related elements Table 
  */
-gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
+DicomDirElement *Global::GetDicomDirElements()
+{
    return ddElem;
 }
+} // end namespace gdcm