X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkMessageManager.cxx;h=5794f7452d826181f26c4d3e037e3c9fb50a591b;hb=53a23e4f6a81c449329e11fc0f1f3c4e35ccce3c;hp=6812de0f7d87a5dd528160c5f8ee85871b0d7218;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git diff --git a/kernel/src/bbtkMessageManager.cxx b/kernel/src/bbtkMessageManager.cxx index 6812de0..5794f74 100644 --- a/kernel/src/bbtkMessageManager.cxx +++ b/kernel/src/bbtkMessageManager.cxx @@ -1,20 +1,40 @@ - /*========================================================================= - +/* + # --------------------------------------------------------------------- + # + # 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/04/18 12:59:15 $ - Version: $Revision: 1.5 $ - - 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: 2012/11/16 08:49:01 $ + Version: $Revision: 1.17 $ =========================================================================*/ + + + /** * \file * \brief class MessageManager : Manages the messages displayed by bbtk (code) @@ -25,39 +45,47 @@ namespace bbtk { MessageManager::MessageManager() - : mMaxMessageLength(8), mAllLevel(0) + : mMaxMessageLength(8)//, mAllLevel(0), mMaxLevel(9) { std::string key; - key ="Kernel"; + key ="all"; + mMessageLevel[key] = 0; + mMessageHelp[key] = "Minimum level for all kind of messages"; + if (mMaxMessageLengthmMessageHelp[key] = help; if (GetInstance()->mMaxMessageLengthmMaxMessageLength = key.length(); + return true; } + @@ -116,37 +166,31 @@ namespace bbtk unsigned char level) { std::map::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=<" < unregistered"); } - } + } - - - + + + int MessageManager::GetMessageLevel(std::string key) { - int l = GetInstance()->mAllLevel; + int l = GetInstance()->mMessageLevel["all"]; std::map::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; } @@ -154,32 +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-8); - k++) { - bbtkMessageCont("Help",1," "); - } - bbtkMessageCont("Help",1,"Level Nature" << bbtkendl); + k<(int)(GetInstance()->mMaxMessageLength-2); + k++) + { + bbtkMessageCont("help",1," "); + } + bbtkMessageCont("help",1,"Level Nature" << bbtkendl); std::map::iterator i; std::map::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; + } }