#3045 BBTK Bug New Normal - Fedora 24 vtkMessageManager << conflict gcc6

[bbtk.git] / kernel / src / bbtkMessageManager.h

diff --git a/kernel/src/bbtkMessageManager.h b/kernel/src/bbtkMessageManager.h
index 898bc7fb1cf4f8ff89954ec87d6132324b8c6f77..51d7da68c13c1fc0ae5198bcd2c6407b1e136586 100644 (file)
--- a/kernel/src/bbtkMessageManager.h
+++ b/kernel/src/bbtkMessageManager.h
@@ -1,3 +1,41 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+
+
+
 
 /*! \file
  
@@ -77,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
@@ -91,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)
@@ -108,7 +147,7 @@
   do {                                                 \
     bbtkOnMessageLevel(key,value)                      \
       {                                                        \
-       std::cout << bbtkMessageCode                    \
+       std::cout << bbtkMessageCode(key,value)         \
                  << bbtkMessageTab                     \
                  << bbtkMessageSpace(value)            \
                  << MESSAGE;                           \
@@ -133,7 +172,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -148,7 +187,7 @@
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
          bbtk::MessageManager::DecTab();               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -205,7 +244,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -230,7 +269,7 @@
     {                                                  \
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)               \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -245,7 +284,7 @@
       bbtkOnMessageLevel(key,value)                    \
        {                                               \
          bbtk::MessageManager::DecTab();               \
-         std::cout << bbtkMessageCode                  \
+         std::cout << bbtkMessageCode(key,value)       \
                    << bbtkMessageTab                   \
                    << bbtkMessageSpace(value)          \
                    << MESSAGE;                         \
@@ -316,11 +355,10 @@
 
 //===========================================================
 #ifdef BBTK_COMPILE_ERROR_MESSAGES
-#include "bbtkWx.h"
+//#include "bbtkWx.h"
 #define bbtkError(MESSAGE)                             \
   do                                                   \
     {                                                  \
-      bbtk::wx::ResetCursor();                         \
       std::ostringstream s;                            \
       s << MESSAGE;                                    \
       std::ostringstream f;                            \
@@ -388,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);
     ///
@@ -409,11 +447,12 @@ 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;  
     unsigned int mMaxMessageLength;
-    int mAllLevel;
   };
   //===========================================================