X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.cxx;h=3c5b371acb3201e38410c32f21f3ef05548c167a;hb=208df598c5aeefbd6a683a5c6da00598a4a3d9ea;hp=fb74afdc75e94887f9154d3e96548557540cc2b2;hpb=fbc0eece907d70ac484f613e6f3944adb40c5943;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index fb74afd..3c5b371 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkVolumeRenderer.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/08/07 15:06:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -54,10 +59,16 @@ namespace bbvtk
 
    void VolumeRenderer::bbUserSetDefaultValues() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   mRayCastFunction = NULL;
+#else
+	//
+#endif
 	   mMapper			= NULL;
 	   mVolume			= NULL;
 	   bbSetInputColorFunction(0);
+		bbSetInputColorFunction1(0);
 	   bbSetInputOpacityFunction(0);
    }
 	
@@ -72,11 +83,16 @@ namespace bbvtk
     //    mMIP = vtkVolumeRayCastMIPFunction::New();
     //    mMIP->SetMaximizeMethodToScalarValue();
 
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
     mRayCastFunction = vtkVolumeRayCastCompositeFunction::New();
     mMapper = vtkVolumeRayCastMapper::New();
 	   mMapper->SetVolumeRayCastFunction(mRayCastFunction);
 	   mMapper->AutoAdjustSampleDistancesOn();
-
+#else 
+	  mMapper = vtkFixedPointVolumeRayCastMapper::New();
+#endif
+		   
 	   _volumeProperty = vtkVolumeProperty::New();	
 	_volumeProperty->SetInterpolationTypeToLinear();
 	_volumeProperty->ShadeOn();
@@ -96,11 +112,16 @@ namespace bbvtk
 	//---------------------------------------------------------------------
    void VolumeRenderer::bbUserFinalizeProcessing() 
    { 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	   if (mRayCastFunction!=NULL)
 	   {
 		   mRayCastFunction->Delete();
 		   mRayCastFunction=NULL;
 	   }	  
+#else
+	//
+#endif
 	   if (mMapper!=NULL)
 	   {
 		   mMapper->Delete();
@@ -115,41 +136,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