X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Src%2FSTMS_GrayLevelFiltering.cxx;fp=Src%2FSTMS_GrayLevelFiltering.cxx;h=d0c17d2f312b142f1d59153a3f8686ef577afe5c;hb=52d9a4ff6a971908206fcb9bed99942480de4ef8;hp=6de788375fa7c36391b51c0a6653590728bb11eb;hpb=bd84bb06e5d774db2969d836670bddefbed6a1b9;p=STMS.git diff --git a/Src/STMS_GrayLevelFiltering.cxx b/Src/STMS_GrayLevelFiltering.cxx index 6de7883..d0c17d2 100755 --- a/Src/STMS_GrayLevelFiltering.cxx +++ b/Src/STMS_GrayLevelFiltering.cxx @@ -60,7 +60,7 @@ #include #include -#define STMS_NUMBERING_FORM_ONE "001" +#define STMS_NUMBERING_FORM_ONE "0001" #include "itkImage.h" #include "itkSTMS_ArgumentsAnalysis.h" @@ -73,6 +73,9 @@ typedef float PixelType; +typedef unsigned char OutputPixelType2D; +typedef float OutputPixelType3D; + double gettime_hp() { @@ -110,8 +113,9 @@ int main(int argc, char **argv){ switch(params->dim){ case 2: { - typedef itk::Image< PixelType, 2 > ImageType2D; - typedef itk::Image< unsigned char, 2 > MaskImageType2D; + typedef itk::Image< PixelType, 2 > ImageType2D; + typedef itk::Image< OutputPixelType2D, 2 > OutputImageType2D; + typedef itk::Image< unsigned char, 2 > MaskImageType2D; typedef itkSTMS::itkSTMS_ImageSequenceToTemporalSet< ImageType2D, MaskImageType2D >::IndexType IndexType; @@ -153,8 +157,8 @@ int main(int argc, char **argv){ dtime=gettime_hp(); - itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType2D, ClassImageType2D >* postProcess - = new itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType2D, ClassImageType2D >(stmsFilter->GetClassMemory(), + itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType2D, ClassImageType2D, OutputImageType2D >* postProcess + = new itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType2D, ClassImageType2D, OutputImageType2D>(stmsFilter->GetClassMemory(), stmsFilter->GetSpatialMemory(), stmsFilter->GetRangeSet(), params, @@ -177,6 +181,7 @@ int main(int argc, char **argv){ case 3: { typedef itk::Image< PixelType, 3 > ImageType3D; + typedef itk::Image< OutputPixelType3D, 3 > OutputImageType3D; typedef itk::Image< unsigned char, 3 > MaskImageType3D; typedef itkSTMS::itkSTMS_ImageSequenceToTemporalSet< ImageType3D, MaskImageType3D >::IndexType IndexType; @@ -218,8 +223,8 @@ int main(int argc, char **argv){ dtime=gettime_hp(); - itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType3D, MaskImageType3D >* postProcess - = new itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType3D, MaskImageType3D >(stmsFilter->GetClassMemory(), + itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType3D, MaskImageType3D, OutputImageType3D>* postProcess + = new itkSTMS::itkSTMS_TemporalSetToImageSequence< ImageType3D, MaskImageType3D, OutputImageType3D >(stmsFilter->GetClassMemory(), stmsFilter->GetSpatialMemory(), stmsFilter->GetRangeSet(), params,