*** empty log message ***

diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
index 3ac89b63a291b462d273c882149570a3c42a3dde..1b687a7156b5ed3a10f528cdacf7b72f55cd388e 100644 (file)
--- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx
+++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:48 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/11/25 13:18:30 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -290,7 +290,7 @@ namespace bbtk
        //========================================================================
        void WxGUIHtmlBrowser::OnLinkClicked2(const wxHtmlLinkInfo& info)
        {
-               std::cout << "OLK2"<<std::endl;
+         //            std::cout << "OLK2"<<std::endl;
                bool go = true;
                if (mUser) 
                {
@@ -309,7 +309,7 @@ namespace bbtk
   //========================================================================
   void WxGUIHtmlBrowser::OnLinkClicked(wxHtmlLinkEvent& e)
   { 
-         std::cout << "OLK"<<std::endl;
+    //   std::cout << "OLK"<<std::endl;
     bool go = true;
     if (mUser) 
       {

diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index 3bdfda97a092498224c4e8f90619afe587698a15..942320e01fc1456546c2e59fe4490da09d8e6cc9 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/11/25 13:18:33 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,63 +64,70 @@ namespace bbwx
                bbSetInputWidget8(NULL);
                bbSetInputWidget9(NULL);
        }
-/*
-       void LayoutTab::TryInsertWindow(wxNotebook *book, wxWindow *widgetchild )
-       {
-                 if (widgetchild!=NULL)
-                 {
-                          widgetchild->Reparent(book);
-                          book->AddPage(widgetchild, widgetchild->GetName() );
-                          widgetchild->Show();
-                 }             
-       }
-*/
 
-       void LayoutTab::Process() 
-       { 
-       }
+  void LayoutTab::TryInsertWindow(wxNotebook *book, const std::string& input )
+  {
+    wxWindow* w = bbCreateWidgetOfInput(input,book); //panel);
+    if (w!=NULL)
+      {
+       book->AddPage(w,w->GetName());
+      }
+  }
 
-         
-       void LayoutTab::CreateWidget(wxWindow* parent) 
-       { 
-         long style = wxNB_TOP;
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|T|TOP")==true)     { style=wxNB_TOP; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|R|RIGHT")==true)   { style=wxNB_RIGHT; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"2|B|BOTTOM")==true)  { style=wxNB_BOTTOM; }
-         if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"3|L|LEFT")==true)    { style=wxNB_LEFT; }
-         wxNotebook *w = new wxNotebook(parent, //bbGetWxParent(),
-                                                                        -1, wxDefaultPosition,wxDefaultSize,style );
-         w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
-                 /*
-         TryInsertWindow(w,bbGetInputWidget1());
-         TryInsertWindow(w,bbGetInputWidget2());
-         TryInsertWindow(w,bbGetInputWidget3());
-         TryInsertWindow(w,bbGetInputWidget4());
-         TryInsertWindow(w,bbGetInputWidget5());
-         TryInsertWindow(w,bbGetInputWidget6());
-         TryInsertWindow(w,bbGetInputWidget7());
-         TryInsertWindow(w,bbGetInputWidget8());
-         TryInsertWindow(w,bbGetInputWidget9());
-*/
-
-         bbSetOutputWidget( w );
-       }
+  void LayoutTab::Process() 
+  { 
+  }
+  
+  
+  void LayoutTab::CreateWidget(wxWindow* parent) 
+  { 
+    long style = wxNB_TOP;
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"0|T|TOP")==true) 
+      { style=wxNB_TOP; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"1|R|RIGHT")==true)
+      { style=wxNB_RIGHT; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"2|B|BOTTOM")==true)
+      { style=wxNB_BOTTOM; }
+    if (bbtk::Utilities::loosematch(bbGetInputOrientation(),"3|L|LEFT")==true)
+      { style=wxNB_LEFT; }
+    wxNotebook *w = new wxNotebook(parent, //bbGetWxParent(),
+                                  -1, 
+                                  wxDefaultPosition,
+                                  wxDefaultSize,
+                                  style );
+    w->SetName( bbtk::std2wx( bbGetInputWinTitle() ) );
+    
+    TryInsertWindow(w,"Widget1");
+    TryInsertWindow(w,"Widget2");
+    TryInsertWindow(w,"Widget3");
+    TryInsertWindow(w,"Widget4");
+    TryInsertWindow(w,"Widget5");
+    TryInsertWindow(w,"Widget6");
+    TryInsertWindow(w,"Widget7");
+    TryInsertWindow(w,"Widget8");
+    TryInsertWindow(w,"Widget9");
+    
+    bbSetOutputWidget( w );
+  }
+  
   
-
   // This callback is necessary to get actual processing of the view 
   // when window is shown
   void  LayoutTab::OnShowWidget()
   {
-         bbGetOutputWidget()->Show();
-         bbUserOnShowWidget("Widget1");
-         bbUserOnShowWidget("Widget2");
-         bbUserOnShowWidget("Widget3");
-         bbUserOnShowWidget("Widget4");
-         bbUserOnShowWidget("Widget5");
-         bbUserOnShowWidget("Widget6");
-         bbUserOnShowWidget("Widget7");
-         bbUserOnShowWidget("Widget8");
-         bbUserOnShowWidget("Widget9");
+    //bbGetOutputWidget()->Show();
+    
+    bbUserOnShowWidget("Widget1");
+    bbUserOnShowWidget("Widget2");
+    bbUserOnShowWidget("Widget3");
+    bbUserOnShowWidget("Widget4");
+    bbUserOnShowWidget("Widget5");
+    bbUserOnShowWidget("Widget6");
+    bbUserOnShowWidget("Widget7");
+    bbUserOnShowWidget("Widget8");
+    bbUserOnShowWidget("Widget9");
+    
+   
   }
 
 

diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index 6d973687c9a6384e96991d632bc4a7147d3dd4b1..ee306d782fa12d7429f691511024366f605d422a 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/11/25 13:18:33 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -85,7 +85,7 @@ namespace bbwx
 
   protected:
        virtual void bbUserConstructor();
-       void TryInsertWindow(wxNotebook *book, wxWindow *widgetchild);
+    void TryInsertWindow(wxNotebook *book, const std::string& input);
 
   };
   

diff --git a/packages/wxvtk/bbs/appli/exampleView2D3D.bbs b/packages/wxvtk/bbs/appli/exampleView2D3D.bbs
new file mode 100644 (file)
index 0000000..71bf836
--- /dev/null
+++ b/packages/wxvtk/bbs/appli/exampleView2D3D.bbs
@@ -0,0 +1,24 @@
+load wx
+include wxvtk
+include vtk
+
+new LoadHola reader
+new Slider slider
+new Viewer2D v2d
+new Viewer3D v3d
+new LayoutTab layout
+
+set slider.In 20
+connect reader.Out v2d.In
+connect slider.Out v2d.Slice
+connect slider.Widget layout.Widget1
+connect v2d.Widget layout.Widget2
+connect slider.BoxChange v2d.BoxExecute
+new IsoSurfaceWithControls surface
+connect reader.Out surface.In
+connect surface.Out v3d.In1
+connect surface.Widget layout.Widget3
+connect v3d.Widget layout.Widget4
+connect surface.BoxChange v3d.BoxExecute
+
+exec layout

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 4d71aa2229caef7f193fa5c1fa614883cbb1bc8f..8e9908f02402945d5ab89d0782cae1834d7c8aa1 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:34:01 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2008/11/25 13:18:38 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -90,9 +90,9 @@ namespace bbwxvtk
     panel-> Layout();
 
 
-    wxvtkrenderwindowinteractor->Refresh();
-    wxvtkrenderwindowinteractor->Render();
-    imageViewer->GetRenderer()->ResetCameraClippingRange();
+    //  wxvtkrenderwindowinteractor->Refresh();
+    //  wxvtkrenderwindowinteractor->Render();
+    //  imageViewer->GetRenderer()->ResetCameraClippingRange();
 
   
   }
@@ -216,11 +216,19 @@ namespace bbwxvtk
            }
 
            //      std::cout << "V2D Render "<<std::endl;
+           //      imageViewer->SetSliceOrientation (orientation);
+           //     imageViewer->SetSlice( z );
+
+          //            wxvtkrenderwindowinteractor->Update();
+          //            wxvtkrenderwindowinteractor->Render();
+          //          imageViewer->GetRenderer()->ResetCameraClippingRange();
+ 
+           //xvtkrenderwindowinteractor->Refresh();
+           wxvtkrenderwindowinteractor->Render();
+    imageViewer->GetRenderer()->ResetCameraClippingRange();
            imageViewer->SetSliceOrientation (orientation);
           imageViewer->SetSlice( z );
-            wxvtkrenderwindowinteractor->Update();
-            wxvtkrenderwindowinteractor->Render();
-            imageViewer->GetRenderer()->ResetCameraClippingRange();
+
            
 /*
        #if (VTK_MAJOR_VERSION >= 5)
@@ -298,8 +306,8 @@ namespace bbwxvtk
   // when window is shown
   void  Viewer2D::OnShowWidget()
   {
-    ((Viewer2DWidget*)bbGetOutputWidget())->Update();
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
+    //((Viewer2DWidget*)bbGetOutputWidget())->Update();
+    //((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
   }
   
 

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 41e76ab2e2b0a92e3b479e84962af7fd683480aa..d856439593b1756c4f13b306f3feb960a36a30fa 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:17:28 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/11/25 13:18:38 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -97,7 +97,7 @@ namespace bbwxvtk
   //-------------------------------------------------------------------------
   void Viewer3DWidget::Update()
   {
-    wxvtkrenderwindowinteractor->Update();
+    //    wxvtkrenderwindowinteractor->Update();
     wxvtkrenderwindowinteractor->Render();
     renderer->ResetCameraClippingRange();
   }
@@ -227,8 +227,8 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
   // when window is shown
   void  Viewer3D::OnShowWidget()
   {
-    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
-    if (w) w->Update();
+    //    Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget();
+    //    if (w) w->Update();
   }