X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkMessageManager.h;h=51d7da68c13c1fc0ae5198bcd2c6407b1e136586;hb=b86f1fefc9fb173793a1b6d91cceefc28f048faf;hp=73468feb25f84246e4c947832fb85654551601be;hpb=6575a389b71b1b85c79e4444885becb76ecf16e4;p=bbtk.git

diff --git a/kernel/src/bbtkMessageManager.h b/kernel/src/bbtkMessageManager.h
index 73468fe..51d7da6 100644
--- a/kernel/src/bbtkMessageManager.h
+++ b/kernel/src/bbtkMessageManager.h
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 
@@ -108,11 +115,12 @@
     }							\
   else if (value<= __bbtkOnMessageLevelVariable) 
 
+#define BBTK_PREPEND_MESSAGE_WITH_CODE
 #ifdef BBTK_PREPEND_MESSAGE_WITH_CODE
-#define bbtkMessageCode				\
-  key[0] << key[1] << key[2] << value << " "
+#define bbtkMessageCode(key,value)			\
+  bbtk::MessageManager::FormatKey(key,value) 
 #else 
-#define bbtkMessageCode ""
+#define bbtkMessageCode(key,value) ""
 #endif 
 
 #ifdef BBTK_PREPEND_MESSAGE_WITH_TAB
@@ -122,7 +130,7 @@
 #define bbtkMessageTab ""
 #endif
 
-#define BBTK_PREPEND_MESSAGE_WITH_SPACE
+//#define BBTK_PREPEND_MESSAGE_WITH_SPACE
 #ifdef BBTK_PREPEND_MESSAGE_WITH_SPACE
 #define bbtkMessageSpace(value)			\
   bbtk::MessageManager::GetSpace(value)
@@ -139,7 +147,7 @@
   do {							\
     bbtkOnMessageLevel(key,value)			\
       {							\
-	std::cout << bbtkMessageCode			\
+	std::cout << bbtkMessageCode(key,value)		\
 		  << bbtkMessageTab			\
 		  << bbtkMessageSpace(value)		\
 		  << MESSAGE;				\
@@ -164,7 +172,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -179,7 +187,7 @@
       bbtkOnMessageLevel(key,value)			\
 	{						\
 	  bbtk::MessageManager::DecTab();		\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -236,7 +244,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -261,7 +269,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -276,7 +284,7 @@
       bbtkOnMessageLevel(key,value)			\
 	{						\
 	  bbtk::MessageManager::DecTab();		\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)	\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -418,7 +426,7 @@ namespace bbtk
     ///
     static MessageManager* GetInstance();
     ///
-    static void RegisterMessageType(std::string key, 
+    static bool RegisterMessageType(std::string key, 
                                     std::string help,
                                     unsigned char default_level = 9);
     ///
@@ -439,6 +447,8 @@ namespace bbtk
     ///
     static void PrintInfo();
 
+    static std::string FormatKey(const std::string& key, int value);
+
   private:
     std::map<std::string,int> mMessageLevel;
     std::map<std::string,std::string> mMessageHelp;