X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=2bed919593c4f51fc22af85e8e57dec5d61e897d;hb=0317a9372b19b712e4033acbe257d92d5747c31b;hp=994185b513017e9f054e4b7f143efa03e8f5a983;hpb=f8287c00c0a0c448eade55158a63f1d44eeb06e0;p=gdcm.git

diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx
index 994185b5..2bed9195 100644
--- a/src/gdcmGlobal.cxx
+++ b/src/gdcmGlobal.cxx
@@ -3,8 +3,8 @@
   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
@@ -41,6 +41,16 @@ 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 = "  ";
+
+#ifdef _WIN32
+const char GDCM_FILESEPARATOR = '\\';
+#else
+const char GDCM_FILESEPARATOR = '/';
+#endif
+
 //-----------------------------------------------------------------------------
 DictSet         *Global::Dicts     = (DictSet *)0;
 VR              *Global::ValRes    = (VR *)0;
@@ -48,6 +58,8 @@ TS              *Global::TranSyn   = (TS *)0;
 DictGroupName   *Global::GroupName = (DictGroupName *)0;
 DicomDirElement *Global::ddElem    = (DicomDirElement *)0;
 
+Dict            *Global::DefaultPubDict = (Dict *)0;
+
 //-----------------------------------------------------------------------------
 /**
  * \brief   Global container
@@ -61,16 +73,16 @@ Global Glob;
  */
 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();
 }
 
 /**
@@ -78,54 +90,15 @@ Global::Global()
  */
 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