X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkMessageManager.cxx;h=eae9e3b41d3d5bcc2a9154d009bd048aa8c0931b;hb=0e7db59ef7d65efd7477ab1f214f8a83c6ad3eb4;hp=eede31b5e0b7d244c1b01f41af6844283b7c8fb8;hpb=a7b5e75baf0af42a27092233d3b3350d8ec2d5da;p=bbtk.git

diff --git a/kernel/src/bbtkMessageManager.cxx b/kernel/src/bbtkMessageManager.cxx
index eede31b..eae9e3b 100644
--- a/kernel/src/bbtkMessageManager.cxx
+++ b/kernel/src/bbtkMessageManager.cxx
@@ -1,20 +1,33 @@
-   /*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkMessageManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/05 11:07:42 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/12/08 12:54:27 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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
  * \brief class MessageManager : Manages the messages displayed by bbtk (code)
@@ -25,15 +38,23 @@ namespace bbtk
 {
 
   MessageManager::MessageManager() 
-    : mMaxMessageLength(8), mAllLevel(0) 
+    : mMaxMessageLength(8)//, mAllLevel(0), mMaxLevel(9)
     
   {
     std::string key;
-    key ="Core";
+    key ="all";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Minimum level for all kind of messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key ="max";
+    mMessageLevel[key] = 9;
+    mMessageHelp[key] = "Maximum level for all kind of messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key ="Kernel";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Messages generated by the core classes of the lib";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key ="Process";
+    key ="process";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Messages related to box processing";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
@@ -53,7 +74,7 @@ namespace bbtk
     mMessageLevel[key] = 1;
     mMessageHelp[key] = "Output messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Debug";
+    key = "debug";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Debug messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
@@ -61,15 +82,35 @@ namespace bbtk
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Configuration related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Data";
+    key = "data";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Data related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-    key = "Wx";
+    key = "wx";
     mMessageLevel[key] = 0;
     mMessageHelp[key] = "Widgets related messages";
     if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
-  }
+    key = "gui";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Graphical user interface related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "object";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "object memory related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "package";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Packages related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "connection";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Connections related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+    key = "change";
+    mMessageLevel[key] = 0;
+    mMessageHelp[key] = "Box i/o changes related messages";
+    if (mMaxMessageLength<key.length()) mMaxMessageLength = key.length();
+   }
 
 
 
@@ -88,7 +129,7 @@ namespace bbtk
     return m; 
   }
 
-  void MessageManager::RegisterMessageType(std::string key, 
+  bool MessageManager::RegisterMessageType(std::string key, 
 						  std::string help,
 						  unsigned char default_level) 
   {
@@ -96,7 +137,9 @@ namespace bbtk
     GetInstance()->mMessageHelp[key] = help;
     if (GetInstance()->mMaxMessageLength<key.length()) 
       GetInstance()->mMaxMessageLength = key.length();
+    return true;
   }
+  
 
 
 
@@ -104,37 +147,31 @@ namespace bbtk
 					      unsigned char level) 
   {
     std::map<std::string,int>::iterator i;
-    if (key==std::string("All")) {
-      GetInstance()->mAllLevel = level;
-      
-      for (i=GetInstance()->mMessageLevel.begin();
-	   i!=GetInstance()->mMessageLevel.end();
-	   ++i) 
-        (*i).second = level;
-      
-    }
-    else {
-      i = GetInstance()->mMessageLevel.find(key);
-      if (i!=GetInstance()->mMessageLevel.end()) {
+    i = GetInstance()->mMessageLevel.find(key);
+    if (i!=GetInstance()->mMessageLevel.end()) 
+      {
 	(*i).second = level;
       }
-      else {
+    else 
+      {
 	bbtkWarning("MessageManager::SetMessageLevel : message type=<"
 		    <<key<<"> unregistered");
       }
-    }
+    
   }
-
-
-
+  
+  
+  
   int MessageManager::GetMessageLevel(std::string key) 
   {
-    int l = GetInstance()->mAllLevel;
+    int l = GetInstance()->mMessageLevel["all"];
     std::map<std::string,int>::iterator i = 
       GetInstance()->mMessageLevel.find(key);
     if (i!=GetInstance()->mMessageLevel.end()) {
       if ( (*i).second > l ) l = (*i).second;      
     }
+    int m = GetInstance()->mMessageLevel["max"];
+    if (l>m) l=m;
     return l;
   }
 
@@ -146,10 +183,11 @@ namespace bbtk
 		<< bbtkendl);
     bbtkMessage("Help",1, "Kind");
     for (int k=0;
-	 k<(int)(GetInstance()->mMaxMessageLength-8);
-	 k++) {
-      bbtkMessageCont("Help",1," "); 
-    }
+	 k<(int)(GetInstance()->mMaxMessageLength-2);
+	 k++) 
+      {
+	bbtkMessageCont("Help",1," "); 
+      }
     bbtkMessageCont("Help",1,"Level  Nature" << bbtkendl);
     std::map<std::string,int>::iterator i;
     std::map<std::string,std::string>::iterator j;