From 6d21b5c535447c4e823bd41890c75f1ee5476227 Mon Sep 17 00:00:00 2001 From: dsarrut Date: Tue, 2 Mar 2010 13:28:42 +0000 Subject: [PATCH] slightly decrease template compilation time --- common/clitkImageToImageGenericFilter.txx | 62 +++++++++++------------ vv/vvToolCropImage.h | 6 +-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/common/clitkImageToImageGenericFilter.txx b/common/clitkImageToImageGenericFilter.txx index 6febe19..6d2a7cd 100644 --- a/common/clitkImageToImageGenericFilter.txx +++ b/common/clitkImageToImageGenericFilter.txx @@ -3,8 +3,8 @@ Program: vv Module: $RCSfile: clitkImageToImageGenericFilter.txx,v $ Language: C++ - Date: $Date: 2010/03/01 15:37:41 $ - Version: $Revision: 1.7 $ + Date: $Date: 2010/03/02 13:28:42 $ + Version: $Revision: 1.8 $ Author : Joel Schaerer David Sarrut @@ -26,35 +26,35 @@ =========================================================================*/ -//-------------------------------------------------------------------- -template -void clitk::ImageToImageGenericFilterBase::SetNextOutput(typename ImageType::Pointer output) { - if (mOutputFilenames.size()) - { - clitk::writeImage(output, mOutputFilenames.front(), mIOVerbose); - mOutputFilenames.pop_front(); - } - if (mInputVVImages.size()) //We assume that if a vv image is set as input, we want one as the output - mOutputVVImages.push_back(vvImageFromITK(output)); -} -//-------------------------------------------------------------------- - - -//-------------------------------------------------------------------- -template -typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsigned int n) { - if (mInputFilenames.size() > n) { - return clitk::readImage(mInputFilenames[n], mIOVerbose); - } - else if (mInputVVImages.size() > n) - return typename ImageType::Pointer(const_cast(vvImageToITK(mInputVVImages[n]).GetPointer())); - else - { - assert(false); //No input, this shouldn't happen - return typename ImageType::Pointer(NULL); - } -} -//-------------------------------------------------------------------- +// //-------------------------------------------------------------------- +// template +// void clitk::ImageToImageGenericFilterBase::SetNextOutput(typename ImageType::Pointer output) { +// if (mOutputFilenames.size()) +// { +// clitk::writeImage(output, mOutputFilenames.front(), mIOVerbose); +// mOutputFilenames.pop_front(); +// } +// if (mInputVVImages.size()) //We assume that if a vv image is set as input, we want one as the output +// mOutputVVImages.push_back(vvImageFromITK(output)); +// } +// //-------------------------------------------------------------------- + + +// //-------------------------------------------------------------------- +// template +// typename ImageType::Pointer clitk::ImageToImageGenericFilterBase::GetInput(unsigned int n) { +// if (mInputFilenames.size() > n) { +// return clitk::readImage(mInputFilenames[n], mIOVerbose); +// } +// else if (mInputVVImages.size() > n) +// return typename ImageType::Pointer(const_cast(vvImageToITK(mInputVVImages[n]).GetPointer())); +// else +// { +// assert(false); //No input, this shouldn't happen +// return typename ImageType::Pointer(NULL); +// } +// } +// //-------------------------------------------------------------------- //-------------------------------------------------------------------- diff --git a/vv/vvToolCropImage.h b/vv/vvToolCropImage.h index ebd5b83..2a233c2 100644 --- a/vv/vvToolCropImage.h +++ b/vv/vvToolCropImage.h @@ -3,8 +3,8 @@ Program: vv Module: $RCSfile: vvToolCropImage.h,v $ Language: C++ - Date: $Date: 2010/03/01 15:38:09 $ - Version: $Revision: 1.3 $ + Date: $Date: 2010/03/02 13:28:43 $ + Version: $Revision: 1.4 $ Author : David Sarrut (david.sarrut@creatis.insa-lyon.fr) Copyright (C) 2010 @@ -67,7 +67,7 @@ public slots: static void Initialize() { SetToolName("Crop"); SetToolMenuName("Crop"); - SetToolIconFilename(":/new/prefix1/icons/binarize.png"); + SetToolIconFilename(":/new/prefix1/icons/crop.png"); SetToolTip("Crop image."); } -- 2.45.1