X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Fvolume.hxx;h=6c5c343af22abd6bb3ae9268458bb121707a0d59;hb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;hp=baf121bc3d12a803b3246c070fe0986fc5183601;hpb=3e48d6cf83c4d96585d3e825899db643f9a62193;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx index baf121b..6c5c343 100644 --- a/lib/maracasVisuLib/src/kernel/volume.hxx +++ b/lib/maracasVisuLib/src/kernel/volume.hxx @@ -1,10 +1,35 @@ +/*# --------------------------------------------------------------------- +# +# 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: wxMaracas Module: $RCSfile: volume.hxx,v $ Language: C++ - Date: $Date: 2009/01/15 11:09:47 $ - Version: $Revision: 1.3 $ + Date: $Date: 2012/11/15 14:16:12 $ + Version: $Revision: 1.9 $ Copyright: (c) 2002, 2003 License: @@ -21,13 +46,6 @@ #include "marTypes.h" #include -#ifdef KGFO_USE_IDO -extern "C" -{ -#include -}; -#endif // KGFO_USE_IDO - #ifdef KGFO_USE_VTK #include #endif // KGFO_USE_VTK @@ -50,22 +68,17 @@ class creaMaracasVisu_EXPORT kVolume static const vtkIdType VTKTypes[]; #endif // KGFO_USE_VTK -#ifdef KGFO_USE_IDO - - static const int IDOTypes[]; - -#endif // KGFO_USE_IDO public: kVolume( ); kVolume( Type type, - uint xdim, uint ydim, uint zdim, + uint32_t xdim, uint32_t ydim, uint32_t zdim, double xsize = 1, double ysize = 1, double zsize = 1, void* data = 0 ); kVolume( Type type, - const uint *dims, + const uint32_t *dims, const double *sizes, void* data = 0 ); @@ -79,30 +92,30 @@ class creaMaracasVisu_EXPORT kVolume bool sameDimension( const kVolume& comp ); - const uint* getDimensions( ) const { return( _dims ); } - uint getWidth( ) const { return( _dims[ CX ] ); } - uint getHeight( ) const { return( _dims[ CY ] ); } - uint getDepth( ) const { return( _dims[ CZ ] ); } - uint getNcols( ) const { return( _dims[ CX ] ); } - uint getNrows( ) const { return( _dims[ CY ] ); } - uint getNplanes( ) const { return( _dims[ CZ ] ); } - uint getXdim( ) const { return( _dims[ CX ] ); } - uint getYdim( ) const { return( _dims[ CY ] ); } - uint getZdim( ) const { return( _dims[ CZ ] ); } - - void setDimensions( uint* dims ) + const uint32_t* getDimensions( ) const { return( _dims ); } + uint32_t getWidth( ) const { return( _dims[ CX ] ); } + uint32_t getHeight( ) const { return( _dims[ CY ] ); } + uint32_t getDepth( ) const { return( _dims[ CZ ] ); } + uint32_t getNcols( ) const { return( _dims[ CX ] ); } + uint32_t getNrows( ) const { return( _dims[ CY ] ); } + uint32_t getNplanes( ) const { return( _dims[ CZ ] ); } + uint32_t getXdim( ) const { return( _dims[ CX ] ); } + uint32_t getYdim( ) const { return( _dims[ CY ] ); } + uint32_t getZdim( ) const { return( _dims[ CZ ] ); } + + void setDimensions( uint32_t* dims ) { - memcpy( _dims, dims, 3 * sizeof( uint ) ); + memcpy( _dims, dims, 3 * sizeof( uint32_t ) ); } - void setWidth( uint w ) { _dims[ CX ] = w; } - void setHeight( uint h ) { _dims[ CY ] = h; } - void setDepth( uint d ) { _dims[ CZ ] = d; } - void setNcols( uint c ) { _dims[ CX ] = c; } - void setNrows( uint r ) { _dims[ CY ] = r; } - void setNplanes( uint p ) { _dims[ CZ ] = p; } - void setXdim( uint x ) { _dims[ CX ] = x; } - void setYdim( uint y ) { _dims[ CY ] = y; } - void setZdim( uint z ) { _dims[ CZ ] = z; } + void setWidth( uint32_t w ) { _dims[ CX ] = w; } + void setHeight( uint32_t h ) { _dims[ CY ] = h; } + void setDepth( uint32_t d ) { _dims[ CZ ] = d; } + void setNcols( uint32_t c ) { _dims[ CX ] = c; } + void setNrows( uint32_t r ) { _dims[ CY ] = r; } + void setNplanes( uint32_t p ) { _dims[ CZ ] = p; } + void setXdim( uint32_t x ) { _dims[ CX ] = x; } + void setYdim( uint32_t y ) { _dims[ CY ] = y; } + void setZdim( uint32_t z ) { _dims[ CZ ] = z; } const double *getSizes( ) const { return( _sizes ); } double getXsize( ) const { return( _sizes[ CX ] ); } @@ -166,7 +179,7 @@ class creaMaracasVisu_EXPORT kVolume Type _type; Creator _creator; - uint _dims[ 3 ]; + uint32_t _dims[ 3 ]; double _sizes[ 3 ]; void* _raw; void** _columns; @@ -196,62 +209,6 @@ class creaMaracasVisu_EXPORT kVolume #endif // KGFO_USE_VTK - -#ifdef KGFO_USE_IDO - - public: - - kVolume( PPPVOLUME org ); - - kVolume& operator=( PPPVOLUME org ); - void copyFrom( PPPVOLUME org ); - - PPPVOLUME castIdo( ) const - { - return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME( ) const - { - return( ( PPPVOLUME )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_CHAR( ) const - { - return( ( PPPVOLUME_CHAR )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_FLOAT( ) const - { - return( ( PPPVOLUME_FLOAT )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_DOUBLE( ) const - { - return( ( PPPVOLUME_DOUBLE )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_LONG( ) const - { - return( ( PPPVOLUME_LONG )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_SHORT( ) const - { - return( ( PPPVOLUME_SHORT )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_UCHAR( ) const - { - return( ( PPPVOLUME_UCHAR )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_ULONG( ) const - { - return( ( PPPVOLUME_ULONG )( &_privateIdo[ 1 ] ) ); - } - operator PPPVOLUME_USHORT( ) const - { - return( ( PPPVOLUME_USHORT )( &_privateIdo[ 1 ] ) ); - } - - protected: - - PRIVATE_VOLUME* _privateIdo; - -#endif // KGFO_USE_IDO }; #endif // KGFO__VOLUME__HXX