#3012 creaMaracasVisu Bug New Normal - Update Image in ViewerNV

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
index 699750d2b6fcf01a33da8f9fa6c73e45662b0e14..7a158603a8551078b2d98d63d71fbe8936833711 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk3DBaseView.cxx
@@ -30,9 +30,10 @@
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #endif
-wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent)
+wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent, vtkBaseData* vtkbasedata)
 :wxVtkBaseView( parent )
 {
+       SetVtkBaseData( vtkbasedata );
        _configure      = false;
        _aRenderer      = NULL;
        _renWin         = NULL;
@@ -42,11 +43,14 @@ wxVtk3DBaseView::wxVtk3DBaseView(wxWindow *parent)
 wxVtk3DBaseView::~wxVtk3DBaseView()
 {
 
-       if (_aCamera!=NULL)     { _aCamera              -> Delete(); _aCamera=NULL;}
+       if (_aCamera!=NULL)             { _aCamera              -> Delete(); _aCamera=NULL;}
        if (_aRenderer!=NULL)   { _aRenderer    -> Delete(); _aRenderer=NULL;}
-       if (_renWin!=NULL)      { 
-               if(_renWin->GetReferenceCount()==0){
-                       _renWin         -> Delete(); _renWin=NULL;
+       if (_renWin!=NULL)              
+       { 
+               if(_renWin->GetReferenceCount()==0)
+               {
+                       _renWin->Delete(); 
+                       _renWin=NULL;
                }
        }
 }
@@ -73,6 +77,42 @@ void wxVtk3DBaseView::Refresh()
        vri->vtkRenderWindowInteractor::Render();
 }
 
+//-------------------------------------------------------------------
+// EED 27/05/2013
+void wxVtk3DBaseView::ResetCamera(int* ext, double* spc)
+{
+
+      GetRenderer()->ResetCameraClippingRange();
+
+       if(ext == NULL)
+       {
+
+               GetRenderer()->ResetCamera ();
+               GetCamera()->Dolly(1.2);
+       }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));*/
+               /*double x0=(spc[0])*((double)ext[0]+origin[0]);
+               double x1=(spc[0])*((double)ext[1]+origin[0]);
+               double y0=(spc[1])*((double)ext[2]+origin[1]);
+               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]);
+               double y1=(spc[1])*((double)ext[3]);
+               double z0=(spc[2])*((double)ext[4]);
+               double z1=(spc[2])*((double)ext[5]);
+
+               GetRenderer()->ResetCamera(x0,x1,y0,y1,z0,z1);
+               //_wxvtk3Dbaseview->GetCamera()->SetPosition(x,y,z);
+               GetCamera()->Dolly(1.5);        
+       }       
+}
 
 //-------------------------------------------------------------------
 void wxVtk3DBaseView::SetStereo(int type)
@@ -119,6 +159,12 @@ void wxVtk3DBaseView::Configure()
                _aRenderer->GradientBackgroundOn();
                _aRenderer->SetBackground( 0.33 , 0.33 , 0.33 );
                _aRenderer->SetBackground2( 0.66 , 0.66 , 0.66 );
+
+
+
+//             _aRenderer->GradientBackgroundOff();
+//             _aRenderer->SetBackground(0,0,0 );
+
                
                SetStereo(0);
                
@@ -148,8 +194,17 @@ void wxVtk3DBaseView::Configure()
                _aCamera->SetFocalPoint (0, 0, 0);
                _aCamera->ComputeViewPlaneNormal();
 
+//EED 27/05/2013
+               GetRenderer()->SetActiveCamera(GetCamera());
+               
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+//EED 13 may 2013  FLIP probleme  ..PLOP..
+               GetCamera()->Roll(180);
+               GetCamera()->Yaw(180+30);
+               GetCamera()->Pitch(-22);
        }
 }
+
 //-------------------------------------------------------------------
 //EED 27 sep 2006
 void wxVtk3DBaseView::GetSpacing(double spc[3])