X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=e3145b1d840425812feef4f2a6f4773c7073b90e;hb=60d23fcd357696aa97aa4a6ebb96fa807f693613;hp=2d26e8a786d8045934a1af1b67ae4763326fc850;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 2d26e8a..e3145b1 100644
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -15,22 +15,14 @@
   - 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 <David.Sarrut@creatis.insa-lyon.fr>
-   * @date   17 May 2006 07:57:56
-
-   * @brief  
-
-   -------------------------------------------------------------------*/
 
 // clitk include
-
-#include "clitkConfiguration.h"
 #include "clitkPortability.h"
+#include "clitkDD.h"
+#include "clitkExceptionObject.h"
 
 // itk include (include std)
 #include <itkContinuousIndex.h>
@@ -38,6 +30,8 @@
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
+#include <fstream>
+
 //--------------------------------------------------------------------
 namespace clitk {
 
@@ -45,11 +39,6 @@ namespace clitk {
   typedef unsigned short ushort;
   typedef unsigned int uint;
 
-  //--------------------------------------------------------------------
-  // display 
-#define DD(a) std::cout << #a " = [ " << a << " ]" << std::endl;
-#define DDV(a,n) { std::cout << #a " = [ "; for(unsigned int _i_=0; _i_<n; _i_++) { std::cout << a[_i_] << " "; }; std::cout << " ]" << std::endl;}
-
   //--------------------------------------------------------------------
   // when everything goes wrong
 #define WHEREAMI "[ " << __FILE__  << " ] line " << __LINE__
@@ -59,10 +48,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 #
@@ -189,6 +178,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<double> & list);
+
   //--------------------------------------------------------------------
   double cotan(double i);
   double invcotan(double i);