X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIPackageBrowser2.h;h=edf43412bfcd65762cfdee7793c856dd177b8533;hb=10038b32bc97ccdd4cf6cec3a48cc7113840c5af;hp=27745bd4534b126857bd4e484565b978ae2c8260;hpb=981ac411655ee59f6cf7a6e89099a4366ac4b18b;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.h b/kernel/src/bbtkWxGUIPackageBrowser2.h
index 27745bd..edf4341 100644
--- a/kernel/src/bbtkWxGUIPackageBrowser2.h
+++ b/kernel/src/bbtkWxGUIPackageBrowser2.h
@@ -1,20 +1,35 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser2.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/04 08:04:05 $
-  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: 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 
@@ -40,6 +55,7 @@
 #include "bbtkWx.h"
 
 #include "bbtkInterpreter.h"
+#include <wx/aui/aui.h>
 
 #include "wx/listctrl.h"
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
@@ -64,7 +80,7 @@ namespace bbtk
   {
   public:
     WxGUIPackageBrowser2User() {}
-    ~WxGUIPackageBrowser2User() {}
+    virtual ~WxGUIPackageBrowser2User() {}
     /// Callback invoked when the 'run' button is pressed
     virtual void WxGUIPackageBrowser2Run() {}
   };
@@ -118,7 +134,7 @@ namespace bbtk
     void SetUser(WxGUIBlackBoxListUser* u) { mUser = u; }
 
     // add one item to the listctrl in report mode
-    void Insert(BlackBoxDescriptor* d);
+    void Insert(BlackBoxDescriptor::Pointer d);
     
     // 
     void OnColClick(wxListEvent& event);
@@ -183,9 +199,9 @@ private:
     ~WxGUIPackageBrowser2();
 
     void IncludeAll();
-    void BuildFromFactory(Factory* f);
+    void BuildFromFactory(Factory::Pointer f);
     void RebuildList();
-    bool IsVisible(BlackBoxDescriptor* d);
+    bool IsVisible(BlackBoxDescriptor::Pointer d);
 
     void OnFilter(wxCommandEvent&);
  
@@ -193,9 +209,10 @@ private:
     void WxGUIBlackBoxListUserOnSelected( BlackBoxDescriptor* );
 
   private:
+    wxAuiManager m_mgr;
     WxGUIPackageBrowser2User* mUser;
-    Interpreter* mInterpreter;
-    Factory* mFactory;
+    Interpreter::Pointer mInterpreter;
+    Factory::Pointer mFactory;
     WxGUIBlackBoxList* mBoxList;
     WxGUIBlackBoxInfo* mBoxInfo;
 
@@ -205,6 +222,12 @@ private:
     wxTextCtrl* mCategoryFilter;
     wxTextCtrl* mInputTypeFilter;
     wxTextCtrl* mOutputTypeFilter;
+    wxTextCtrl* mInputNatureFilter;
+    wxTextCtrl* mOutputNatureFilter;
+
+    wxCheckBox* mShowWidgetsFilter;
+    wxCheckBox* mShowAdaptorsFilter;
+    wxCheckBox* mShowGUIsFilter;
 
    DECLARE_EVENT_TABLE()  
   };