*** empty log message ***

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index fc5f3f18638104b9d3046cc162c02de60a6c5259..7356fd22d9f09f9321a445d86bbbd799815156b5 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++

-  Date:      $Date: 2008/12/12 12:11:21 $
-  Version:   $Revision: 1.79 $
+  Date:      $Date: 2008/12/12 12:56:28 $
+  Version:   $Revision: 1.80 $

 =========================================================================*/
 
 /* ---------------------------------------------------------------------
 =========================================================================*/
 
 /* ---------------------------------------------------------------------


@@ -684,7 +684,6 @@ namespace bbtk
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);

-    bbtkMessage("echo",2,line<<std::endl);

 
     std::vector<std::string> words;
     SplitLine(line,words);
 
     std::vector<std::string> words;
     SplitLine(line,words);


@@ -743,8 +742,28 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
     int level=0;
     std::string left,right,left2,right2;
     std::string filename;
     int level=0;
     std::string left,right,left2,right2;
     std::string filename;

+    if (command.code==cMessage)
+      {
+       if (words.size()<3)
+         {
+           mVirtualExecuter->HelpMessages();
+         }
+        else
+         {
+           sscanf(words[2].c_str(),"%d",&level);
+           mVirtualExecuter->SetMessageLevel(words[1],level);
+         }
+      }
+    else 
+      {
+       bbtkMessage("echo",2,line<<std::endl);
+      }
+

     switch (command.code) 
     {
     switch (command.code) 
     {

+      case cMessage : 
+      
+        break;

       case cNew :
         mVirtualExecuter->Create(words[1],words[2]);
         break;
       case cNew :
         mVirtualExecuter->Create(words[1],words[2]);
         break;


@@ -861,17 +880,6 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         Help(words);
         break;
 
         Help(words);
         break;
 

-      case cMessage : 
-        if (words.size()<3)
-        {
-         mVirtualExecuter->HelpMessages();
-        }
-        else
-        {
-         sscanf(words[2].c_str(),"%d",&level);
-          mVirtualExecuter->SetMessageLevel(words[1],level);
-        }
-        break;

 
       case cGraph :
         Graph(words);
 
       case cGraph :
         Graph(words);

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 3c99040dd699188f425cddfa1ae99d50442e393e..91d10850435988e294add1de283877514472d1c7 100644 (file)
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++

-  Date:      $Date: 2008/12/11 09:50:35 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2008/12/12 12:56:28 $
+  Version:   $Revision: 1.36 $

 =========================================================================*/
 
 /* ---------------------------------------------------------------------
 =========================================================================*/
 
 /* ---------------------------------------------------------------------


@@ -95,6 +95,7 @@ namespace bbtk
     bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
     Wx::IncNbWindowsShown();
     mShown = true;
     bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
     Wx::IncNbWindowsShown();
     mShown = true;

+    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();

   }
   //=========================================================================
 
   }
   //=========================================================================
 


@@ -248,19 +249,19 @@ namespace bbtk
     bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
                     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();
     bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
                     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();

-  wxFrame::Show();
+    wxFrame::Show();

     // This Update is ** MANDATORY ** 
     // to synchronize wxvtkRenderWindowInteractor objects
     // (force wx objects creation **NOW**)
     // This Update is ** MANDATORY ** 
     // to synchronize wxvtkRenderWindowInteractor objects
     // (force wx objects creation **NOW**)

-
-
+    
+    

 #if defined(_WIN32)
 #if defined(_WIN32)

-      wxFrame::Refresh();
+    wxFrame::Refresh();

 #endif
 #endif

-
-      wxFrame::Update();
-      wxFrame::SetFocus();
-    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
+    
+    wxFrame::Update();
+    wxFrame::SetFocus();
+    //    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();

   }
   //=========================================================================
 
   }
   //=========================================================================
 

diff --git a/packages/wx/bbs/appli/wxTour.bbs b/packages/wx/bbs/appli/wxTour.bbs
index d22aaca45c123a59d68459afad3de027bbed7fe4..3f27202c769249c24a5436af109a764e774bd3a1 100644 (file)
--- a/packages/wx/bbs/appli/wxTour.bbs
+++ b/packages/wx/bbs/appli/wxTour.bbs
@@ -5,7 +5,7 @@ category "demo"
 include wx
 #==================================================================
 print " "
 include wx
 #==================================================================
 print " "

-print "===================================================="
+print "============================"

 print "A Slider whose output is plugged into an OutputText"
 message echo 2
 
 print "A Slider whose output is plugged into an OutputText"
 message echo 2
 


@@ -39,14 +39,14 @@ exec main
 message echo 0
 clear
 print " "
 message echo 0
 clear
 print " "

-print "===================================================="
+print "============================"

 print "Splitting a window into two adjustable parts"
 #==================================================================
 message echo 2
 
 new LayoutSplit main
 print "Splitting a window into two adjustable parts"
 #==================================================================
 message echo 2
 
 new LayoutSplit main

-set main.WinDialog true

 
 

+set main.WinDialog true

 exec main
 
 #==================================================================
 exec main
 
 #==================================================================

diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx
index c5d6cf907cd4bafa44b40f5f832eefc4081416c3..45e3ea58e3d46bf8b00e78b9a42b024c7117385b 100644 (file)
--- a/packages/wx/src/bbwxLayoutSplit.cxx
+++ b/packages/wx/src/bbwxLayoutSplit.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.cxx,v $
   Language:  C++
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.cxx,v $
   Language:  C++

-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/12/12 12:56:33 $
+  Version:   $Revision: 1.9 $

 =========================================================================*/
 
 /* ---------------------------------------------------------------------
 =========================================================================*/
 
 /* ---------------------------------------------------------------------


@@ -99,6 +99,7 @@ namespace bbwx
   // when window is shown
   void  LayoutSplit::OnShowWidget()
   {
   // when window is shown
   void  LayoutSplit::OnShowWidget()
   {

+    //    std::cout << "LayoutSplit::OnShowWidget()" << std::endl;

     if (bbGetOutputWidget()==0)
       {
        return;
     if (bbGetOutputWidget()==0)
       {
        return;

diff --git a/packages/wxvtk/bbs/boxes/bbDoubleSlicer.bbs b/packages/wxvtk/bbs/boxes/bbDoubleSlicer.bbs
index b779d44d69a2527612cf364e50814d4aa8007ca7..595744ff8cae322e29417d3663baefa888c450d4 100644 (file)
--- a/packages/wxvtk/bbs/boxes/bbDoubleSlicer.bbs
+++ b/packages/wxvtk/bbs/boxes/bbDoubleSlicer.bbs
@@ -7,12 +7,15 @@ define DoubleSlicer wxvtk
  description "Simple viewer displaying the same slice of two images. The slice is controlled by a slider. See <a href='#exampleDoubleSlicer'>exampleDoubleSlicer.bbs</a>."
  author "laurent.guigues at creatis.insa-lyon.fr"
 
  description "Simple viewer displaying the same slice of two images. The slice is controlled by a slider. See <a href='#exampleDoubleSlicer'>exampleDoubleSlicer.bbs</a>."
  author "laurent.guigues at creatis.insa-lyon.fr"
 

- new LayoutLine main
+ new LayoutSplit main

  new LayoutLine slicers
  new Viewer2D slicer1
  new Viewer2D slicer2
  new Slider slider
 
  new LayoutLine slicers
  new Viewer2D slicer1
  new Viewer2D slicer2
  new Slider slider
 

+ set main.Proportion 80
+ set slicers.Orientation HORIZONTAL
+

  connect slicers.Widget main.Widget1
  connect slicer1.Widget slicers.Widget1
  connect slicer2.Widget slicers.Widget2
  connect slicers.Widget main.Widget1
  connect slicer1.Widget slicers.Widget1
  connect slicer2.Widget slicers.Widget2


@@ -39,6 +42,7 @@ define DoubleSlicer wxvtk
  input In1 slicer1.In "Left (or top) image"
  input In2 slicer2.In "Right (or bottom) image"
 
  input In1 slicer1.In "Left (or top) image"
  input In2 slicer2.In "Right (or bottom) image"
 

+ input WinDialog main.WinDialog "Execute in dialog mode"

  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Width of the window"
  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Width of the window"

diff --git a/packages/wxvtk/bbs/boxes/bbSimpleSlicer.bbs b/packages/wxvtk/bbs/boxes/bbSimpleSlicer.bbs
index 89796ae7f5dd8c1ece81f783527e6c0ded894bbc..99d9b7030fc1188a80153b7198771c2ec1c3579d 100644 (file)
--- a/packages/wxvtk/bbs/boxes/bbSimpleSlicer.bbs
+++ b/packages/wxvtk/bbs/boxes/bbSimpleSlicer.bbs
@@ -29,6 +29,7 @@ define SimpleSlicer wxvtk
  #set main.Proportion 80
 
  input In viewer2D.In "Input image"
  #set main.Proportion 80
 
  input In viewer2D.In "Input image"

+ input WinDialog main.WinDialog "Execute in dialog mode"

  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Height of the window"
  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Height of the window"