*** empty log message ***

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer2D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 43a20b31793a42e8af7f6969589afb46bbd1244c..d36fc6dbeba96923f1997163a009599649238426 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/03/10 12:28:44 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/05/14 12:32:26 $
+  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
@@ -66,8 +66,22 @@ namespace bbwxvtk
   
   Viewer2DWidget::~Viewer2DWidget()
   {
+    //    delete wxvtkrenderwindowinteractor;
+    // pourquoi pas wxvtkrenderwindowinteractor->Delete(); // JP
+    // LG : because it has been allocated with operator new not method ::New 
+    // we want to force its destruction without taking care of vtk ref counting
+    // on the contrary the following vtk objects are deleted with vtk Delete
+    //    std::cout << "Viewer2DWidget::~Viewer2DWidget()" << std::endl;
+    if (backImageData)
+      {
+       //      backImageData->UnRegister(NULL);
+      }
+    if (imageViewer) 
+      {
+       imageViewer->Delete();
+      }
     delete wxvtkrenderwindowinteractor;
-// pourquoi pas wxvtkrenderwindowinteractor->Delete(); // JP
+    //    std::cout << "Viewer2DWidget::~Viewer2DWidget() OK" << std::endl;
   }
   
   //-------------------------------------------------------------------------
@@ -77,24 +91,38 @@ namespace bbwxvtk
 
   void Viewer2DWidget::UpdateView()
   {
+    //    std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
+    //   std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
+
+    if ( (mBox->bbGetInputIn()!=NULL) &&
+        (backImageData != mBox->bbGetInputIn()) )
+      {
+       if (imageViewer==NULL)
+         {
+           imageViewer = vtkImageViewer2::New();
+           imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
+         }
+       
+       //      std::cout << "V2D b="<<backImageData<<std::endl;
 
-    if (imageViewer==NULL){
-      imageViewer      = vtkImageViewer2::New();
-      imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
-    }
 
-    // Viewer2D*  mbbtkViewer2D = (Viewer2D*)GetBlackBox();
+       if (backImageData) 
+         {
+           //      std::cout << "V2D r1="<<backImageData->GetReferenceCount()<<std::endl;
+           //      backImageData->DebugOn();
+           //      backImageData->UnRegister(NULL);
+         }
+       backImageData = mBox->bbGetInputIn();
 
 
-    
-    //  imageViewer->SetSliceOrientation(((Viewer2D*)GetBlackBox())->bbGetInputOrientation());
-    
+       //      std::cout << "V2D r2="<<backImageData->GetReferenceCount()<<std::endl;
+       //      backImageData->DebugOn();
+       //      backImageData->PrintSelf(std::cout,0);
 
-    if ( backImageData != mBox->bbGetInputIn() )
-      {
-       backImageData = mBox->bbGetInputIn();
+       // backImageData->Register(NULL);
        imageViewer->SetInput( backImageData );
        backImageData->Update();
+
        int x1,x2,y1,y2,z1,z2;
        double spx,spy,spz;
        backImageData->GetSpacing(spx,spy,spz);
@@ -124,7 +152,9 @@ namespace bbwxvtk
     // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
     // created and displayed. 
     // Else when slice != 0 we get an X Window System error with wxGTK
-    if ((backImageData!=NULL)&&(mBox->bbIsShown()))
+    if ((imageViewer!=NULL)&&
+       (backImageData!=NULL)&&
+       (mBox->bbIsShown()))
       {
        int z = mBox->bbGetInputSlice();
        //      std::cout << "slice = "<<z<<std::endl;
@@ -136,18 +166,27 @@ namespace bbwxvtk
        if (z<ext[4]) { z=ext[4]; }
        if (z>=ext[5]) { z=ext[5]-1; }
        // LG : SetZSlice does not exist anymore in vtk 5 !
+       /*
+#if (VTK_MAJOR_VERSION >= 5)
+       imageViewer->SetSlice( 0 );
+#else
+       imageViewer->SetZSlice( 0 );
+#endif
+
+
+       
+       wxvtkrenderwindowinteractor->Render();
+       */
 
 #if (VTK_MAJOR_VERSION >= 5)
        imageViewer->SetSlice( z );
 #else
        imageViewer->SetZSlice( z );
 #endif
-
+       wxvtkrenderwindowinteractor->Render();
 
       }
-    
-    wxvtkrenderwindowinteractor->Render();
-    //    wxvtkrenderwindowinteractor->Refresh();
+
     
 
     //Refresh();
@@ -162,12 +201,17 @@ namespace bbwxvtk
   //--------------------------------------------------------------------------
 
 
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(Viewer2D,bbtk::WxBlackBox);
 
 
   void Viewer2D::Process() 
   { 
-    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
+    // LG : Bug when initial slice != 0 on first time 
+    // (see wxvtk/appli/ExampleSimpleSlicer)
+    // I think there is a problem with rendering before window 
+    // has been reparented ... we have to check this 
+
+    // ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
     bbSetOutputOut( bbGetInputSlice() );
   }