X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIPackageBrowser.cxx;h=18de91fff0fc1b359dda7509231beec5a33e10d9;hb=01454e3b435c3c8ac4327ecddda74e7d740463f6;hp=515a707cdb1fd4f0156ab5d587b2ca597ee7ffab;hpb=355e3d011880c7febb568fd7a3c51b180cd23707;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIPackageBrowser.cxx b/kernel/src/bbtkWxGUIPackageBrowser.cxx
index 515a707..18de91f 100644
--- 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/31 13:18:04 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/04/24 13:56:34 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,7 +29,7 @@
  * \brief 
  */
 
-
+/*
 #ifdef _USE_WXWIDGETS_
 
 #define CHECKBOXVIEW 1
@@ -47,9 +47,10 @@
 namespace bbtk
 {
   //================================================================
-  WxGUIPackageBrowserBlackBox::WxGUIPackageBrowserBlackBox(wxWindow* parent,
-							   WxGUIPackageBrowser* browser,
-							   BlackBoxDescriptor* descr) :
+  WxGUIPackageBrowserBlackBox::
+  WxGUIPackageBrowserBlackBox(wxWindow* parent,
+			      WxGUIPackageBrowser* browser,
+			      BlackBoxDescriptor::Pointer descr) :
     wxPanel(parent, -1),
     mBrowser(browser),
     mDescriptor(descr)
@@ -111,14 +112,6 @@ namespace bbtk
       out.push_back(name);
       out.push_back(type);
       out.push_back(descr);
-      /* = 
-	"<TR><TD style='vertical-align: top;' bgcolor=\"" + col
-	+"\"><B><PRE> "+name+" </PRE></B></TD>"
-	+ "<TD style='vertical-align: top;' bgcolor=\""+col
-	+"\"><I><PRE> "+type+" </PRE></I></TD>"
-	+ "<TD style='vertical-align: top;' bgcolor=\""+col
-	+"\">"+descr+"</TD></TR>\n";
-      */
 
       if (iotype==0) user_defined.push_back(out);
       else if (iotype==1) ubb_defined.push_back(out);
@@ -139,25 +132,6 @@ namespace bbtk
     std::vector<std::vector<std::string> >::iterator hi;
     for (hi=user_defined.begin();hi!=user_defined.end();++hi) 
       {
-	/*
-	wxTextCtrl* t = new wxTextCtrl(this,-1,_T("")
-				       ,wxDefaultPosition
-				       ,wxDefaultSize 
-				       ,wxTE_READONLY
-				       );
-	t->SetDefaultStyle(ionameattr);
-	t->AppendText( std2wx((*hi)[0]) );
-	grid->Add(t);
-	
-	t =  new wxTextCtrl(this,-1,_T("")
-				       ,wxDefaultPosition
-				       ,wxDefaultSize 
-				       ,wxTE_READONLY
-				       );
-	t->SetDefaultStyle(iotypeattr);
-	t->AppendText( std2wx((*hi)[1]) );
-	grid->Add(t);
-	*/
 	
 	grid->Add( new wxStaticText(this,-1,std2wx((*hi)[0])));
 	grid->Add( new wxStaticText(this,-1,std2wx((*hi)[1])));
@@ -228,14 +202,6 @@ namespace bbtk
       out.push_back(name);
       out.push_back(type);
       out.push_back(descr);
-      /* = 
-	"<TR><TD style='vertical-align: top;' bgcolor=\"" + col
-	+"\"><B><PRE> "+name+" </PRE></B></TD>"
-	+ "<TD style='vertical-align: top;' bgcolor=\""+col
-	+"\"><I><PRE> "+type+" </PRE></I></TD>"
-	+ "<TD style='vertical-align: top;' bgcolor=\""+col
-	+"\">"+descr+"</TD></TR>\n";
-      */
 
       if (iotype==0) user_defined.push_back(out);
       else if (iotype==1) ubb_defined.push_back(out);
@@ -303,7 +269,7 @@ namespace bbtk
 				    WxGUIPackageBrowserUser* user )
     : wxPanel(parent, -1),
       mUser(user),
-      mInterpreter(0)
+      mInterpreter()
   {
 
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
@@ -339,26 +305,26 @@ namespace bbtk
   //================================================================
   WxGUIPackageBrowser::~WxGUIPackageBrowser()
   {
-    std::cout << "del interpreter" << std::endl;
-    if (mInterpreter) delete mInterpreter;
-    std::cout << "ok" << std::endl;
+    // std::cout << "del interpreter" << std::endl;
+    //   if (mInterpreter) delete mInterpreter;
+    //    std::cout << "ok" << std::endl;
   }
   //================================================================
 
   //================================================================
   void WxGUIPackageBrowser::IncludeAll()
   {
-    if (!mInterpreter) mInterpreter = new bbtk::Interpreter();
+    if (!mInterpreter) mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetCommandLine(true);
     mInterpreter->InterpretLine("include *");
 
-    Factory* F = mInterpreter->GetExecuter()->GetFactory();
+    Factory::Pointer F = mInterpreter->GetExecuter()->GetFactory();
     BuildFromFactory(F);
   }
   //================================================================
   //================================================================
   
-  void WxGUIPackageBrowser::BuildFromFactory(Factory* F)
+  void WxGUIPackageBrowser::BuildFromFactory(Factory::Pointer F)
   {
 #ifndef LINUX
     wxTreeMultiWindowInfo wndinfo(wxTMC_BG_ADJUST_CNT, 8, 0);
@@ -370,7 +336,7 @@ namespace bbtk
     Factory::PackageMapType::const_iterator i;
     for (i=M.begin();i!=M.end();++i)
       {
-	Package* P = i->second.mPackage;
+	Package::Pointer P = i->second;
 	wxString packname = std2wx(P->GetName());
 	if (packname==_T("user")) continue;
 	wxTreeMultiItem pack = mTree->AddRoot(packname,packname);
@@ -420,14 +386,14 @@ namespace bbtk
     //    WxGUICommand* com = new WxGUICommand(this,this);
     //    sizer->Add(com);
     
-    SetSizer(sizer);
+    SetSizer(sizer); 
+
+
+    // Creates the parent window of all bbtk windows as a child of this
+    Wx::CreateTopWindow(this);
+    //    bbtkAddWxObserver(WxGUIConsole::OnWxSignal);
+
 
-    // Creates and sets the parent window of all bbtk windows
-    wxWindow* top = new wxPanel(this,-1);
-    top->Hide();
-    
-    Wx::SetTopWindow(top);
-   
     SetAutoLayout(true);
     Layout();
   }
@@ -443,3 +409,4 @@ namespace bbtk
 
 
 #endif //_USE_WXWIDGETS_
+*/