*** empty log message ***

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index d3f02bcfb0c254977e2d2e31363b1c84b6301629..d5d4aca330aa031b1eb1f1cee0c4e583b0935d9d 100644 (file)
--- 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
        
                #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
            )
                   
                   #what about boost_thread? JPR
            )

diff --git a/src/creaMessageManager.h b/src/creaMessageManager.h
index 87fb5f887c9773b5120c2ec75cb8f213de3ef58e..9fbaae5be932bca8f282d99d4422039481da9c90 100644 (file)
--- a/src/creaMessageManager.h
+++ b/src/creaMessageManager.h
@@ -1,149 +1,58 @@
-
-

 /*! \file
 /*! \file

-
- 
-

   \brief Class creaMessageManager and Macros for outputing messages in crea
   \brief Class creaMessageManager and Macros for outputing messages in crea

-
-
-

   There are 4 kinds of messages :
   There are 4 kinds of messages :

-

   - Messages (normal messages)
   - Messages (normal messages)

-

   - Debug messages (not compiled in release)
   - Debug messages (not compiled in release)

-

   - Warnings 
   - Warnings 

-

   - Errors
   - Errors

-

   There are also "types" of messages which are strings which identify the nature of the message 
   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 
   (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...)
   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 :
   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);
   crea::MessageManager::RegisterMessageType("Kernel","Messages generated by the core classes of the library",5);

-

   where : 
   where : 

-

   -The first string is the type of the message (the category which will be used to generate a message of this type)
   -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 second string is help string

-

   -The integer is the initial level for the messages of this type (see below).
   -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 :
   To generate a message of a known type then use one of the macros :

-

   creaMessage, creaDebugMessage, creaWarning, creaError or their variants.
   creaMessage, creaDebugMessage, creaWarning, creaError or their variants.

-
-
-

   example :
   example :

-
-
-

   creaMessage("Kernel",4,"problem with "<<GetName()<<creaendl);
   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.
   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).
   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 :
   At run time, one is able to change the level of the messages displayed by using a command like :

-
-  
-

   crea::MessageManager::SetMessageLevel("Kernel",5); 
   crea::MessageManager::SetMessageLevel("Kernel",5); 

-
-  
-

   which tells the manager to display all Kernel messages of level up to 5.
   which tells the manager to display all Kernel messages of level up to 5.

-
-
-

   Variants :
   Variants :

-
-
-

   crea*Cont : continues a previous creaMessage on the same line (without rewriting the type and level)
   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 
   crea*Inc / Dec : displays the message and then increments/decrement the messages tabulation 

-
-
-

 */
 
   //===========================================================
 */
 
   //===========================================================

-

   /**
   /**

-

      \class crea::MessageManager
      \class crea::MessageManager

-

      \brief Manages the messages displayed by crea
      \brief Manages the messages displayed by crea

-

   */
 
   */
 

-
-
-
-

 #ifndef __creaMessageManager_h__
 #ifndef __creaMessageManager_h__

-

 #define __creaMessageManager_h__
 
 #define __creaMessageManager_h__
 

-
-

 // The do { } while(0) statement in macros is made to "swallow the semicolon" 
 // 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
 // see http://gcc.gnu.org/onlinedocs/cpp/Swallowing-the-Semicolon.html#Swallowing-the-Semicolon

-
-
-

 #include "creaSystem.h"
 #include "creaSystem.h"

-

 #include "creaRTTI.h" // for CREA_GET_CURRENT_OBJECT_NAME
 #include "creaRTTI.h" // for CREA_GET_CURRENT_OBJECT_NAME

-

 // Signal/slot mechanism for message events
 // Signal/slot mechanism for message events

-

 #include <boost/signal.hpp>
 #include <boost/signal.hpp>

-

 #include <boost/bind.hpp>
 #include <boost/bind.hpp>

-
-
-

 #include <string>
 #include <string>

-

 #include <map>
 #include <map>

-

 #include <iostream>
 #include <iostream>

-

 #include <sstream>
 #include <sstream>

-
-
-

 // Comment out these symbols to prevent compilation 
 // Comment out these symbols to prevent compilation 

-

 //#define CREA_COMPILE_MESSAGES
 //#define CREA_COMPILE_MESSAGES

-

 //#define CREA_COMPILE_DEBUG_MESSAGES
 //#define CREA_COMPILE_DEBUG_MESSAGES

-

 //#define CREA_COMPILE_WARNING_MESSAGES
 //#define CREA_COMPILE_WARNING_MESSAGES

-

 //#define CREA_COMPILE_ERROR_MESSAGES
 //#define CREA_COMPILE_ERROR_MESSAGES

-
-
-
-
-

 #define creaOnMessageLevel(key,value)                  \
   int __creaOnMessageLevelVariable =                   \
     crea::MessageManager::GetMessageLevel(key);                \
 #define creaOnMessageLevel(key,value)                  \
   int __creaOnMessageLevelVariable =                   \
     crea::MessageManager::GetMessageLevel(key);                \


@@ -153,8 +62,6 @@
     }                                                  \
   else if (value<= __creaOnMessageLevelVariable) 
 
     }                                                  \
   else if (value<= __creaOnMessageLevelVariable) 
 

-
-

 #ifdef CREA_PREPEND_MESSAGE_WITH_CODE
 #define creaMessageCode                                \
   key[0] << key[1] << key[2] << value << " "
 #ifdef CREA_PREPEND_MESSAGE_WITH_CODE
 #define creaMessageCode                                \
   key[0] << key[1] << key[2] << value << " "


@@ -162,8 +69,6 @@
 #define creaMessageCode ""
 #endif 
 
 #define creaMessageCode ""
 #endif 
 

-
-

 #ifdef CREA_PREPEND_MESSAGE_WITH_TAB
 #define creaMessageTab                         \
   crea::MessageManager::GetTab()
 #ifdef CREA_PREPEND_MESSAGE_WITH_TAB
 #define creaMessageTab                         \
   crea::MessageManager::GetTab()


@@ -171,8 +76,6 @@
 #define creaMessageTab ""
 #endif
 
 #define creaMessageTab ""
 #endif
 

-
-

 //#define CREA_PREPEND_MESSAGE_WITH_SPACE
 #ifdef CREA_PREPEND_MESSAGE_WITH_SPACE
 #define creaMessageSpace(value)                        \
 //#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 56e62a480a966cbebf71d8bdb5bdbb2c0aff479d..c9011c36e5e85d8e2fdbee46e917ebc7dfc2fb96 100644 (file)
--- a/src/creaSystem.h
+++ b/src/creaSystem.h
@@ -3,8 +3,8 @@
   Program:   crea
   Module:    $RCSfile: creaSystem.h,v $
   Language:  C++
   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
                                                                                 
   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)
 
 
 #if defined(_WIN32) && defined(CREA_BUILD_SHARED)

-//#include "WWW.h"

   #ifdef CREA_EXPORT_SYMBOLS
     #define CREA_EXPORT __declspec( dllexport ) 
   #else
   #ifdef CREA_EXPORT_SYMBOLS
     #define CREA_EXPORT __declspec( dllexport ) 
   #else

diff --git a/src/creaVtk.h b/src/creaVtk.h
index fea59cf35742bd8bebe45d1f50009e525c031097..84510c73c4a67cd481c8ac0292eba4fc6e320193 100644 (file)
--- a/src/creaVtk.h
+++ b/src/creaVtk.h
@@ -3,7 +3,7 @@
 
 #ifdef USE_VTK
 
 
 #ifdef USE_VTK
 

-#include <creaSystem.h>
+#include "creaSystem.h"

 #include <vtkImageData.h>
 
 namespace crea
 #include <vtkImageData.h>
 
 namespace crea


@@ -41,7 +41,7 @@ namespace crea
   */
 }
 
   */
 }
 

-#include <creaVtk.txx>
+#include "creaVtk.txx"

 
 
 #endif // USE_VTK
 
 
 #endif // USE_VTK

diff --git a/src/creaVtk.txx b/src/creaVtk.txx
index ce64d91a8f806b91df0b1417af2d9640a9313bce..b0fe8b09375237b7e77b1c7fd43f7a35cf24e46b 100644 (file)
--- a/src/creaVtk.txx
+++ b/src/creaVtk.txx
@@ -19,7 +19,7 @@ namespace crea
 {
   
   template <class T>
 {
   
   template <class T>

-  vtkImageData* NewVtkImageDataFromRaw( T* data, 
+  /*CREA_EXPORT*/ vtkImageData* NewVtkImageDataFromRaw( T* data, 

                                                    int nx, 
                                                    int ny,
                                                    int nz,
                                                    int nx, 
                                                    int ny,
                                                    int nz,