X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=410c97683a3404eba2a8a5c7822bd593f87dddd4;hb=ef9b02c88f132a17f2292e84b4167c22e1b87f8d;hp=00a32cfea64f4d76bcd3938c4f1fedcd4360edf1;hpb=0350f04002063f12dcf10ee765f5389590f352e7;p=clitk.git diff --git a/common/clitkCommon.h b/common/clitkCommon.h index 00a32cf..410c976 100644 --- a/common/clitkCommon.h +++ b/common/clitkCommon.h @@ -1,29 +1,27 @@ +/*========================================================================= + Program: vv http://www.creatis.insa-lyon.fr/rio/vv + + Authors belong to: + - University of LYON http://www.universite-lyon.fr/ + - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the copyright notices for more information. + + It is distributed under dual licence + + - BSD See included LICENSE.txt file + - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +======================================================================-====*/ + #ifndef CLITKCOMMON_H #define CLITKCOMMON_H -/** - ------------------------------------------------------------------- - * @file clitkCommon.h - * @author David Sarrut - * @date 17 May 2006 07:57:56 - - * @brief - - -------------------------------------------------------------------*/ - -// std include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include +// clitk include +#include "clitkConfiguration.h" +#include "clitkPortability.h" // itk include (include std) #include @@ -31,13 +29,11 @@ #include #include +#include + //-------------------------------------------------------------------- namespace clitk { - -#if defined(WIN32) -#define lrint(x) (floor(x+(x>0) ? 0.5 : -0.5)) -#endif - + typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; @@ -46,6 +42,10 @@ namespace clitk { // display #define DD(a) std::cout << #a " = [ " << a << " ]" << std::endl; #define DDV(a,n) { std::cout << #a " = [ "; for(unsigned int _i_=0; _i_ +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;} //-------------------------------------------------------------------- // when everything goes wrong @@ -56,10 +56,10 @@ namespace clitk { // GGO with modified struct name #define GGO(ggo_filename, args_info) \ args_info_##ggo_filename args_info; \ - cmdline_parser2(argc, argv, &args_info, 1, 1, 0); \ + cmdline_parser_##ggo_filename##2(argc, argv, &args_info, 1, 1, 0); \ if (args_info.config_given) \ - cmdline_parser_configfile (args_info.config_arg, &args_info, 0, 0, 1); \ - else cmdline_parser(argc, argv, &args_info); + cmdline_parser_##ggo_filename##_configfile (args_info.config_arg, &args_info, 0, 0, 1); \ + else cmdline_parser_##ggo_filename(argc, argv, &args_info); //-------------------------------------------------------------------- // skip line with # @@ -186,6 +186,9 @@ namespace clitk { void openFileForReading(std::ifstream & is, const std::string & filename); void openFileForWriting(std::ofstream & os, const std::string & filename); + //-------------------------------------------------------------------- + void readDoubleFromFile(const std::string & filename, std::vector & list); + //-------------------------------------------------------------------- double cotan(double i); double invcotan(double i);