- new version

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
index 179f325554b6a69f48437ffc82c9d2d9ce06eaff..a05e83116d1ba54587ac7b1f06b107b029e70b34 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DView.cxx
@@ -74,8 +74,15 @@ void wxVtkMPR3DView::ResetCamera(int* ext, double* origin,double* spc)
 {
        if(ext == NULL){
                _wxvtk3Dbaseview->GetRenderer()->ResetCamera ();
-               _wxvtk3Dbaseview->GetCamera()->Dolly(1.5);
+               _wxvtk3Dbaseview->GetCamera()->Dolly(2.0);
+               
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+               _wxvtk3Dbaseview->GetCamera()->Roll(180);
+               _wxvtk3Dbaseview->GetCamera()->Yaw(180+30);
+               _wxvtk3Dbaseview->GetCamera()->Pitch(-22);
+               
        }else{
+               
                /*double x = (spc[0])*(origin[0]+(((double)ext[1]-(double)ext[0])/2.0));
                double y = (spc[1])*(origin[1]+(double)ext[3]);
                double z = (spc[2])*(origin[2]+(((double)ext[5]-(double)ext[4])/2.0));*/
@@ -85,6 +92,7 @@ void wxVtkMPR3DView::ResetCamera(int* ext, double* origin,double* spc)
                double y1=(spc[1])*((double)ext[3]+origin[1]);
                double z0=(spc[2])*((double)ext[4]+origin[2]);
                double z1=(spc[2])*((double)ext[5]+origin[2]);*/
+               
                double x0=(spc[0])*((double)ext[0]);
                double x1=(spc[0])*((double)ext[1]);
                double y0=(spc[1])*((double)ext[2]);
@@ -95,7 +103,9 @@ void wxVtkMPR3DView::ResetCamera(int* ext, double* origin,double* spc)
                _wxvtk3Dbaseview->GetRenderer()->ResetCamera(x0,x1,y0,y1,z0,z1);
                //_wxvtk3Dbaseview->GetCamera()->SetPosition(x,y,z);
                _wxvtk3Dbaseview->GetCamera()->Dolly(1.5);
+               
        }
+       
 }
 
 //-------------------------------------------------------------------
@@ -103,6 +113,7 @@ void wxVtkMPR3DView::Configure()
 {
        vtkImageData *imageData = GetVtkMPR3DDataViewer()->GetVtkMPRBaseData()->GetImageData();
 
+       printf("EED wxMaracas_ViewerWidget::ConfigureVTK \n");                  
        _wxvtk3Dbaseview->Configure();
        _wxvtkmpr3DviewCntrlPanel->UpdateControlPanel();
 
@@ -207,7 +218,7 @@ void wxVtkMPR3DView::Configure()
                _contourMapper->SetScalarRange( imageData->GetScalarRange() );
 
 
-               ConfigureFreePlanes();
+       ConfigureFreePlanes();
        }
 
 //     _pointWidget->SetPosition( x,y,z );