X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.cxx;h=a3b39a5a2d17611513f6b40418fe53348e033ad2;hb=b5d2eb7c48011dfed815c80c3bb460ff9bee27f4;hp=dcf9f4c0efce099a0b7e3861baffda3dec4915f5;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index dcf9f4c..a3b39a5 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -121,41 +121,49 @@ namespace bbvtk
    }
 //---------------------------------------------------------------------
 
-   void VolumeRenderer::Process()
-   {
-     bool changed = false;
-     if ( bbGetInputStatus("In") != bbtk::UPTODATE )
-       {
-	 mMapper->SetInput( bbGetInputIn() );
-	 changed = true;
-       }
-
-	   if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
+void VolumeRenderer::Process()
+{
+    bool changed = false;
+    if ( bbGetInputStatus("In") != bbtk::UPTODATE )
+	{
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+		mMapper->SetInput( bbGetInputIn() );
+#else
+		mMapper->SetInputData( bbGetInputIn() );
+#endif
+	 	changed = true;
+    }
+
+	if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputColorFunction() != 0 ) )
-       {
-	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction() );
-	 changed = true;
-       }
+    {
+	 	mVolume->GetProperty()->SetColor( bbGetInputColorFunction() );
+	 	changed = true;
+    }
 
      if ( ( bbGetInputStatus("ColorFunction1") != bbtk::UPTODATE ) &&
 	  ( bbGetInputColorFunction1() != 0 ) )
-       {
-	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction1() );
-	 changed = true;
-       }
+     {
+	 	mVolume->GetProperty()->SetColor( bbGetInputColorFunction1() );
+	 	changed = true;
+     }
 
      if ( ( bbGetInputStatus("OpacityFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputOpacityFunction() != 0 ) )
-       {
-	 mVolume->GetProperty()->SetScalarOpacity(bbGetInputOpacityFunction());
-	 changed = true;
-       }
-    
-     if (changed) mMapper->Update();
+     {
+	 	mVolume->GetProperty()->SetScalarOpacity(bbGetInputOpacityFunction());
+	 	changed = true;
+     }
+
+	if (changed)
+	{ 
+		mMapper->Update();
+	}
+	bbSetOutputOut(mVolume); 
+}
 
-	 bbSetOutputOut(mVolume);
-	   
-   }
 
 }//namespace bbtk