X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.h;h=84d32359b329c26bcee44e190e1cd82e864b0e00;hb=310a70fea52f768e60d0a844e6ef84f13e4babd4;hp=a8c328d9ef8c277966699b14f2c53ca385777f6f;hpb=1cad1aa48a5353dc6844018dc8b756f876e17394;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.h b/kernel/src/bbtkWxGUIConsole.h
index a8c328d..84d3235 100644
--- a/kernel/src/bbtkWxGUIConsole.h
+++ b/kernel/src/bbtkWxGUIConsole.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/25 06:22:53 $
-  Version:   $Revision: 1.2 $
-                                                                                
-  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: 2008/10/17 08:18:15 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -63,9 +78,9 @@ namespace bbtk
     /// Returns the Interpreter used 
     /// ONLY ONE FOR THE MOMENT BUT IN THE FUTURE CAN BE DIFFERENT 
     /// (DIFFERENT WORKSPACES)
-    Interpreter* GetInterpreter() { return mInterpreter; }
+    //Interpreter::Pointer GetInterpreter() { return mInterpreter; }
     /// Returns the Interpreter used (const)
-    const Interpreter* GetInterpreter() const { return mInterpreter; }
+    Interpreter::Pointer GetInterpreter() const { return mInterpreter; }
 
     /// Sets the inputs of the workspace : 
     /// the map is passed as is to the Executer
@@ -90,6 +105,7 @@ namespace bbtk
     void OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event));
     void OnMenuCreateBlackBox(wxCommandEvent& WXUNUSED(event));
     void OnMenuShowImageGraph(wxCommandEvent& WXUNUSED(event));
+    void OnMenuShowHTMLDoc(wxCommandEvent& WXUNUSED(event));
     void OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event));
    
 
@@ -102,9 +118,14 @@ namespace bbtk
     // WxGUICommand callbacks
     void WxGUICommandEnter(const std::string&);
 
+
+    // Overloaded Show method to handle bbtk::Wx::TopWindow auto-destruction
+    virtual bool Show(bool show = true);
+
+
   private:
     wxAuiManager m_mgr;
-    Interpreter* mInterpreter;
+    Interpreter::Pointer mInterpreter;
 
     
 //EED    wxNotebook* mwxNotebook;
@@ -118,8 +139,9 @@ namespace bbtk
     wxButton* mwxButtonRun;
 
   public:
-	  
- 
+    
+    // Callback invoked by bbtk top window when something changes
+    void OnWxSignal();
     DECLARE_EVENT_TABLE()
 	
   };