X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.cxx;h=9da0c3efe4c389d34a471288a61fea67b953dc42;hb=fc44a74636803d2efca46c6e66562a839e9d52f1;hp=d5bd3492e5e590b1b8a6886a78cdc0eaf591ec18;hpb=e85546c7218522af75cec623b9419781c7c4208f;p=bbtk.git diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index d5bd349..9da0c3e 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.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: bbvtkMIPCreator.cxx,v $ Language: C++ - Date: $Date: 2011/03/23 15:26:55 $ - Version: $Revision: 1.9 $ + Date: $Date: 2012/11/16 08:51:58 $ + Version: $Revision: 1.12 $ =========================================================================*/ -/* --------------------------------------------------------------------- - -* 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 @@ -49,47 +54,36 @@ namespace bbvtk //--------------------------------------------------------------------- void MIPCreator::bbUserSetDefaultValues() { - - - std::vector denPoints; std::vector opaValues; - denPoints.push_back(0.0); - denPoints.push_back(255.0); + std::vector denPoints; opaValues.push_back(0.0); opaValues.push_back(1.0); bbSetInputDensityPoints(denPoints); bbSetInputOpacityValues(opaValues); bbSetInputMinColorWindow(0.0); bbSetInputMaxColorWindow(255.0); - - opacityTransferFunction = vtkPiecewiseFunction::New(); - grayTransferFunction = vtkPiecewiseFunction::New(); - + opacityTransferFunction = vtkPiecewiseFunction::New(); + grayTransferFunction = vtkPiecewiseFunction::New(); mCast = NULL; + +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) mMIP = NULL; +#else + // +#endif + mMapper = NULL; mVolume = NULL; - - } + //--------------------------------------------------------------------- void MIPCreator::bbUserInitializeProcessing() { - - // Create the pipeline mCast = vtkImageShiftScale::New(); mCast->SetOutputScalarTypeToUnsignedChar(); mCast->ClampOverflowOn(); - - DensityPoints = bbGetInputDensityPoints(); - OpacityValues = bbGetInputOpacityValues(); - - while(DensityPoints.size()>OpacityValues.size()) - { - OpacityValues.push_back(1.0); - } - } //--------------------------------------------------------------------- @@ -101,11 +95,16 @@ namespace bbvtk mCast=NULL; } +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) if (mMIP!=NULL) { mMIP->Delete(); mMIP=NULL; } +#else + // +#endif if (mMapper!=NULL) { @@ -123,35 +122,46 @@ namespace bbvtk void MIPCreator::Process() { - - - double ranges[2]; vtkImageData *image = bbGetInputIn(); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) image->Update(); +#endif +#if (VTK_MAJOR_VERSION >= 6) + // .. +#endif image->GetScalarRange(ranges); - scale = 255/(ranges[1]/100); - +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) mCast->SetInput( bbGetInputIn() ); +#endif +#if (VTK_MAJOR_VERSION >= 6) + mCast->SetInputData( bbGetInputIn() ); +#endif mCast->SetScale( scale / 100.0 ); //mCast->SetShift( -bbGetInputShift() ); - - - double factor = scale/ 100.0 ; - - + DensityPoints = bbGetInputDensityPoints(); + //We assign by default the values of density by regarding at range from the image + if(DensityPoints.size()==0) + { + DensityPoints.push_back(ranges[0]); + DensityPoints.push_back(ranges[1]); + } + OpacityValues = bbGetInputOpacityValues(); + while(DensityPoints.size()>OpacityValues.size()) + { + OpacityValues.push_back(1.0); + } + double factor = scale/ 100.0 ; double minCF = bbGetInputMinColorWindow(); double maxCF = bbGetInputMaxColorWindow(); - cout<<"MIPCreator::Process::minCF"<AddSegment( minCF , 0.0 , maxCF , 1.0 ); - - - for(int i =0; i< DensityPoints.size(); i++) { - + cout<<"MIPCreator::Process::dPoint"<AddPoint(DensityPoints.at(i)*factor, OpacityValues.at(i)); } //opacityTransferFunction = vtkPiecewiseFunction::New(); @@ -161,48 +171,49 @@ namespace bbvtk // opacityTransferFunction->AddPoint( 210 , 50.0/100.0 ); // opacityTransferFunction->AddPoint( 255 , 90.0/100.0 ); - - // Create a set of properties for mip vtkVolumeProperty *mipProperty; mipProperty = vtkVolumeProperty::New(); mipProperty->SetScalarOpacity( opacityTransferFunction ); mipProperty->SetColor( grayTransferFunction ); - // mipProperty->SetInterpolationTypeToLinear(); mipProperty->SetInterpolationTypeToNearest(); - // mipProperty->ShadeOff(); mipProperty->ShadeOn(); - // mipProperty->SetAmbient(0.9); // mipProperty->SetDiffuse(0.9); // mipProperty->SetSpecular(0.9); - - - +//EED 2018-07-20 Migration VTK8 +#if (VTK_MAJOR_VERSION <= 7) mMIP = vtkVolumeRayCastMIPFunction::New(); mMIP->SetMaximizeMethodToScalarValue(); - mMapper = vtkVolumeRayCastMapper::New(); mMapper->SetVolumeRayCastFunction(mMIP); +#else + mMapper = vtkFixedPointVolumeRayCastMapper::New(); +#endif + + + mCast->Update(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) mMapper->SetInput(mCast->GetOutput()); // (smoother.GetOutput()) +#endif +#if (VTK_MAJOR_VERSION >= 6) + mMapper->SetInputData(mCast->GetOutput()); // (smoother.GetOutput()) +#endif mVolume = vtkVolume::New(); mVolume->SetMapper(mMapper); mVolume->SetProperty( mipProperty ); - - - mMapper->Update(); - bbSetOutputOut(mVolume); // mVolume->GetProperty()->SetColor( bbGetInputColour()[0], bbGetInputColour()[1], bbGetInputColour()[2] ); // mVolume->GetProperty()->SetOpacity( bbGetInputOpacity() ); - } }//namespace bbtk