*** 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 e366505a15fe33dcccd1db67d19d5397b5b1cd95..929147e12b02085c35ee26a838b39b21adee96ed 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/12/03 09:34:41 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2008/12/03 13:35:35 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -94,7 +94,8 @@ namespace bbwxvtk
     //  wxvtkrenderwindowinteractor->Render();
     //  imageViewer->GetRenderer()->ResetCameraClippingRange();
 
-  
+    imageViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);
+
   }
   //-------------------------------------------------------------------------
   
@@ -136,16 +137,15 @@ namespace bbwxvtk
       {
        backImageData = mDefaultImage;
        mUpdateCamera = true;
-       std::cout << "Viewer2DWidget::UpdateView() passe par 1" << std::endl;
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
+             //      (true) ) //
              (backImageData != mBox->bbGetInputIn()) ) 
       {
        backImageData = mBox->bbGetInputIn();
        backImageData->Update();
        imageViewer->SetInput( backImageData );
        mUpdateCamera = true;
-               std::cout << "Viewer2DWidget::UpdateView() passe par 2" << std::endl;
       }
 
     if (mUpdateCamera)
@@ -155,10 +155,19 @@ namespace bbwxvtk
        backImageData->GetSpacing(spx,spy,spz);
        backImageData->GetExtent (x1,x2,y1,y2,z1,z2);
        
+       double *range = backImageData->GetScalarRange();
+       imageViewer->SetColorWindow(range[1] - range[0]);
+       imageViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+
+       imageViewer->GetRenderer()->ResetCamera();
+       double bounds[6];
+       imageViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
+       imageViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+       
        //      bbtkMessage("Output",2,"Viewer2D '"<<mBox->bbGetName()<<"' - Image :"<<std::endl);
        //      std::cout << " extent  = "<< x1<<"-"<<x2<<" x "<<y1<<"-"<<y2<<" x "<<z1<<"-"<<z2<<std::endl;
        //      std::cout << " spacing = "<<spx << " - "<< spy << " - "<<spz<<std::endl;
-       
+       /*
        vtkCamera *camera = imageViewer->GetRenderer()->GetActiveCamera();
 
        camera->SetViewUp    ( spx*0,         -spy*1,        spz*0 );
@@ -170,8 +179,17 @@ namespace bbwxvtk
        //   
        //      imageViewer->GetRenderer()->ResetCamera(x1,x2,y1,y2,z1,z2);
        mUpdateCamera = false;
-       std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl;
-      }
+       //      std::cout << "Viewer2DWidget::UpdateView() passe par 3" << std::endl;
+       imageViewer->SetColorWindow(512);
+       imageViewer->SetColorLevel(256);
+       */
+        /*
+       for (int i=0;i<10;i++)
+         for (int j=0;j<10;j++)
+           std::cout << mBox->bbGetInputIn()->GetScalarComponentAsFloat(i,j,0,0)
+                     << std::endl;
+        */
+    }
   
     //  std::cout << "OW = "<< mBox->bbGetWindow() << std::endl;
     //  std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
@@ -179,7 +197,7 @@ namespace bbwxvtk
     
     int orientation = mBox->bbGetInputOrientation();
     if (orientation<0 || orientation>2) {
-       bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
+      bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 "<<std::endl);
        orientation=2; // Why not?      
     }
     // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
@@ -193,9 +211,12 @@ namespace bbwxvtk
                //      std::cout << "slice = "<<z<<std::endl;
                int ext[6];
                backImageData->GetWholeExtent(ext);
-
-               //      std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
-
+               /*
+               std::cout << "ext = "<<ext[0]<<" - "<<ext[1]<<" ; "
+                         <<ext[2]<<" - "<<ext[3]<<" ; "
+                         <<ext[4]<<" - "<<ext[5]
+                         <<std::endl;
+               */
             switch(orientation){
               case 0:
                if (z<ext[0]) { z=ext[0]; }
@@ -218,36 +239,15 @@ namespace bbwxvtk
                z = ext[5]; // Why not?
            }
 
-           //      std::cout << "V2D Render "<<std::endl;
-           //      imageViewer->SetSliceOrientation (orientation);
-           //     imageViewer->SetSlice( z );
-
-          //            wxvtkrenderwindowinteractor->Update();
-          //            wxvtkrenderwindowinteractor->Render();
-          //          imageViewer->GetRenderer()->ResetCameraClippingRange();
- 
-           //xvtkrenderwindowinteractor->Refresh();
+           bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
+           imageViewer->SetSliceOrientation (orientation);
            wxvtkrenderwindowinteractor->Render();
-    imageViewer->GetRenderer()->ResetCameraClippingRange();
-           imageViewer->SetSliceOrientation (orientation);
-          imageViewer->SetSlice( z );
-
-std::cout << "Viewer2DWidget::UpdateView() passe par 4" << std::endl;      
-/*
-       #if (VTK_MAJOR_VERSION >= 5)
-               imageViewer->SetSlice( z );
-       #else
-               imageViewer->SetZSlice( z );
-       #endif
-*/
-//           imageViewer->SetSliceOrientation (orientation);
-//        imageViewer->SetSlice( z );
-               
-               //imageViewer->UpdateDisplayExtent();
-  } 
-
+           imageViewer->SetSlice( z );
 
-}
+    } 
+    
+    
+  }
 
 
   vtkRenderer * Viewer2DWidget::GetRenderer()
@@ -270,23 +270,14 @@ std::cout << "Viewer2DWidget::UpdateView() passe par 4" << std::endl;
 
   void Viewer2D::Process() 
   { 
-    // LG : Bug on Linux (wxGTK) when initial slice != 0 on first time 
-    // (see wxvtk/bbs/appli/ExampleSimpleSlicer)
-    // I think there is a problem with rendering before window 
-    // has been reparented ... we have to check this 
-    
-std::cout << "Viewer2D::Process() passe par 5" << std::endl;      
-    
-         Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
-         
+    Viewer2DWidget* w = (Viewer2DWidget*)bbGetOutputWidget(); 
     if (w)
-       {
-std::cout << "Viewer2D::Process() passe par 6" << std::endl;
-               w->UpdateView();
-               bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
-       }
-         bbSetOutputOut( bbGetInputSlice() );
-         
+      {
+       w->UpdateView();
+       bbSetOutputRenderer( ((Viewer2DWidget*)bbGetOutputWidget())->GetRenderer() );
+      }
+    bbSetOutputOut( bbGetInputSlice() );
+    
   }
   
 
@@ -295,7 +286,7 @@ std::cout << "Viewer2D::Process() passe par 6" << std::endl;
     bbSetInputIn(NULL);
     bbSetInputSlice(0);
     bbSetOutputWidget(0);
-    bbSetInputOrientation(0);
+    bbSetInputOrientation(2);
   }
 
   /**
@@ -305,9 +296,7 @@ std::cout << "Viewer2D::Process() passe par 6" << std::endl;
    */ 
   void Viewer2D::CreateWidget(wxWindow* parent)
   {
-  std::cout << "Viewer2D::CreateWidget() passe par 7" << std::endl;
     Viewer2DWidget* w = new Viewer2DWidget(this,parent);//bbGetWxParent());
-
     bbSetOutputWidget(w);
   }