X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.h;h=e3100529467a3a0bfb8ced64823a0f4453d62bc9;hb=fef49cf06296bb65a839585dba63f282a89d91fc;hp=1e245e14e9171f4f2c824b3d8f4c4db7a90fdf93;hpb=28300312b87bd50ca689d497c5a500ad4d343d5d;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.h b/kernel/src/bbtkWxGUIConsole.h
index 1e245e1..e310052 100644
--- a/kernel/src/bbtkWxGUIConsole.h
+++ b/kernel/src/bbtkWxGUIConsole.h
@@ -1,20 +1,42 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkWxGUIConsole.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 09:51:29 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.8 $
+=========================================================================*/
+
+
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -63,9 +85,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
@@ -76,7 +98,7 @@ namespace bbtk
     /// which creates but does not execute pipelines.
     void SetNoExecMode(bool b) { mInterpreter->SetNoExecMode(b); }
 
-    void SetDialogMode(Interpreter::DialogModeType t) 
+	void SetDialogMode(Interpreter::DialogModeType t) 
     { mInterpreter->SetDialogMode(t); }
     
     /// Runs the interpretation of a file
@@ -90,6 +112,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 +125,16 @@ 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);
+
+    void OnClose(wxCloseEvent& event);
+
+
   private:
     wxAuiManager m_mgr;
-    Interpreter* mInterpreter;
+    Interpreter::Pointer mInterpreter;
 
     
 //EED    wxNotebook* mwxNotebook;
@@ -118,8 +148,9 @@ namespace bbtk
     wxButton* mwxButtonRun;
 
   public:
-	  
- 
+    
+    // Callback invoked by bbtk top window when something changes
+    void OnWxSignal();
     DECLARE_EVENT_TABLE()
 	
   };