Merge remote-tracking branch 'origin/vtk7itk4' into vtk7itk4wx3

[creaVtk.git] / lib / creaVtk / creaVtkStreamTracer.cpp

diff --git a/lib/creaVtk/creaVtkStreamTracer.cpp b/lib/creaVtk/creaVtkStreamTracer.cpp
index 5c44dc08ebda54800f702db3ad9af882608882aa..ade157ea35f615f698b2262de925e39d63f80cf0 100644 (file)
--- a/lib/creaVtk/creaVtkStreamTracer.cpp
+++ b/lib/creaVtk/creaVtkStreamTracer.cpp
@@ -67,11 +67,8 @@ void creaVtkStreamTracer::SetSourcePoints( vtkDataSet* sourcepoints)
 //-----------------------------------------------------------------------------
 void creaVtkStreamTracer::Process()
 {
-printf("EED creaVtkStreamTracer::Process() Start \n");
                if (_active==true)
                {
-printf("EED creaVtkStreamTracer::Process() A\n");
-
 //                     if (_firsttime==true)
 //                     {
 //                             _firsttime=false;
@@ -87,9 +84,15 @@ printf("EED creaVtkStreamTracer::Process() A\n");
 //                     _source->SetCenter( c );
 //                     _source->Update();
                        
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _streamer->SetInput( _dataobject );
 //EED1 _streamer->SetSource( _source->GetOutput() );
                        _streamer->SetSource( _sourcePoints );
+#else
+                       _streamer->SetInputData( _dataobject );
+                       _streamer->SetSourceData( _sourcePoints );
+#endif
                        _streamer->SetIntegratorTypeToRungeKutta45();
                        _streamer->SetMaximumPropagation(500);
 //EED          _streamer->SetMaximumPropagationUnitToTimeUnit();
@@ -98,13 +101,9 @@ printf("EED creaVtkStreamTracer::Process() A\n");
                        _streamer->SetIntegrationDirectionToBoth();
 //EED    streamer->ComputeVorticityOn ();
                        _streamer->Update();
-
 //                     _streamer->Print(std::cout);
 //                     _streamer->GetOutput()->Print(std::cout);
-printf("EED creaVtkStreamTracer::Process() B\n");
-
        } // active
-printf("EED creaVtkStreamTracer::Process() End \n");
 }