X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImageVtkProperties.cxx;h=a065023d1f2d8d09bd310d200bea42574d90890f;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=aac617bf0f529a487d787cbdbb558e66d2c3f822;hpb=eafedb040993e52ecb94bb9508501d1444ace6d8;p=bbtk.git diff --git a/packages/vtk/src/bbvtkImageVtkProperties.cxx b/packages/vtk/src/bbvtkImageVtkProperties.cxx index aac617b..a065023 100644 --- a/packages/vtk/src/bbvtkImageVtkProperties.cxx +++ b/packages/vtk/src/bbvtkImageVtkProperties.cxx @@ -1,4 +1,31 @@ -//===== +/* + # --------------------------------------------------------------------- + # + # 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. + # ------------------------------------------------------------------------ */ + + +//===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) //===== #include "bbvtkImageVtkProperties.h" @@ -13,49 +40,60 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageVtkProperties,bbtk::AtomicBlackBox); //===== void ImageVtkProperties::Process() { - unsigned int dim; - int ext[6]; - double spc[3]; - double range[2]; - std::string nametype; - int numberoOfComponents; - std::vector vsize; - std::vector vspacing; - std::vector vrange; + unsigned int dim; + int ext[6]; + double spc[3]; + double range[2]; + double origin[3]; + std::string nametype; + int numberoOfComponents; + std::vector vsize; + std::vector vspacing; + std::vector vrange; + std::vector vorigin; - if ( bbGetInputIn() ){ + if ( bbGetInputIn() ) + { + bbGetInputIn()->Modified(); +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) bbGetInputIn()->Update(); - bbGetInputIn()->GetWholeExtent(ext); +#endif +#if (VTK_MAJOR_VERSION >= 6) + bbGetInputIn()->GetExtent(ext); +#endif + vsize.push_back(ext[1]-ext[0]+1); vsize.push_back(ext[3]-ext[2]+1); vsize.push_back(ext[5]-ext[4]+1); - dim = 0; if (vsize[0]>1) dim++; if (vsize[1]>1) dim++; if (vsize[2]>1) dim++; - bbGetInputIn()->GetScalarRange(range); + bbGetInputIn()->GetOrigin(origin); numberoOfComponents=bbGetInputIn()->GetNumberOfScalarComponents(); - bbGetInputIn()->GetSpacing(spc); for (unsigned int i=0;iGetScalarType()==VTK_BIT) nametype="VTK_BIT"; - if (bbGetInputIn()->GetScalarType()==VTK_CHAR) nametype="VTK_CHAR"; - if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR) nametype="VTK_SIGNED_CHAR"; - if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR) nametype="VTK_UNSIGNED_CHAR"; - if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT) nametype="VTK_UNSIGNED_SHORT"; - if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT) nametype="VTK_UNSIGNED_INT"; - if (bbGetInputIn()->GetScalarType()==VTK_LONG) nametype="VTK_LONG"; - if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG) nametype="VTK_UNSIGNED_LONG"; - if (bbGetInputIn()->GetScalarType()==VTK_FLOAT) nametype="VTK_FLOAT"; - if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE) nametype="VTK_DOUBLE"; + { + vspacing.push_back( (double)spc[i] ); + vorigin.push_back( (double)origin[i] ); + } + vrange.push_back((double)range[0]); + vrange.push_back((double)range[1]); + if (bbGetInputIn()->GetScalarType()==VTK_BIT) nametype="VTK_BIT"; // 1 + if (bbGetInputIn()->GetScalarType()==VTK_CHAR) nametype="VTK_CHAR"; // 2 + if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR) nametype="VTK_SIGNED_CHAR"; // 15 + if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR) nametype="VTK_UNSIGNED_CHAR"; // 3 + if (bbGetInputIn()->GetScalarType()==VTK_SHORT) nametype="VTK_SHORT"; // 4 + if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT) nametype="VTK_UNSIGNED_SHORT"; // 5 + if (bbGetInputIn()->GetScalarType()==VTK_INT) nametype="VTK_INT"; // 6 + if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT) nametype="VTK_UNSIGNED_INT"; // 7 + if (bbGetInputIn()->GetScalarType()==VTK_LONG) nametype="VTK_LONG"; // 8 + if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG) nametype="VTK_UNSIGNED_LONG"; // 9 + if (bbGetInputIn()->GetScalarType()==VTK_FLOAT) nametype="VTK_FLOAT"; // 10 + if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE) nametype="VTK_DOUBLE"; // 11 } else { dim = 0; numberoOfComponents = 0; @@ -69,13 +107,13 @@ void ImageVtkProperties::Process() vrange.push_back(0); nametype = "VOID"; } - bbSetOutputDimension( dim ); - bbSetOutputSize( vsize ); - bbSetOutputSpacing( vspacing ); - bbSetOutputMinMax( vrange ); - bbSetOutputTypeName( nametype ); - bbSetOutputComponents( numberoOfComponents ); - + bbSetOutputDimension ( dim ); + bbSetOutputOrigin ( vorigin ); + bbSetOutputSize ( vsize ); + bbSetOutputSpacing ( vspacing ); + bbSetOutputMinMax ( vrange ); + bbSetOutputTypeName ( nametype ); + bbSetOutputComponents ( numberoOfComponents ); } //===== // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)