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

diff --git a/kernel/src/bbtkMessageManager.h b/kernel/src/bbtkMessageManager.h
index 73468fe..3832b85 100644
--- a/kernel/src/bbtkMessageManager.h
+++ b/kernel/src/bbtkMessageManager.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/05/28 08:12:06 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -108,11 +108,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 +123,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 +140,7 @@
   do {							\
     bbtkOnMessageLevel(key,value)			\
       {							\
-	std::cout << bbtkMessageCode			\
+	std::cout << bbtkMessageCode(key,value)		\
 		  << bbtkMessageTab			\
 		  << bbtkMessageSpace(value)		\
 		  << MESSAGE;				\
@@ -164,7 +165,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -179,7 +180,7 @@
       bbtkOnMessageLevel(key,value)			\
 	{						\
 	  bbtk::MessageManager::DecTab();		\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -236,7 +237,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -261,7 +262,7 @@
     {							\
       bbtkOnMessageLevel(key,value)			\
 	{						\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)		\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -276,7 +277,7 @@
       bbtkOnMessageLevel(key,value)			\
 	{						\
 	  bbtk::MessageManager::DecTab();		\
-	  std::cout << bbtkMessageCode			\
+	  std::cout << bbtkMessageCode(key,value)	\
 		    << bbtkMessageTab			\
 		    << bbtkMessageSpace(value)		\
 		    << MESSAGE;				\
@@ -418,7 +419,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 +440,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;