X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaMessageManager.h;h=54dd93efcc954ff73cb1f9b7b81cf5397b4809b1;hb=b4cd33464fc8cc5658da64fe75c3f689169f0cb0;hp=489659934b58b9a8092180da23440165e67d31b3;hpb=7872f6ea0cd9d9a7611f3ea88f94d54fc7e27cea;p=crea.git

diff --git a/src/creaMessageManager.h b/src/creaMessageManager.h
index 4896599..54dd93e 100644
--- a/src/creaMessageManager.h
+++ b/src/creaMessageManager.h
@@ -61,6 +61,7 @@
      \brief Manages the messages displayed by crea
   */
 
+  
 #ifndef __creaMessageManager_h__
 #define __creaMessageManager_h__
 
@@ -75,6 +76,58 @@
 #include <map>
 #include <iostream>
 #include <sstream>
+
+
+
+namespace crea 
+{
+  class CREA_EXPORT MessageManager
+  {
+  public:
+    //=============================================
+    typedef boost::signals2::signal<void (const std::string&)>  MessageSignalType;
+    typedef MessageSignalType::slot_function_type MessageCallbackType;
+    //=============================================
+    MessageManager();
+    ~MessageManager();
+    static MessageManager* GetInstance();
+    static void RegisterMessageType(const std::string& key, 
+                                    const std::string& help,
+                                    unsigned char default_level = 9);
+    static void SetMessageLevel(const std::string& key, unsigned char level);
+    static int GetMessageLevel(const std::string& key);
+    static void HSendMessage(const std::string& key, const std::string& mess);
+    static void AddMessageObserver(const std::string& key, MessageCallbackType callback );
+    static void SendMessagesToCout(bool v = true);
+    static std::string& GetTab() { static std::string s; return s; }
+    static std::string GetSpace(int n)  {       std::string s; s.insert(0,"                ",n); return s; }
+    static void IncTab() { GetTab() += std::string(" "); }
+    static void DecTab() { GetTab() = GetTab().substr(0,GetTab().length()-1); }
+    static void ResetTab() { GetTab() = std::string(""); }
+    static void PrintInfo();
+private:
+    struct MessageType
+    {
+      MessageType(int l, const std::string& h) : Level(l), Help(h) {}
+      int Level;
+      std::string Help;
+      MessageSignalType Signal;
+    };
+    typedef std::map<std::string,MessageType*> MessageMapType;
+    MessageMapType mMessageMap;
+    unsigned int mMaxMessageLength;
+    bool mSendToCout;
+  };
+  //===========================================================
+}
+
+
+
+
+
+
+
+
 // Comment out these symbols to prevent compilation 
 //#define CREA_COMPILE_MESSAGES
 //#define CREA_COMPILE_DEBUG_MESSAGES
@@ -129,7 +182,7 @@
 	  << creaMessageTab				\
 	  << creaMessageSpace(value)			\
 	  << MESSAGE;					\
-	crea::MessageManager::SendMessage(key,s.str());	\
+	crea::MessageManager::HSendMessage(key,s.str());	\
       }							\
   }							\
   while (0)
@@ -145,7 +198,7 @@
 	{						\
 	std::ostringstream s;				\
 	s << MESSAGE;					\
-	crea::MessageManager::SendMessage(key,s.str());	\
+	crea::MessageManager::HSendMessage(key,s.str());	\
 	}						\
     }							\
   while (0)
@@ -159,7 +212,7 @@
 	  << creaMessageTab				\
 	  << creaMessageSpace(value)			\
 	  << MESSAGE;					\
-	crea::MessageManager::SendMessage(key,s.str());	\
+	crea::MessageManager::HSendMessage(key,s.str());	\
 	crea::MessageManager::IncTab();			\
 	}						\
     }							\
@@ -177,7 +230,7 @@
 	    << creaMessageTab					\
 	    << creaMessageSpace(value)				\
 	    << MESSAGE;						\
-	  crea::MessageManager::SendMessage(key,s.str());	\
+	  crea::MessageManager::HSendMessage(key,s.str());	\
 	}							\
     }								\
   while (0)
@@ -374,127 +427,6 @@
 
 
 
-namespace crea 
-
-{
-
-  
-
-  class CREA_EXPORT MessageManager
-
-  {
-
-  public:
-
-    //=============================================
-
-    typedef boost::signals2::signal<void (const std::string&)>  MessageSignalType;
-
-    typedef MessageSignalType::slot_function_type MessageCallbackType;
-
-    //=============================================
-
-    ///
-
-    MessageManager();
-
-    ///
-
-    ~MessageManager();
-
-    ///
-
-    static MessageManager* GetInstance();
-
-    ///
-
-    static void RegisterMessageType(const std::string& key, 
-
-                                    const std::string& help,
-
-                                    unsigned char default_level = 9);
-
-    ///
-
-    static void SetMessageLevel(const std::string& key, unsigned char level);
-
-    ///
-
-    static int GetMessageLevel(const std::string& key);
-
-    ///  
-
-    static void SendMessage(const std::string& key, const std::string& mess);
-
-    ///
-
-    static void AddMessageObserver(const std::string& key, MessageCallbackType callback );
-
-    ///
-
-    static void SendMessagesToCout(bool v = true);
-
-    ///
-
-    static std::string& GetTab() { static std::string s; return s; }
-
-    ///
-
-    static std::string GetSpace(int n) { 
-
-      std::string s; s.insert(0,"                ",n); return s; }
-
-    ///
-
-    static void IncTab() { GetTab() += std::string(" "); }
-
-    ///
-
-    static void DecTab() { GetTab() = GetTab().substr(0,GetTab().length()-1); }
-
-    ///
-
-    static void ResetTab() { GetTab() = std::string(""); }
-
-    ///
-
-    static void PrintInfo();
-
-    /// 
-
-    
-
-  private:
-
-    struct MessageType
-
-    {
-
-      MessageType(int l, const std::string& h) : Level(l), Help(h) {}
-
-      int Level;
-
-      std::string Help;
-
-      MessageSignalType Signal;
-
-    };
-
-    typedef std::map<std::string,MessageType*> MessageMapType;
-
-    MessageMapType mMessageMap;
-
-    unsigned int mMaxMessageLength;
-
-    bool mSendToCout;
-
-  };
-
-  //===========================================================
-
-  
-
-}