X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIConsole.cxx;h=a4d4299144b6067fbe87626fe27f4bcb86bfc276;hb=5f49dad37400bf38b313463dd56455ea91086f5f;hp=fe4619f377188dbb6b9a58f44816993669673434;hpb=2b7ac5ab18a67097a812e20a5ecba3dac63f29cc;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIConsole.cxx b/kernel/src/bbtkWxGUIConsole.cxx
index fe4619f..a4d4299 100644
--- a/kernel/src/bbtkWxGUIConsole.cxx
+++ b/kernel/src/bbtkWxGUIConsole.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIConsole.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/20 15:27:57 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/04/18 12:59:16 $
+  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
@@ -64,7 +64,7 @@ namespace bbtk
 //    m_mgr = new wxAuiManager(this);
 	m_mgr.SetManagedWindow(this);
    
-    mInterpreter = new bbtk::Interpreter();
+	mInterpreter = bbtk::Interpreter::New();
     mInterpreter->SetUser(this);
     mInterpreter->SetCommandLine(true);
     //==============
@@ -187,7 +187,7 @@ namespace bbtk
     mWxGUIOutputMessages->Print(s,wxRED);
 
     if (  mInterpreter->InterpretLine( command ) == 
-	  Interpreter::QUIT )
+	  Interpreter::Interpreter_QUIT )
       {
 	Close(true); 
       }
@@ -199,7 +199,7 @@ namespace bbtk
   bool WxGUIConsole::InterpretFile( const std::string& filename) 
   { 
     if ( mInterpreter->InterpretFile(filename) ==
-	 Interpreter::ERROR ) 
+	 Interpreter::Interpreter_ERROR ) 
       {
 	return false;
       }
@@ -214,7 +214,7 @@ namespace bbtk
     std::string filename = mWxGUIHtmlBrowser->GetCurrentPage();//wx2std(temp);
     size_t s = filename.length();
 
-    Interpreter* I = new Interpreter;
+    Interpreter::Pointer I = Interpreter::New();
     
     if ((s>3) && (filename[s-1]=='s')
 	&& (filename[s-2]=='b')
@@ -230,8 +230,7 @@ namespace bbtk
       {
 	SetStatusText(_T("The current page is not a bbs file : cannot execute it"));
       }
-    
-    delete I;
+
   }
   //================================================================  
 
@@ -275,18 +274,11 @@ namespace bbtk
   //================================================================
   void WxGUIConsole::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event))
   {
-printf("EED WxGUIConsole::OnMenuCreatePackage 01 \n");
     std::string command("toolsbbtk/appli/CreatePackage");
-printf("EED WxGUIConsole::OnMenuCreatePackage 02 \n");
 
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
-printf("EED WxGUIConsole::OnMenuCreatePackage 03 \n");
-    Interpreter* I = new Interpreter;    
-printf("EED WxGUIConsole::OnMenuCreatePackage 04 \n");
+    Interpreter::Pointer I = Interpreter::New();    
     I->InterpretFile(command);
-printf("EED WxGUIConsole::OnMenuCreatePackage 05 \n");
-    delete I;
-printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n");
   }
   //================================================================
 
@@ -296,9 +288,8 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n");
   {
     std::string command("toolsbbtk/appli/CreateBlackBox");
     bbtkMessage("Debug",1,"Executing : '"<<command<<"'"<<std::endl);
-    Interpreter* I = new Interpreter;    
+    Interpreter::Pointer I = Interpreter::New();    
     I->InterpretFile(command);
-    delete I;
   }
   //================================================================
   
@@ -323,21 +314,44 @@ printf("EED WxGUIConsole::OnMenuCreatePackage 06 \n");
   //================================================================
   void WxGUIConsole::OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event))
   {
+/*
     std::string doc_path = ConfigurationFile::GetInstance().Get_doc_path();
     std::string filepath = doc_path+"/bbdoc/make-index.bbs";
     Interpreter* I = new Interpreter;    
-
-//EED	std::cout << "bbi: include "<<filepath<<std::endl;
-//EED	I->InterpretFile( filepath );
-
     I->InterpretLine( "exec freeze");
     I->InterpretLine( "include *");
+    I->InterpretLine( "help packages");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-alpha.html Initials");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-package.html Packages");
     I->InterpretLine( "index "+doc_path+"/bbdoc/index-category.html Categories");
-    I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors");
-    
+    I->InterpretLine( "index "+doc_path+"/bbdoc/index-adaptors.html Adaptors");    
     delete I;
+*/
+
+	std::string bin_path		= ConfigurationFile::GetInstance().Get_bin_path();
+	std::string doc_path		= ConfigurationFile::GetInstance().Get_doc_path();
+	std::string bbdoc_path		= doc_path+"/bbdoc";
+    std::string make_index_path = "\"" + bbdoc_path+"/make-index.bbs\"";
+
+	std::string strcommand0		= "cd "+bbdoc_path+" && mkdir tmp && cd tmp";
+
+	std::string strcommand1		= "cd "+bbdoc_path+"/tmp";
+    std::string strcommand2		= "\""+bin_path+"/bbi\" -n "+make_index_path;
+#ifdef WIN32 
+    std::string strcommand3		= "move index*.html ../.";
+#else
+    std::string strcommand3		= "mv index*.html ../.";
+#endif
+
+	std::string strcommand		=	strcommand1 +" && "+
+									strcommand2 +" && "+
+									strcommand3;
+
+	std::cout << "system: " << strcommand0 << std::endl;
+	std::cout << "system: " << strcommand << std::endl;
+
+	system ( strcommand0.c_str() );
+	system ( strcommand.c_str() );
   }
   //================================================================