Now Viewer2D takes into account 'Orientation'

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index f9e1e1326f7c6c3f0b9a95bc3738f78e7ce2547b..1749588b3b615752b858f55f4b55ae84f6fe6911 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/07/03 13:59:37 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2008/10/10 13:57:42 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -174,7 +174,9 @@ namespace bbwxvtk
     //  std::cout << "CW = "<< mBox->bbGetContainingWindow() << std::endl;
     //  std::cout << "Sh = "<< mBox->bbIsShown() << std::endl;
     
-
+    int orientation = mBox->bbGetInputOrientation();
+    if (orientation<0 || orientation>2)
+       orientation=2; // Why not?      
 
     // mBox->bbIsShown() is necessary to be sure that the wxWindow is already 
     // created and displayed. 
@@ -190,20 +192,41 @@ namespace bbwxvtk
 
                //      std::cout << "ext = "<<ext[4]<<" - "<<ext[5]<<std::endl;
 
+            switch(orientation){
+              case 0:
+               if (z<ext[0]) { z=ext[0]; }
+               if (z>ext[1]) { z=ext[1]; }
+                
+                break;
+                                  
+              case 1:
+               if (z<ext[2]) { z=ext[2]; }
+               if (z>ext[3]) { z=ext[3]; }
+                break;
+                                                   
+              case 2:
                if (z<ext[4]) { z=ext[4]; }
                if (z>ext[5]) { z=ext[5]; }
-
-               wxvtkrenderwindowinteractor->Update();
-               wxvtkrenderwindowinteractor->Render();
-               imageViewer->GetRenderer()->ResetCameraClippingRange();
-
-
+                break;
+               
+              default:
+               z = ext[5]; // Why not?
+           }
+
+            wxvtkrenderwindowinteractor->Update();
+            wxvtkrenderwindowinteractor->Render();
+            imageViewer->GetRenderer()->ResetCameraClippingRange();
+           
+/*
        #if (VTK_MAJOR_VERSION >= 5)
                imageViewer->SetSlice( z );
        #else
                imageViewer->SetZSlice( z );
        #endif
-
+*/
+           imageViewer->SetSliceOrientation (orientation);
+          imageViewer->SetSlice( z );
+               
                //imageViewer->UpdateDisplayExtent();
   }