*** empty log message ***

[bbtk.git] / kernel / src / bbtkBlackBoxDescriptor.cxx

diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index e4318a7a3dd3d7259bef6bb5486509d2cc76a89e..00127c1f2a99d432fcccfe4218cb9b816004a7f1 100644 (file)
--- a/kernel/src/bbtkBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkBlackBoxDescriptor.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/06 13:45:12 $
-  Version:   $Revision: 1.17 $
-                                                                                
-  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/bbtk/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: 2009/04/08 07:56:11 $
+  Version:   $Revision: 1.20 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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 bbtk::BlackBoxDescriptor : (abstract) describes a BlackBox (name, description, author) and is able to create an instance of it.
@@ -313,7 +326,7 @@ namespace bbtk
 
 
     std::string descr = GetDescription();
-    Utilities::html_format(descr);
+    //Utilities::html_format(descr);
     std::string author = GetAuthor();
     Utilities::html_format(author);
 
@@ -377,12 +390,14 @@ namespace bbtk
          col = ubbcol; 
          iotype = 1;
        }
+#ifdef USE_WXWIDGETS
       else if (in->second->GetCreatorTypeInfo() == 
               typeid(WxBlackBoxDescriptor))
        {
          col = wxbbcol; 
          iotype = 2;
        }
+#endif
 
       std::string name(in->second->GetName());
       Utilities::html_format(name);
@@ -393,7 +408,7 @@ namespace bbtk
       Utilities::html_format(type);
       
       std::string descr(in->second->GetDescription());
-      Utilities::html_format(descr);
+      //Utilities::html_format(descr);
       
       std::string out = 
        "<TR><TD style='vertical-align: top;' bgcolor=\"" + col
@@ -440,12 +455,14 @@ namespace bbtk
            col = ubbcol; 
            iotype = 1;
          }
+#ifdef USE_WXWIDGETS
        else if (o->second->GetCreatorTypeInfo() == 
                 typeid(WxBlackBoxDescriptor))
          {
            col = wxbbcol; 
            iotype = 2;
          }
+#endif
        
        std::string name(o->second->GetName());
        Utilities::html_format(name);
@@ -456,7 +473,7 @@ namespace bbtk
        Utilities::html_format(type);
        
        std::string descr(o->second->GetDescription());
-       Utilities::html_format(descr);
+       //Utilities::html_format(descr);
        
        std::string out = 
          "<TR><TD style='vertical-align: top;' bgcolor=\"" + col