#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index 1e723a13e09b5973e0d1cbf9aa096a721d2c89ac..68f8c2b75f5fa08e0e83ec3a3cbc1ccd4155f3f9 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -60,9 +60,7 @@ vtkClipping3DDataViewer::~vtkClipping3DDataViewer()
                _tissuePlanes[i]->Delete();
                _tissueClipper[i]->Delete();
        }
-       _outlineData->Delete();
-       _mapOutline->Delete();
-       _outline->Delete();
+
        // Volume
        _tfun->Delete();
        _ctfun->Delete();
@@ -78,11 +76,7 @@ vtkClipping3DDataViewer::~vtkClipping3DDataViewer()
        }
        _observerV-> Delete();
 }
-//-------------------------------------------------------------------
-vtkActor* vtkClipping3DDataViewer::GetOutlineActor()
-{
-       return _outline;
-}
+
 //-------------------------------------------------------------------
 vtkClipPolyData* vtkClipping3DDataViewer::GetTissueClipper(int id)
 {
@@ -260,16 +254,18 @@ void vtkClipping3DDataViewer::Configure_Tissue()
                imagedata->GetExtent(x1,x2,y1,y2,z1,z2);
                _tissuePlanes[i]->SetBounds  (x1,x2,y1,y2,z1,z2);
                _tissueClipper[i] = vtkClipPolyData::New();
+               _tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
+               _tissueClipper[i]->InsideOutOn( );
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
                _tissueClipper[i]->SetInput( _tissueStripper[i]->GetOutput() );
 #else
                _tissueClipper[i]->SetInputData( _tissueStripper[i]->GetOutput() );
+               printf("EED vtkClipping3DDataViewer::Configure_Tissue Update\n");
+               _tissueClipper[i]->Update();
 #endif
 
-               _tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
-               _tissueClipper[i]->InsideOutOn( );
                _tissueMapper[i] = vtkPolyDataMapper::New( );
 
 //EED 2017-01-01 Migration VTK7
@@ -277,6 +273,7 @@ void vtkClipping3DDataViewer::Configure_Tissue()
                _tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
 #else
                _tissueMapper[i]->SetInputData( _tissueClipper[i]->GetOutput() );
+               _tissueMapper[i]->Update();
 #endif
 
 
@@ -529,25 +526,6 @@ void vtkClipping3DDataViewer::Configure()
        Configure_Tissue();
        Configure_Volume();
     Configure_VolumeBox();
-  // An outline provides context around the data.
-  //
-       _outlineData    = vtkOutlineFilter::New();
-
-//EED 2017-01-01 Migration VTK7
-#if VTK_MAJOR_VERSION <= 5
-    _outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
-#else
-    _outlineData->SetInputData((vtkDataSet *) _vtkmprbasedata->GetImageData() );
-#endif
-
-       _mapOutline     = vtkPolyDataMapper::New();
-
-//EED 4 nov 2015 Estelle 
-//    _mapOutline->SetInput(_outlineData->GetOutput());
-
-       _outline        = vtkActor::New();
-    _outline->SetMapper(_mapOutline);
-    _outline->GetProperty()->SetColor(0,0,0);
 }