*** empty log message ***

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index 23d4dd54cfa88c443c74a2babc70eba567c43f89..6003f596f5b103f4226210ebe721af3239a5dbad 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -152,7 +152,7 @@ ENDIF(NOT BBTK_INSTALL_NO_DEVELOPMENT)
 ADD_DEF(BBTK_EXPORT_SYMBOLS)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty)
-
+ADD_DEFINITIONS(-DCHECKBOXVIEW=1)
 #-----------------------------------------------------------------------------
 # Sources files 
 FILE(GLOB SOURCES "." "*.cxx" "*.cpp" "ThirdParty/wx/treemultictrl/*.cpp")

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.cxx b/kernel/src/bbtkWxGUIPackageBrowser.cxx
index 2a5d0f5561845480f41c34e01528bbf3450e1602..3f2fead373d611866c6c879ff44d37c033cf1d94 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser.cxx
+++ b/kernel/src/bbtkWxGUIPackageBrowser.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/28 13:42:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/28 15:04:10 $
+  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
@@ -32,6 +32,8 @@
 
 #ifdef _USE_WXWIDGETS_
 
+#define CHECKBOXVIEW 1
+
 #include "bbtkWxGUIPackageBrowser.h"
 #include "ThirdParty/wx/treemultictrl/wxTreeMultiCtrl.h"
 #include "bbtkInterpreter.h"
@@ -49,7 +51,13 @@ namespace bbtk
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     
     wxStaticText* s = new wxStaticText(this,-1,
-                                      std2wx(descr->GetTypeName()));
+                                      std2wx(descr->GetDescription()));
+    sizer->Add(s,1,wxGROW);
+    s = new wxStaticText(this,-1,
+                        std2wx(descr->GetAuthor()));
+    sizer->Add(s,1,wxGROW);
+    s = new wxStaticText(this,-1,
+                        std2wx(descr->GetCategory()));
 
     sizer->Add(s,1,wxGROW);
  
@@ -96,6 +104,7 @@ namespace bbtk
     mTree->SetCaptionFont(somefont);
 
     mTree->SetSpacingY(1);
+    // mTree->SetCheckboxView(true);
 
     SetSizer(sizer);
     SetAutoLayout(true);
@@ -107,25 +116,33 @@ namespace bbtk
   //================================================================
   WxGUIPackageBrowser::~WxGUIPackageBrowser()
   {
+    std::cout << "del interpreter" << std::endl;
     if (mInterpreter) delete mInterpreter;
+    std::cout << "ok" << std::endl;
   }
   //================================================================
 
   //================================================================
   void WxGUIPackageBrowser::IncludeAll()
   {
-#ifndef LINUX
-    wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_CNT, 8, 0);
-#else
-    wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_ALL, 8, 0);
-#endif
-    
     if (!mInterpreter) mInterpreter = new bbtk::Interpreter();
     mInterpreter->SetCommandLine(true);
     mInterpreter->InterpretLine("include *");
 
     Factory* F = mInterpreter->GetExecuter()->GetFactory();
-    
+    BuildFromFactory(F);
+  }
+  //================================================================
+  //================================================================
+  
+  void WxGUIPackageBrowser::BuildFromFactory(Factory* F)
+  {
+#ifndef LINUX
+    wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_CNT, 8, 0);
+#else
+    wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_ALL, 8, 0);
+#endif
+    mTree->DeleteAllItems();    
     const Factory::PackageMapType& M = F->GetPackageMap();
     Factory::PackageMapType::const_iterator i;
     for (i=M.begin();i!=M.end();++i)
@@ -135,6 +152,12 @@ namespace bbtk
        if (packname==_T("user")) continue;
        wxTreeMultiItem pack = mTree->AddRoot(packname,packname);
 
+       wxString packinfo = std2wx(P->GetDescription());
+       packinfo += _T(" - by ")+ std2wx(P->GetAuthor());
+       packinfo += _T(" - v. ")+ std2wx(P->GetVersion());
+       mTree->AppendWindow(pack, 
+                           new wxStaticText(mTree,
+                                            -1,packinfo));
        Package::BlackBoxMapType::iterator j;
        for (j=P->GetBlackBoxMap().begin();
             j!=P->GetBlackBoxMap().end();

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.h b/kernel/src/bbtkWxGUIPackageBrowser.h
index 0c9346b922c4dbc8679ac8e8d4ed5ae64c3d419c..3958d4c8903c9e3cbb79175eecd0d881178520fb 100644 (file)
--- a/kernel/src/bbtkWxGUIPackageBrowser.h
+++ b/kernel/src/bbtkWxGUIPackageBrowser.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/28 13:42:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/28 15:04:10 $
+  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
@@ -88,6 +88,7 @@ namespace bbtk
     ~WxGUIPackageBrowser();
 
     void IncludeAll();
+    void BuildFromFactory(Factory* f);
 
   private:
     WxGUIPackageBrowserUser* mUser;