X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=476c0f1878bbe42ce70141f657e58f5a5804ec6f;hb=2136379e8e3cd0010b909a2a7ef2580559cc3ead;hp=aeac0a669c184655edac95f1299aba856aa6c8da;hpb=0083c3fb2c66812489631c7551709d121de51625;p=clitk.git diff --git a/common/clitkCommon.h b/common/clitkCommon.h index aeac0a6..476c0f1 100644 --- a/common/clitkCommon.h +++ b/common/clitkCommon.h @@ -1,17 +1,25 @@ -#ifndef CLITKCOMMON_H -#define CLITKCOMMON_H -/** - ------------------------------------------------------------------- - * @file clitkCommon.h - * @author David Sarrut - * @date 17 May 2006 07:57:56 +/*========================================================================= + Program: vv http://www.creatis.insa-lyon.fr/rio/vv - * @brief + 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. -// clitk include + 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 + +// clitk include #include "clitkConfiguration.h" #include "clitkPortability.h" @@ -21,6 +29,8 @@ #include #include +#include + //-------------------------------------------------------------------- namespace clitk { @@ -30,8 +40,12 @@ 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;std::cout.flush():} //-------------------------------------------------------------------- // when everything goes wrong @@ -42,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 # @@ -172,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);