From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Fri, 9 Oct 2009 14:09:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~60
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7afa3ebd8c9f99468d8de5683978bf602ffac4cb;p=crea.git

*** empty log message ***
---

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index d3f02bc..d5d4aca 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -284,9 +284,9 @@ IF(USE_BOOST)
 	
 		#message("creamacro find and use lib = ${Boost_SIGNALS_LIBRARY}")
 		SET(BOOST_LIBRARIES
-				boost_signals-vc90-mt-1_37
-                boost_filesystem-vc90-mt-1_37
-                boost_date_time-vc90-mt-1_37
+				boost_signals-vc90-mt-1_40
+                boost_filesystem-vc90-mt-1_40
+                boost_date_time-vc90-mt-1_40
 		   
 		   #what about boost_thread? JPR
 	    )
diff --git a/src/creaMessageManager.h b/src/creaMessageManager.h
index 87fb5f8..9fbaae5 100644
--- a/src/creaMessageManager.h
+++ b/src/creaMessageManager.h
@@ -1,149 +1,58 @@
-
-
 /*! \file
-
- 
-
   \brief Class creaMessageManager and Macros for outputing messages in crea
-
-
-
   There are 4 kinds of messages :
-
   - Messages (normal messages)
-
   - Debug messages (not compiled in release)
-
   - Warnings 
-
   - Errors
-
   There are also "types" of messages which are strings which identify the nature of the message 
-
   (for example : "Kernel" messages are generated by the core classes of the library, there can be a type of 
-
   message for each type of Node, and so on...)
-
   A type of message must be declared by registering it into the MessageManager. This is done by a line like :
-
   crea::MessageManager::RegisterMessageType("Kernel","Messages generated by the core classes of the library",5);
-
   where : 
-
   -The first string is the type of the message (the category which will be used to generate a message of this type)
-
   -The second string is help string
-
   -The integer is the initial level for the messages of this type (see below).
-
-  
-
   To generate a message of a known type then use one of the macros :
-
   creaMessage, creaDebugMessage, creaWarning, creaError or their variants.
-
-
-
   example :
-
-
-
   creaMessage("Kernel",4,"problem with "<<GetName()<<creaendl);
-
-
-
   will push the 3rd argument in std::cout if the message level of "Kernel" messages is greater or equal to 4.
-
   which means that it generates a message of level 4 (0 : very important/always displayed ... 9 : deep debug message).
-
-
-
   At run time, one is able to change the level of the messages displayed by using a command like :
-
-  
-
   crea::MessageManager::SetMessageLevel("Kernel",5); 
-
-  
-
   which tells the manager to display all Kernel messages of level up to 5.
-
-
-
   Variants :
-
-
-
   crea*Cont : continues a previous creaMessage on the same line (without rewriting the type and level)
-
   crea*Inc / Dec : displays the message and then increments/decrement the messages tabulation 
-
-
-
 */
 
   //===========================================================
-
   /**
-
      \class crea::MessageManager
-
      \brief Manages the messages displayed by crea
-
   */
 
-
-
-
-
 #ifndef __creaMessageManager_h__
-
 #define __creaMessageManager_h__
 
-
-
 // The do { } while(0) statement in macros is made to "swallow the semicolon" 
-
 // see http://gcc.gnu.org/onlinedocs/cpp/Swallowing-the-Semicolon.html#Swallowing-the-Semicolon
-
-
-
 #include "creaSystem.h"
-
 #include "creaRTTI.h" // for CREA_GET_CURRENT_OBJECT_NAME
-
 // Signal/slot mechanism for message events
-
 #include <boost/signal.hpp>
-
 #include <boost/bind.hpp>
-
-
-
 #include <string>
-
 #include <map>
-
 #include <iostream>
-
 #include <sstream>
-
-
-
 // Comment out these symbols to prevent compilation 
-
 //#define CREA_COMPILE_MESSAGES
-
 //#define CREA_COMPILE_DEBUG_MESSAGES
-
 //#define CREA_COMPILE_WARNING_MESSAGES
-
 //#define CREA_COMPILE_ERROR_MESSAGES
-
-
-
-
-
 #define creaOnMessageLevel(key,value)			\
   int __creaOnMessageLevelVariable =			\
     crea::MessageManager::GetMessageLevel(key);		\
@@ -153,8 +62,6 @@
     }							\
   else if (value<= __creaOnMessageLevelVariable) 
 
-
-
 #ifdef CREA_PREPEND_MESSAGE_WITH_CODE
 #define creaMessageCode				\
   key[0] << key[1] << key[2] << value << " "
@@ -162,8 +69,6 @@
 #define creaMessageCode ""
 #endif 
 
-
-
 #ifdef CREA_PREPEND_MESSAGE_WITH_TAB
 #define creaMessageTab				\
   crea::MessageManager::GetTab()
@@ -171,8 +76,6 @@
 #define creaMessageTab ""
 #endif
 
-
-
 //#define CREA_PREPEND_MESSAGE_WITH_SPACE
 #ifdef CREA_PREPEND_MESSAGE_WITH_SPACE
 #define creaMessageSpace(value)			\
diff --git a/src/creaSystem.h b/src/creaSystem.h
index 56e62a4..c9011c3 100644
--- a/src/creaSystem.h
+++ b/src/creaSystem.h
@@ -3,8 +3,8 @@
   Program:   crea
   Module:    $RCSfile: creaSystem.h,v $
   Language:  C++
-  Date:      $Date: 2009/09/30 15:53:19 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2009/10/09 14:09:20 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -95,7 +95,6 @@
 
 
 #if defined(_WIN32) && defined(CREA_BUILD_SHARED)
-//#include "WWW.h"
   #ifdef CREA_EXPORT_SYMBOLS
     #define CREA_EXPORT __declspec( dllexport ) 
   #else
diff --git a/src/creaVtk.h b/src/creaVtk.h
index fea59cf..84510c7 100644
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -3,7 +3,7 @@
 
 #ifdef USE_VTK
 
-#include <creaSystem.h>
+#include "creaSystem.h"
 #include <vtkImageData.h>
 
 namespace crea
@@ -41,7 +41,7 @@ namespace crea
   */
 }
 
-#include <creaVtk.txx>
+#include "creaVtk.txx"
 
 
 #endif // USE_VTK
diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index ce64d91..b0fe8b0 100644
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -19,7 +19,7 @@ namespace crea
 {
   
   template <class T>
-  vtkImageData* NewVtkImageDataFromRaw( T* data, 
+  /*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data, 
 						    int nx, 
 						    int ny,
 						    int nz,