Bug #1679

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtk2DBaseView.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
index a109665df029a051d7b844105f8720ff207de229..61607c373e2075bf13ba759877412a49b7a2f260 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -75,6 +75,7 @@ void wxVtk2DBaseView::TransformCoordinate_spacing_ModelToView(double &X,double &
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::ResetView()
 {
+       printf("EED wxVtk2DBaseView::ResetView");
        double spx = 0,spy = 0,spz = 0;
        int x1 = 1,x2 = 1,y1 = 1,y2 = 1,z1 = 1,z2 = 1;
        wxVtkBaseView::Configure();
@@ -122,6 +123,17 @@ void wxVtk2DBaseView::ResetView()
 }
 
 
+
+//-------------------------------------------------------------------
+void wxVtk2DBaseView::SetImageToVtkViewer(vtkImageData *imageData)
+{
+       if (_imageViewer2XYZ!=NULL)
+       {
+               _imageViewer2XYZ->GetVtkImageViewer2()->SetInput( imageData );
+       } // if _imageViewer2XYZ
+}
+
+
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::Configure(bool okimage)
 {
@@ -159,15 +171,15 @@ void wxVtk2DBaseView::Configure(bool okimage)
 
 
        vtkImageData *imageData = GetVtkBaseData()->GetMarImageData()->GetImageData();
-       if (imageData!=NULL){
-
+       if (imageData!=NULL)
+       {
                imageData->UpdateInformation();
                imageData->SetUpdateExtent( imageData->GetWholeExtent());
                imageData->Update();
                if (okimage==true){
                        imageData->GetSpacing (spx,spy,spz);
                        imageData->GetExtent (x1,x2,y1,y2,z1,z2);
-                       _imageViewer2XYZ->GetVtkImageViewer2()->SetInput(imageData );
+                       SetImageToVtkViewer(imageData);
                        _imageViewer2XYZ->SetExtentDimension(x1,x2,y1,y2,z1,z2);
                        double range[2];
                        imageData->GetScalarRange(range);
@@ -195,28 +207,31 @@ void wxVtk2DBaseView::Configure(bool okimage)
 //                     SetInteractorStyleImage( vtkInteractorStyleBaseView2D::New() );
 
 
-                       vtkImageViewer2 *IV2=_imageViewer2XYZ->GetVtkImageViewer2();
-                       vtkCamera *camera = IV2->GetRenderer()->GetActiveCamera();
+                       vtkImageViewer2 *IV2            =       _imageViewer2XYZ->GetVtkImageViewer2();
+                       vtkCamera               *camera         =       IV2->GetRenderer()->GetActiveCamera();
 
 //EED 17Avril2009
-/*
+//EED 21 mars 2012     FLIP problem  ..PLOP..
+                       
+                       // XY
                        camera->SetViewUp               ( spx*0                 , -spy*1                        , spz*0         );
                        camera->SetPosition             ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , -spz*10000    );
                        camera->SetFocalPoint   ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*0         );
-*/
+/*
                        camera->SetViewUp               ( spx*0                 , spy*1                 , spz*0         );
                        camera->SetPosition             ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*10000     );
                        camera->SetFocalPoint   ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*0         );
+*/
 
-
+                       
                        camera->SetClippingRange( 0.01                  , 1000000 );
                        camera->ComputeViewPlaneNormal();
                        camera->SetParallelScale( spx*(x2-x1)/3.0 );
 
                        // text information over the graphic window
                        if(_vtkIinfoTextImage == NULL){
-                               _vtkIinfoTextImage              = new vtkInfoTextImage();
-                               _vtkIinfoTextImageInteractor    = new vtkInfoTextImageInteractor();
+                               _vtkIinfoTextImage                                      = new vtkInfoTextImage();
+                               _vtkIinfoTextImageInteractor            = new vtkInfoTextImageInteractor();
                                ((vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView())->AddInteractorStyleMaracas(_vtkIinfoTextImageInteractor);
                        }
                        _vtkIinfoTextImage->SetWxVtk2DBaseView(this);