X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxGUIScriptingInterface.cxx;h=4d0a5104bea454f12178890157a5502987b4503e;hb=dad2f344cba135eec67eba321b29ffd61975e9c9;hp=b7745ad0d43c0997ebcc10052f4abdf30d32508b;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index b7745ad..4d0a510 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.cxx
+++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/04/25 07:33:17 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -137,12 +137,22 @@ namespace bbtk
    
     mWxGUICommand->SetFocus();
 
-    // Creates and sets the parent window of all bbtk windows
-    wxWindow* top = new wxPanel(this,-1);//,_T("top"));
-    top->Hide();
-    Wx::SetTopWindow(top);
+    /*
     
-
+    mwxNotebook = new wxAuiNotebook(this,  
+				    -1,
+				    wxPoint(0, 0),
+				    wxSize(500,500),
+				    wxAUI_NB_TAB_SPLIT 
+				    | wxAUI_NB_TAB_MOVE
+				    | wxAUI_NB_TAB_EXTERNAL_MOVE
+				    //| wxAUI_NB_WINDOWLIST_BUTTON
+				    //|wxAUI_NB_SCROLL_BUTTONS
+				    // | wxAUI_NB_CLOSE_BUTTON 
+				    //| wxAUI_NB_CLOSE_ON_ACTIVE_TAB
+				    //| wxAUI_NB_CLOSE_ON_ALL_TABS
+				    | wxNO_BORDER);
+    */
     //
     m_mgr.AddPane(mWxGUITextEditor,
 		  wxAuiPaneInfo().Name(wxT("editor_content"))
@@ -151,15 +161,17 @@ namespace bbtk
 		  .MaximizeButton(true)
 		  .Center()
 		  .MinSize(wxSize(100,100))
-		  );     
+		  );   
+  
     m_mgr.AddPane(mWxGUIHtmlBrowser,
 		  wxAuiPaneInfo().Name(wxT("browser_content"))
 		  .Caption(wxT("Help"))
 		  .MinimizeButton(true)
 		  .MaximizeButton(true)
 		  .Right()
-		  .MinSize(wxSize(100,100))
+		  .MinSize(wxSize(200,100))
 		  );
+
     m_mgr.AddPane(mWxGUIOutputMessages,
 		  wxAuiPaneInfo().Name(wxT("messages_content"))
 		  .Caption(wxT("Messages"))
@@ -180,6 +192,10 @@ namespace bbtk
     //    m_mgr.AddPane(mwxButtonRun,
     //		  wxAuiPaneInfo().Name(wxT("button_run_content")));     
 
+    // Creates the parent window of all bbtk windows as a child of this
+    Wx::CreateTopWindow(this);
+    // Add the method OnWxSignal as a Wx::Signal observer 
+    //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal);
 
 //.PaneBorder(false)); 
     m_mgr.Update();
@@ -206,6 +222,10 @@ namespace bbtk
   //================================================================
   
 #define CATCH_MACRO							\
+  catch (QuitException e)						\
+    {									\
+      std::cout << "* quit exception caught"<<std::endl;		\
+    }									\
   catch (InterpreterError e)						\
     {									\
       std::cerr << "* IERROR : "<<e.GetMessage()<<std::endl;		\
@@ -256,10 +276,13 @@ namespace bbtk
     (*buf) << mWxGUITextEditor->GetCurrentPage()->GetText();
     try 
       {
+	std::cout << "RUN"<<std::endl;
 	if (mwxMenuItemReset->IsChecked()) WxGUICommandEnter("reset");
 	mInterpreter->InterpretBuffer(buf);
+	std::cout << "EO RUN"<<std::endl;
       }
-    CATCH_MACRO
+    CATCH_MACRO;
+    std::cout << "EO RUN 3"<<std::endl;
   }
   //================================================================  
 
@@ -295,7 +318,7 @@ namespace bbtk
 	commandStr = "gedit ";
 #endif 
 	commandStr = commandStr + configFile;
-	std::cout << "system: " << commandStr << std::endl;
+	//	std::cout << "system: " << commandStr << std::endl;
 	system ( commandStr.c_str() );
   }
   //================================================================
@@ -337,7 +360,7 @@ namespace bbtk
     std::string strappli="gnome-open ";
 #endif
     std::string strcommand = strappli +default_temp_dir+"/temp_dir/workspace_workspacePrototype.png";
-	std::cout << "system: " << strcommand << std::endl;
+    //	std::cout << "system: " << strcommand << std::endl;
     system ( strcommand.c_str() );
 
   }
@@ -383,7 +406,6 @@ namespace bbtk
   //================================================================  
   bool WxGUIScriptingInterface::WxGUIHtmlBrowserUserOnLinkClicked(const std::string& target)
   {
-    std::cout << "OnLink"<<std::endl; 
     size_t s = target.length();
     if ((s>3) && (target[s-1]=='s')
 	&& (target[s-2]=='b')