From: David Sarrut Date: Tue, 6 Jan 2015 14:11:34 +0000 (+0100) Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk X-Git-Tag: v1.4.0~95^2~7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8272e1ef65c98178771f62768ced173d09e40e33;hp=c9ee0752280f0607a22dbaf3ffe40d4cc8042d37;p=clitk.git Merge branch 'master' of git.creatis.insa-lyon.fr:clitk --- diff --git a/common/clitkCommon.h b/common/clitkCommon.h index 2f5b26f..b58974a 100644 --- a/common/clitkCommon.h +++ b/common/clitkCommon.h @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + Authors belong to: - University of LYON http://www.universite-lyon.fr/ - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr @@ -34,7 +34,7 @@ #include // Include for "rusage" -#include +#include #if defined(unix) || defined(__APPLE__) # include # include @@ -51,7 +51,7 @@ namespace clitk { typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; - + #define CLITK_TRY_CATCH_EXIT(func) \ try { \ func; \ @@ -68,13 +68,13 @@ namespace clitk { std::cout << "Unknown excpetion" << std::endl; \ exit(-3); \ } - + //-------------------------------------------------------------------- // when everything goes wrong #define WHEREAMI "[ " << __FILE__ << " ] line " << __LINE__ -#define FATAL(a) std::cerr << "ERROR in " << WHEREAMI << ": " << a; exit(0); - +#define FATAL(a) { std::cerr << "ERROR in " << WHEREAMI << ": " << a; exit(0); } + //-------------------------------------------------------------------- // GGO with modified struct name #define GGO(ggo_filename, args_info) \ @@ -82,7 +82,7 @@ namespace clitk { cmdline_parser_##ggo_filename##2(argc, argv, &args_info, 1, 1, 0); \ if (args_info.config_given) \ cmdline_parser_##ggo_filename##_configfile (args_info.config_arg, &args_info, 0, 0, 1); \ - else cmdline_parser_##ggo_filename(argc, argv, &args_info); + else cmdline_parser_##ggo_filename(argc, argv, &args_info); //-------------------------------------------------------------------- // skip line with # @@ -95,15 +95,15 @@ namespace clitk { //-------------------------------------------------------------------- // Return filename extension std::string GetExtension(const std::string& filename); - + //-------------------------------------------------------------------- // Convert float, double ... to string template std::string toString(const T & t); template std::string toStringVector(const T * t, const int n); template std::string toStringVector(const T & t, const int n); template std::string toStringVector(const std::vector & t); - template bool fromString(T& t, - const std::string& s, + template bool fromString(T& t, + const std::string& s, std::ios_base& (*f)(std::ios_base&)=std::dec); //-------------------------------------------------------------------- @@ -129,7 +129,7 @@ namespace clitk { // Return the name of a type as a string template std::string GetTypeAsString(); - + //-------------------------------------------------------------------- // Convert radian / degree double rad2deg(double anglerad); @@ -152,13 +152,13 @@ namespace clitk { std::string CreateListOfTypes(bool last=true) { return GetTypeAsString(); } - + template std::string CreateListOfTypes(bool last=true) { if (last) return CreateListOfTypes()+" and "+CreateListOfTypes(); else return CreateListOfTypes()+", "+CreateListOfTypes(); } - + template std::string CreateListOfTypes(bool last=true) { if (last) return CreateListOfTypes(false)+" and "+CreateListOfTypes(); @@ -195,7 +195,7 @@ namespace clitk { else return CreateListOfTypes(false)+", "+CreateListOfTypes(); } //-------------------------------------------------------------------- - + //-------------------------------------------------------------------- void FindAndReplace(std::string & line, const std::string & tofind, const std::string & replacement); void FindAndReplace(std::string & line, const std::vector & tofind, const std::vector & toreplace); @@ -203,8 +203,8 @@ namespace clitk { //-------------------------------------------------------------------- //-------------------------------------------------------------------- - double ComputeEuclideanDistanceFromPointToPlane(const itk::ContinuousIndex point, - const itk::ContinuousIndex pointInPlane, + double ComputeEuclideanDistanceFromPointToPlane(const itk::ContinuousIndex point, + const itk::ContinuousIndex pointInPlane, const itk::ContinuousIndex normalPlane); //-------------------------------------------------------------------- @@ -232,9 +232,9 @@ namespace clitk { //-------------------------------------------------------------------- // Convert a map to a vector - template + template void MapToVecFirst(const M & m, V & v); - template + template void MapToVecSecond(const M & m, V & v); //-------------------------------------------------------------------- @@ -247,4 +247,3 @@ namespace clitk { } // end namespace #endif /* end #define CLITKCOMMON_H */ - diff --git a/common/clitkDD.h b/common/clitkDD.h index 97ba443..c5a9996 100644 --- a/common/clitkDD.h +++ b/common/clitkDD.h @@ -38,6 +38,6 @@ template void _print_container(T const& a) { for(typename T::const_iterator i=a.begin();i!=a.end();++i) { std::cout << *i << " "; };} -#define DDS(a) { std::cout << #a " = [ "; _print_container(a) ; std::cout << " ]" << std::endl;std::cout.flush():} +#define DDS(a) { std::cout << #a " = [ "; _print_container(a) ; std::cout << " ]" << std::endl;std::cout.flush();} #endif diff --git a/common/clitkTimer.cxx b/common/clitkTimer.cxx index cd74428..329ca13 100644 --- a/common/clitkTimer.cxx +++ b/common/clitkTimer.cxx @@ -64,13 +64,15 @@ void clitk::Timer::Stop(bool accumulate) mElapsed += (mEnd.ru_utime.tv_usec - mBegin.ru_utime.tv_usec)+ (mEnd.ru_utime.tv_sec - mBegin.ru_utime.tv_sec)*1000000; } + else #elif defined(_WIN32) QueryPerformanceCounter((LARGE_INTEGER*)&mEnd); if (accumulate) { mElapsed += ((mEnd-mBegin)*1000000)/(long double)mFrequency; } + else #endif - else { + { mNumberOfCall--; } } @@ -114,4 +116,3 @@ void clitk::Timer::Reset() // #endif // If UNIX #endif /* end #define CLITKTIMER_CXX */ - diff --git a/tools/clitkGammaIndex.cxx b/tools/clitkGammaIndex.cxx index 7e5a92e..1f5fd03 100644 --- a/tools/clitkGammaIndex.cxx +++ b/tools/clitkGammaIndex.cxx @@ -15,6 +15,15 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html ===========================================================================*/ + +#include "clitkGammaIndex_ggo.h" +#include "clitkIO.h" +#include "clitkDD.h" + +#include +#include +#include + #include #include #include @@ -24,15 +33,7 @@ #include #include #include -#include -#include -#include -using std::endl; -using std::cout; -#include "clitkGammaIndex_ggo.h" - -#include #include #include #include @@ -42,6 +43,9 @@ using std::cout; typedef itk::Image OutputImageType; typedef itk::ImageRegionIterator OutputImageIterator; +using std::endl; +using std::cout; + vtkImageData* loadImage(const std::string& filename) { vvImageReader::Pointer reader = vvImageReader::New(); @@ -224,7 +228,7 @@ int main(int argc,char * argv[]) // load reference vtkImageData* reference = loadImage(reference_filename); assert(reference); - + // translate target with arguments values // reference is translated instead of target so that the output space stay the same as target { @@ -248,10 +252,13 @@ int main(int argc,char * argv[]) vtkAbstractCellLocator *locator = vtkCellLocator::New(); locator->SetDataSet(data); - data->Delete(); + DD("here"); + // data->Delete(); locator->CacheCellBoundsOn(); locator->AutomaticOn(); + DD("BuildLocator"); locator->BuildLocator(); + DD("end BuildLocator"); // load target vtkImageData* target = loadImage(target_filename); @@ -277,6 +284,7 @@ int main(int argc,char * argv[]) unsigned long over_one = 0; OutputImageIterator iter(output,output->GetLargestPossibleRegion()); iter.GoToBegin(); + DD("loop"); while (!iter.IsAtEnd()) { double *point = target->GetPoint(kk); double value = target->GetPointData()->GetScalars()->GetTuple1(kk); @@ -315,4 +323,3 @@ int main(int argc,char * argv[]) return 0; } -