X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkMessageManager.cxx;h=5794f7452d826181f26c4d3e037e3c9fb50a591b;hb=789ecd0eb75c3657333605b45faf47c5c37a29c6;hp=d3333d947ac1eb80209fbd176d5fde157baa957e;hpb=26a8c332dda10ace9e3e088b2ca8544d188c9743;p=bbtk.git

diff --git a/kernel/src/bbtkMessageManager.cxx b/kernel/src/bbtkMessageManager.cxx
index d3333d9..5794f74 100644
--- a/kernel/src/bbtkMessageManager.cxx
+++ b/kernel/src/bbtkMessageManager.cxx
@@ -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.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/29 21:41:34 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.17 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 /**
  * \file
@@ -50,7 +57,7 @@ namespace bbtk
     mMessageLevel[key] = 9;
     mMessageHelp[key] = "Maximum level for all kind of messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key ="Kernel";
+    key ="kernel";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Messages generated by the core classes of the lib";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
@@ -58,19 +65,19 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Messages related to box processing";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Help";
+    key = "help";
     mMessageLevel[key] = 1;
     mMessageHelp[key] = "Help messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Error";
+    key = "error";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Error messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Warning";
+    key = "warning";
     mMessageLevel[key] = 1;
     mMessageHelp[key] = "Warning messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Output";
+    key = "output";
     mMessageLevel[key] = 1;
     mMessageHelp[key] = "Output messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
@@ -78,7 +85,7 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Debug messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Config";
+    key = "config";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Configuration related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
@@ -86,10 +93,18 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Data related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "wx";
+    key = "widget";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Widgets related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "wx";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "wxWidgets related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "qt";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Qt related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
     key = "gui";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Graphical user interface related messages";
@@ -106,11 +121,15 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Connections related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "modified";
+    key = "change";
     mMessageLevel[key] = 0;
-    mMessageHelp[key] = "Modified related messages";
+    mMessageHelp[key] = "Box i/o changes related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-   }
+    key = "code";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "If positive then codes of the messages are displayed";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    }
 
 
 
@@ -179,33 +198,47 @@ namespace bbtk
 
   void MessageManager::PrintInfo() 
   {
-    bbtkMessage("Help",1,"================ Messages =================" 
+    bbtkMessage("help",1,"================ Messages =================" 
 		<< bbtkendl);
-    bbtkMessage("Help",1, "Kind");
+    bbtkMessage("help",1, "Kind");
     for (int k=0;
 	 k<(int)(GetInstance()->mMaxMessageLength-2);
 	 k++) 
       {
-	bbtkMessageCont("Help",1," "); 
+	bbtkMessageCont("help",1," "); 
       }
-    bbtkMessageCont("Help",1,"Level  Nature" << bbtkendl);
+    bbtkMessageCont("help",1,"Level  Nature" << bbtkendl);
     std::map<std::string,int>::iterator i;
     std::map<std::string,std::string>::iterator j;  
     for (i=GetInstance()->mMessageLevel.begin(),
 	   j=GetInstance()->mMessageHelp.begin();
 	 i!=GetInstance()->mMessageLevel.end();++i,++j) {
-      bbtkMessage("Help",1, (*i).first);
+      bbtkMessage("help",1, (*i).first);
       for (int k=0;
 	   k<(int)(GetInstance()->mMaxMessageLength+2-(*i).first.length());
 	   k++) {
-	bbtkMessageCont("Help",1," ");
+	bbtkMessageCont("help",1," ");
       }
-      bbtkMessageCont("Help",1, (*i).second << "\t" 
+      bbtkMessageCont("help",1, (*i).second << "\t" 
 		      << (*j).second << bbtkendl);
     }
-    bbtkMessage("Help",1,"===========================================" 
+    bbtkMessage("help",1,"===========================================" 
 		<< bbtkendl);
   }
   
-
+  std::string MessageManager::FormatKey(const std::string& key,
+					int value)
+  {
+    std::string s;
+    if ( GetInstance()->mMessageLevel["code"] != 0 )
+      {
+	s = key.substr(0,4);
+	std::stringstream ss;
+	ss << value;
+	//	s += " ";
+	s += ss.str();
+	s += "> ";
+      }
+    return s;
+  }
 }