#3045 BBTK Bug New Normal - Fedora 24 vtkMessageManager << conflict gcc6

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

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 99a751447ae18c3cf0be902e357fd4a7dab8c8a3..a31fe0f20ceb0b589eae32be38e01864d09a1e5f 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkInterpreter.cxx,v $
   Language:  C++
-  Date:      $Date: 2012/05/30 17:17:00 $
-  Version:   $Revision: 1.92 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.95 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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 
@@ -498,7 +505,6 @@ namespace bbtk
        
        void Interpreter::commandLoad(const std::string &packageName) //virtual
     {
-               printf("EED Interpreter::commandLoad %s\n", packageName.c_str());
                GetExecuter()->LoadPackage(packageName);
     }
 
@@ -1287,6 +1293,14 @@ namespace bbtk
        }       
        //=======================================================================
        
+       
+       void Interpreter::SetTypeOfScript_Application()
+       {
+               GetExecuter()->SetTypeOfScript_Application();
+       }
+
+       
+       
 /*EED Borrame  
   //=======================================================================
 void Interpreter::SwitchToStream( std::stringstream* stream )
@@ -1563,7 +1577,11 @@ void Interpreter::commandHelp(const std::vector<std::string>& words)
     CommandDictType::iterator c;
     c = mCommandDict.find(s);
     if ( c == mCommandDict.end() ) {
-      bbtkError(s<<" : Unknown command");
+
+//EED 2016-12-22
+//      bbtkError(s<<" : Unknown command");
+     std::string tmpSS=s+" : Unknown command";
+      bbtkError(tmpSS);
     }  
     //    std::cout << " " << s << " : "<<  std::endl;
     //    CommandParamDictType::iterator i;
@@ -2006,8 +2024,21 @@ void  Interpreter::commandNewGUI(const std::string& boxname,
           ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) )
        continue;
 #else
+// JFGA 12/12/2014 Adding WT options for compile with it.
+
+/*#if USE_WT
+
+       if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) ||
+          ( d->GetCreatorTypeInfo() == typeid(WtBlackBoxDescriptor)) )
+       continue;
+       
+
+#else
+*/
       if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) )
        continue;
+//#endif
+
 #endif
       bool widok = true;
       std::string widget,adaptor;