X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmArgMgr.cxx;h=32e3765ef519e0d623c9b9ad911003b087e294fb;hb=3a0c4256baa5052f854ac46751b93a3e0d0e5f7a;hp=697ecf1a5637dbd597c195993dad8200eb88138c;hpb=f5a0c2260b3778606fd984cef9874fb9761f6eed;p=gdcm.git

diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index 697ecf1a..32e3765e 100644
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/22 08:11:23 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/12/22 14:46:06 $
+  Version:   $Revision: 1.16 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -70,7 +70,7 @@ namespace gdcm
       }
    }
 
-   /* Fills an array with the alreadu used parameters ****/
+   /* Fills an array with the already used parameters ****/
    ArgUsed = (char *)calloc (1, ArgCount );
 
    /* Builds the full string with all the parameters  **************/
@@ -117,36 +117,36 @@ ArgMgr::~ArgMgr()
 /**
  * \brief  checks if a parameter exists in the command line
  * @param param  label name
- * @return   true if parameter 'label' exists
- *           Actually, it returns 0 if label is not found
+ * @return   0 if label is not found
  *           else, returns the number of the spot it was found last time.
  */
 int ArgMgr::ArgMgrDefined( const char *param )
 {
-  int i, trouve ;
+  int i;
+  bool trouve;
   char *temp;
   temp = Majuscule ( param ) ;
-  for ( trouve = false, i = ArgCount-1; i>0; i-- )
+  for ( i = ArgCount-1; i>0; i-- )
   { 
-    trouve = ! strcmp( ArgLab[i], temp ) ;
+    trouve = ( strcmp( ArgLab[i], temp )==0 ) ;
     if ( trouve )
     {
       ArgUsed[i] = true ;           
       for ( int j=1; j<i; j++)
       {                     
          if ( (!ArgUsed[j])&&(!strcmp(ArgLab[i],ArgLab[j])) )
-            ArgUsed[j] = true ;
+            ArgUsed[j] = i ;
       }
       return i ;
     }
   }
-  return false ;
+  return 0 ;
 }
 
 /**
  * \brief  Gets the parameter value, read on the command line
  * @param param   name of the searched parameter label
- * @return   Value, as a characters string, of the parameter
+ * @return   Value, as a char array, of the parameter
  *            whose label is given.
  */
 char *ArgMgr::ArgMgrValue ( const char *param )
@@ -160,7 +160,7 @@ char *ArgMgr::ArgMgrValue ( const char *param )
 
 /**
  * \brief  Search for the first not yet used label
- * @return Pointer to a char array holding the first non used label
+ * @return Pointer to the char array holding the first non used label
  */
 char *ArgMgr::ArgMgrUnused ( )
 {
@@ -214,7 +214,7 @@ int ArgMgr::ArgMgrUsage(const char **usage )
  * Saves a char. array in a parameter file
  *         whose name is given on command line by : PARAMOUT=???
  *         or, as a default, by ARG_DEFAULT_PARAMOUT
- * @param param  char. array that defines the parameter:
+ * @param param  char. array that defines the parameter
  * @return   Entier correspondant au rang dans la liste de labels
  */
 int ArgMgr::ArgMgrSave ( char *param )
@@ -242,7 +242,7 @@ int ArgMgr::ArgMgrSave ( char *param )
 /**
  * \brief  Gets an int value passed as an argument to a program
  *         (use default value if not found)
- *  EXEMPLE:     int dimx = ArgMgrGetInt ( "DIMX", 256 );
+ *         EXAMPLE:     int dimx = ArgMgrGetInt ( "DIMX", 256 );
  * @param label   label name 
  * @param defaultVal default value
  * @return parameter value
@@ -257,7 +257,7 @@ int ArgMgr::ArgMgrGetInt(const char *label, int defaultVal)
 /**
  * \brief  Gets a float value passed as an argument to a program
  *         (use default value if not found)
- *  EXEMPLE:     float scale = ArgMgrGetFloat ( "SCALE", 0.33 );
+ *         EXAMPLE:     float scale = ArgMgrGetFloat ( "SCALE", 0.33 );
  * @param param   label name 
  * @param defaultVal default value
  * @return parameter value
@@ -272,6 +272,7 @@ float ArgMgr::ArgMgrGetFloat(const char *param, float defaultVal)
 /**
  * \brief  Gets a 'string' value passed as an argument to a program
  *         (use default value if not found)
+ *         EXAMPLE :  char *imageName = ArgMgrGetString( "NAME", "test.dcm" );
  * @param param   label name 
  * @param defaultVal default value
  * @return parameter value
@@ -286,7 +287,7 @@ char *ArgMgr::ArgMgrGetString(const char *param, char *defaultVal)
 /**
  * \brief  Gets a value amongst a set of values
  *         (use default value if not found) 
- *         EXEMPLE:     int nlab = ArgMgrGetLabel("CONFIRM","NO\\YES", 0); 
+ *         EXAMPLE:     int nlab = ArgMgrGetLabel("CONFIRM","NO\\YES", 0); 
  * @param param   label name 
  * @param liste  character Chain describing the various values.
  *               Value are separated by '\\'.
@@ -320,7 +321,7 @@ int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
 
 /**
  * \brief  Demands a value amongst a set of values (abort if not found)
- *         EXEMPLE:     int nlab = ArgMgrWantLabel("CONFIRM","NO\\YES", usage); 
+ *         EXaMPLE:     int nlab = ArgMgrWantLabel("CONFIRM","NO\\YES", usage); 
  * @param param   label name 
  * @param liste  character Chain describing the various values.
  *               Labels are separated by  '\\'.
@@ -347,7 +348,7 @@ int ArgMgr::ArgMgrWantLabel (const char *param, char *liste, const char **usage
 /**
  * \brief  Demands an int value passed as an argument to a program
  *         If not found usage is displayed and the prog aborted
- *  EXEMPLE:     int dimx = ArgMgrWantInt ( "DIMX", usage );
+ *  EXAMPLE:     int dimx = ArgMgrWantInt ( "DIMX", usage );
  * @param label   label name 
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
@@ -362,7 +363,7 @@ int ArgMgr::ArgMgrWantInt (const char *label, const char **usage)
 /**
  * \brief  Demands a float value passed as an argument to a program
  *         If not found usage is displayed and the prog aborted
- *  EXEMPLE:     float scale = ArgMgrWantFloat ( "SCALE", usage );
+ *  EXAMPLE:     float scale = ArgMgrWantFloat ( "SCALE", usage );
  * @param label   label name 
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
@@ -377,7 +378,7 @@ float ArgMgr::ArgMgrWantFloat (const char *label, const char **usage)
 /**
  * \brief  Demands a 'string' value passed as an argument to a program
  *         If not found usage is displayed and the prog aborted
- *  EXEMPLE:     char *code = ArgMgrWantString ( "CODE", usage );
+ *  EXAMPLE:     char *code = ArgMgrWantString ( "CODE", usage );
  * @param label   Parameter label
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
@@ -390,11 +391,11 @@ char *ArgMgr::ArgMgrWantString(const char *label, const char **usage)
 }
 
 /**
- * \brief  decodage des elements d'un argument 'ensemble de STRING' de lgr qcq
+ * \brief  decodes and returns an array of 'STRING'
+ *  EXAMPLE:     char **codes = ArgMgrGetListOfString ( "CODES", &nbOfCodes ); 
  * @param label   label name 
- * @param number  nb of found elements
- * @return   Pointer to the array
- *     Pointer NULL if error
+ * @param number  nb of found 'STRINGs'
+ * @return   Pointer to the 'STRING' array; NULL if error
  */
 char **ArgMgr::ArgMgrGetListOfString ( const char *label, int *number )
 {
@@ -404,7 +405,10 @@ char **ArgMgr::ArgMgrGetListOfString ( const char *label, int *number )
   char **elem;
   char  *chainecur; 
   if (!value)
+  {
+     *number = 0;
      return 0;
+  }
   *number = IdStrCountChar(value,',')+1; /* nb Elements = nb Commas +1 */
   taille = *number;
   liste = (char **) malloc (sizeof(char*) * taille + strlen(value)+1);
@@ -421,11 +425,11 @@ char **ArgMgr::ArgMgrGetListOfString ( const char *label, int *number )
 }
 
 /**
- * \brief  decodage des elements d'un argument 'liste d'INTEGER' de lgr qcq
+ * \brief  decodes and returns an array of 'INT'
+ *  EXAMPLE:     int *points = ArgMgrGetListOfInt ( "POINTS", &nbOfPoints );  
  * @param label   label name 
- * @param number  nb of found elements
- * @return   Pointer to the array
- *     Pointer NULL if error
+ * @param number  nb of found INT
+ * @return   Pointer to the INT array; NULL if error
  */
 int *ArgMgr::ArgMgrGetListOfInt ( const char *label, int *number )
 {
@@ -434,14 +438,17 @@ int *ArgMgr::ArgMgrGetListOfInt ( const char *label, int *number )
   int *elem;
   int taille;
   if (!value)
+  {
+     *number = 0;
      return 0;
-  *number = IdStrCountChar(value,',')+1; /* nb Elements = nb Commas +1 */
+  }          
+  *number = IdStrCountChar(value,',')+1; /* nb Elements = nb Commas +1 */ 
   taille= *number;
   liste = (int *) calloc (1,sizeof(int)*taille );
   if ( !liste )
      return 0;
   elem = liste;
-  *number = 1;
+  //*number = 1;
 
   while ( taille>0 ) 
   {
@@ -459,11 +466,10 @@ return liste;
 }
 
 /**
- * \brief  decodage des elements d'un argument 'liste de FLOAT' de lgr qcq
+ * \brief  decodes and returns an array of 'FLOAT'
  * @param label   label name 
- * @param number  taille de la liste  trouvee
- * @return   Pointer vers le tableau de lgr 'taille'
- *     NULL if error
+ * @param number  number of found FLOATs
+ * @return   Pointer to the FLOAT array; NULL if error
  */
 float *ArgMgr::ArgMgrGetListOfFloat ( const char *label, int *number )
 {
@@ -477,9 +483,12 @@ float *ArgMgr::ArgMgrGetListOfFloat ( const char *label, int *number )
   taille= *number;
   liste = (float *) calloc (1,sizeof(float)*taille );
   if ( !liste )
+  {
+     *number = 0;
      return 0;
+  }
   elem = liste;
-  *number = 1;
+  //*number = 1;
 
   while ( taille>0 ) 
   {
@@ -496,6 +505,66 @@ float *ArgMgr::ArgMgrGetListOfFloat ( const char *label, int *number )
 return liste;
 }
 
+/**
+ * \brief  decodes and returns an array of 'INT pairs', passed in decimal
+ * @param param   label name 
+ * @param number   nb of found pairs
+ * @return        pointer to the array of 'INT pairs'; NULL if fail
+ */
+int *ArgMgr::ArgMgrGetIntEnum ( const char *param, int *number )
+{
+   char *value = ArgMgrValue(param);
+   int *liste;
+   if (!value) 
+   {
+      *number = 0; 
+      return 0;
+   }
+   liste = IdStrIntEnum(value, number);
+   return liste;
+}
+
+/**
+ * \brief  decodes and returns an array of 'INT16 pairs', passed in hexadecimal
+ * @param param   label name 
+ * @param number   nb of found pairs
+ * @return        pointer to the array of 'INT16 pairs'; NULL if fail
+ */
+uint16_t *ArgMgr::ArgMgrGetXInt16Enum ( const char *param, int *number )
+{
+   char *value = ArgMgrValue(param);
+   uint16_t *liste;
+   if (!value) 
+   {
+      *number = 0; 
+      return 0;
+   }
+   liste = IdStrXInt16Enum(value, number);
+   return liste;
+}
+/**
+ * \brief  decodes and returns an array of 'FLOAT pairs'
+ * @param param   label name 
+ * @param number   nb of found pairs
+ * @return        pointer to the array of 'FLOAT pairs'; NULL if fail
+
+ */
+float *ArgMgr::ArgMgrGetFloatEnum ( const char *param, int *number )
+{
+   char  *value = ArgMgrValue(param);
+   float *liste;
+   if (!value) 
+   {
+      *number = 0; 
+      return 0;
+   }
+   liste = IdStrFloatEnum(value, number);
+   return liste;
+}
+
+// ------------------------ Those are 'service functions' ---------------------
+// ------------------------       internal use only       ---------------------
+
 /**
  * \brief     Counts the nb of occurrences of a given charact within a 'string' 
  * @param chaine     Pointer to the 'string'
@@ -513,10 +582,10 @@ int ArgMgr::IdStrCountChar (char *chaine, int caract)
 }
 
 /**
- * \brief     returns an array of set of 'INT pairs'
- * @param value   char array decribing a set of 'INT pairs' (deb1,fin1, deb2,fin2, ...)
- * @param number   nb of found pairs
- * @return        array of set of 'INT pairs'
+ * \brief     returns an array of 'INT pairs'
+ * @param value  char array decribing a set of 'INT pairs' (f1-l1, f2-l2, ...)
+ * @param number nb of found INT pairs
+ * @return       pointer to the array of 'INT pairs'
  */
 int *ArgMgr::IdStrIntEnum ( char* value, int *number)
 {
@@ -560,12 +629,61 @@ int *ArgMgr::IdStrIntEnum ( char* value, int *number)
    }
    return liste;
 }
- 
+
 /**
- * \brief     returns an array a set of 'FLOAT pairs'
- * @param value   char array decribing a set of 'FLOAT pairs' (deb1,fin1, deb2,fin2, ...)
- * @param number   nb of found pairs
- * @return        array of set of 'FLOAT pairs'
+ * \brief     returns an array of set of 'INT16 pairs', passed in Hexadecimal
+ * @param value  char array decribing a set of 'INT16 pairs' (f1-l1, f2-l2, ...)
+ *               coded in hexadecimal e.g. 0x0008,0x00ac
+ * @param number nb of found pairs
+ * @return        array of set of 'INT16 pairs'
+ */
+uint16_t *ArgMgr::IdStrXInt16Enum ( char *value, int *number)
+{
+   uint16_t *liste;
+   int taille;
+   int i;
+
+   *number = IdStrCountChar(value,',')+1; /* nb Elements = nb Commas +1 */
+   taille= *number;
+   liste = (uint16_t *) calloc (1,sizeof(uint16_t)*2*taille );
+   if ( !liste )
+   {
+      return 0;
+   }
+   i=0;
+   while ( taille>0 ) 
+   {
+      liste[i] = (uint16_t) strtol ( value, &value, 16 );
+      if ( *value == '\0' ) 
+      {
+         liste[i+1]=liste[i];
+         return liste;
+      }
+      if ( *(value++) != '-' ) 
+      {
+         liste[i+1]=liste[i];
+         value--;
+       }
+       else
+       {
+          liste[i+1] = (uint16_t) strtol ( value, &value, 16 );
+       }
+       if ( *value == '\0' )
+          return liste;
+       if ( *(value++) != ',' )
+       {
+          free (liste);
+          return 0;
+       }
+       taille --; i+=2;
+   }
+   return liste;
+} 
+/**
+ * \brief     returns an array of 'FLOAT pairs'
+ * @param value  char array decribing a set of 'FLOAT pairs' (f1-l1, f2-l2, ...)
+ * @param number nb of found pairs
+ * @return       pointer to the array of 'FLOAT pairs'; NULL if fail
  */
 float *ArgMgr::IdStrFloatEnum (char *value, int *number)
 {
@@ -607,40 +725,6 @@ float *ArgMgr::IdStrFloatEnum (char *value, int *number)
    return liste;
 }
 
-/**
- * \brief  decodage des elements d'un argument 'paires d'int' de lgr quelconque
- * @param param   label name 
- * @param number  taille de l'ensemble de paires trouvee
- * @return   Pointer vers le tableau de taille '2*nbElem'
- *     Pointer NULL si erreur
- */
-int *ArgMgr::ArgMgrGetIntEnum ( const char *param, int *number )
-{
-   char *value = ArgMgrValue(param);
-   int *liste;
-   if (!value) 
-      return 0;
-   liste = IdStrIntEnum(value, number);
-   return liste;
-}
-
-/**
- * \brief  decodage des elements d'un argument 'paires de float' de lgr quelconque
- * @param param   label name 
- * @param number  taille de l'ensemble de paires trouvee
- * @return   Pointer vers le tableau de taille '2*nbElem'
- *     Pointer NULL si erreur
- */
-float *ArgMgr::ArgMgrGetFloatEnum ( const char *param, int *number )
-{
-   char  *value = ArgMgrValue(param);
-   float *liste;
-   if (!value) 
-      return 0;
-   liste = IdStrFloatEnum(value, number);
-   return liste;
-}
-
 //-----------------------------------------------------------------------------
 // Protected