From: guigues <guigues>
Date: Fri, 25 Apr 2008 07:33:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~55
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=caba246bb51787dac9357d9244052dba34c77840;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index ef99c10..d4c6f38 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/04/22 09:40:10 $
-  Version:   $Revision: 1.63 $
+  Date:      $Date: 2008/04/25 07:33:17 $
+  Version:   $Revision: 1.64 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -591,28 +591,7 @@ namespace bbtk
       InterpretLine(line, insideComment);
     }
     CATCH_MACRO;
-    /*
-   catch (QuitException e) 
-      { 
-      status = Interpreter_QUIT;
-      }
-    catch (bbtk::Exception e) 
-      {
-	std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
-	status = Interpreter_ERROR;
-      }
-    catch (std::exception& e) 
-      {
-	std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
-	status = Interpreter_ERROR;
-    }  
-    catch (...)
-      {
-	std::cerr 
-	  << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
-	status = Interpreter_ERROR;
-      }
-    */
+  
 
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
 		     <<std::endl);
diff --git a/kernel/src/bbtkObject.cxx b/kernel/src/bbtkObject.cxx
index be8b07d..8066f7e 100644
--- a/kernel/src/bbtkObject.cxx
+++ b/kernel/src/bbtkObject.cxx
@@ -190,14 +190,17 @@ namespace bbtk
     if (Object::GetObjectsCount()>0)
       {
  	std::cout << std::endl;
-	std::cout << "************************ WARNING ********************"
+	std::cout << "**************************** WARNING ********************"
 		  <<std::endl;
 	std::cout << "**** "<< Object::GetObjectsCount()
 		  <<" bbtk objects still alive after main ended"<<std::endl;
 	std::cout << "**** "
-		  <<"Rerun with -M option to view the object list "
+		  <<"Rerun bbi with -M option or put 'object -S' in bbs file"
 		  <<std::endl;
-	std::cout << "*****************************************************"
+	std::cout << "**** "
+		  <<"to view the object list "
+		  <<std::endl;
+	std::cout << "*********************************************************"
 		  <<std::endl;
 
      }
diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx
index da54310..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/24 10:11:28 $
-  Version:   $Revision: 1.7 $
+  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,8 +137,22 @@ namespace bbtk
    
     mWxGUICommand->SetFocus();
 
+    /*
     
-
+    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"))
@@ -147,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"))
@@ -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;
   }
   //================================================================  
 
diff --git a/kernel/src/bbtkWxGUIScriptingInterface.h b/kernel/src/bbtkWxGUIScriptingInterface.h
index a59e7e8..b3c19e2 100644
--- a/kernel/src/bbtkWxGUIScriptingInterface.h
+++ b/kernel/src/bbtkWxGUIScriptingInterface.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIScriptingInterface.h,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.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -121,6 +121,8 @@ namespace bbtk
   private:
     wxAuiManager m_mgr;
     Interpreter::Pointer mInterpreter;
+ 
+    wxAuiNotebook* mwxNotebook;
 
     
 //EED    wxNotebook* mwxNotebook;
diff --git a/packages/wxvtk/bbs/boxes/bbBasicImageApplication.bbs b/packages/wxvtk/bbs/boxes/bbBasicImageApplication.bbs
index d83f1a7..53ea2f1 100644
--- a/packages/wxvtk/bbs/boxes/bbBasicImageApplication.bbs
+++ b/packages/wxvtk/bbs/boxes/bbBasicImageApplication.bbs
@@ -64,10 +64,6 @@ define BasicImageApplication
   connect refreshViewerOut.Out viewer.RefreshSlicer2
   connect runButton.BoxChange refreshViewerOut.In1
 
-#QUIT
-  set quitButton.Label "Quit"
-  set quitButton.In "quit"
-  
 
 #SAVE 
   new ImageWriter writer
@@ -89,9 +85,18 @@ define BasicImageApplication
   new CommandButton paramWindowCloseButton
   set paramWindowCloseButton.Label "Close"
   connect paramWindowCloseButton.Widget paramWindow.Widget2
-  connect paramWindowCloseButton.BoxChange paramWindow.WinHide
+  new MultipleInputs paramWindowHide
+  connect paramWindowHide.Out paramWindow.WinHide
+  connect paramWindowCloseButton.BoxChange paramWindowHide.In1
   connect paramButton.BoxChange paramWindow.BoxExecute
 
+#QUIT
+  set quitButton.Label "Quit"
+  connect quitButton.BoxChange mainWindow.WinHide
+  connect quitButton.BoxChange paramWindowHide.In2
+#  set quitButton.In "set mainWindow.WinHide '1'"
+
+
 
 # INPUTS / OUTPUTS 
   new anyItkImagePointerRelay imageOut