#2482 creaMaracasVisu Bug New - HighColorLayer refresh missing. The MPR is not...

[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 b8b203730bb37c7d2a87dcb18afaf0e8e8d3905f..e9d096ab41ef4f380e103cddeea6d27284bf99ed 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.cxx
@@ -276,28 +276,15 @@ void wxVtk2DBaseView::Configure(bool okimage)
 
 int    wxVtk2DBaseView::GetActualSlice()  // virtual
 {
-   return (int)(_vtkbasedata->GetZ());
+   return (int)(GetVtkBaseData()->GetZ());
 }
 
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::SetActualSlice(int slice)  // Virtual
 {
-   _vtkbasedata->SetZ(slice);
+   GetVtkBaseData()->SetZ(slice);
 }
 
-//-------------------------------------------------------------------
-
-vtkBaseData *wxVtk2DBaseView::GetVtkBaseData()
-{
-   return _vtkbasedata;
-}
-
-//-------------------------------------------------------------------
-
-void wxVtk2DBaseView::SetVtkBaseData(vtkBaseData *vtkbasedata)
-{
-   _vtkbasedata=vtkbasedata;
-}
 
 //-------------------------------------------------------------------
 void wxVtk2DBaseView::UpdateColorWindowLevel()
@@ -309,12 +296,12 @@ void wxVtk2DBaseView::UpdateColorWindowLevel()
        
        
        vtkImageMapToWindowLevelColors* imagemaptowindowlevel = _imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel();
-       imagemaptowindowlevel->SetWindow( _vtkbasedata->GetColorWindow() );
-       imagemaptowindowlevel->SetLevel( _vtkbasedata->GetColorLevel() );
+       imagemaptowindowlevel->SetWindow( GetVtkBaseData()->GetColorWindow() );
+       imagemaptowindowlevel->SetLevel( GetVtkBaseData()->GetColorLevel() );
        
 // EED Borrame
-//     vtkimageviewer2->SetColorWindow( _vtkbasedata->GetColorWindow() );
-//     vtkimageviewer2->SetColorLevel(  _vtkbasedata->GetColorLevel() );
+//     vtkimageviewer2->SetColorWindow( GetVtkBaseData()->GetColorWindow() );
+//     vtkimageviewer2->SetColorLevel(  GetVtkBaseData()->GetColorLevel() );
        _imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->Modified();
 }
 
@@ -386,7 +373,7 @@ void wxVtk2DBaseView::setColorTransferFunction(vtkColorTransferFunction* colorta
 void wxVtk2DBaseView::SetColorWindow(double level)
 {
 //     _imageViewer2XYZ->GetVtkImageViewer2()->SetColorWindow(level);
-       _vtkbasedata->SetColorWindow(level);    
+       GetVtkBaseData()->SetColorWindow(level);        
        this->Refresh();
 }
 
@@ -394,7 +381,7 @@ void wxVtk2DBaseView::SetColorWindow(double level)
 void wxVtk2DBaseView::SetColorLevel(double level)
 {
 //     _imageViewer2XYZ->GetVtkImageViewer2()->SetColorLevel(level);
-       _vtkbasedata->SetColorLevel(level);
+       GetVtkBaseData()->SetColorLevel(level);
        this->Refresh();
 }