SCM Repository

[diderot] Diff of /branches/vis12/src/lib/common/input.c

[diderot] / branches / vis12 / src / lib / common / input.c

Diff of /branches/vis12/src/lib/common/input.c

-revision 1670, Sun Dec  4 10:45:43 2011 UTC
+revision 1671, Sun Dec  4 10:56:10 2011 UTC
 Line 10
  #include "Diderot/diderot.h"
  #include <teem/hest.h>
+ bool     VerboseFlg = false;            //! true if running in verbose mode
+ bool     TimingFlg = false;             //! true if timing computation
+ bool     NrrdOutputFlg = false;         //! true if output is in Nrrd format
  //! Option type tags
  typedef enum {
      optTypeUnknown,       // 0
-Line 39
+Line 43
      void        *valp;          //!< pointer to Diderot global variable being set
  } opt_def_t;
- /*! container for *all* options, and the machinery for parsing them,
+ /*! container for *all* options, the machinery for parsing them,
   * and means of managing their allocation.  There is an opaque typedef
   * around this in src/include/Diderot/options.h.
   *
-Line 58
+Line 62
   * was reallocated for a different length.
   */
  struct Diderot_struct_options {
-     char        *progInfo;      //!< documentation string for describing whole program,
+     char        *progInfo;      //!< documentation string for describing whole
-                                 //!  intended to be one or more sentences
+                                 //!  program, intended to be one or more sentences
      hestOpt     *hopt;          //!< dynamically managed hest options
      hestParm    *hparm;         //!< hest parameters
      opt_def_t   **odef;         //!< dynamically reallocated via odefArr
-Line 92
+Line 96
      return 0;
  }
- /*! create the container for all option information
+ /*! create the container for all option information and register standard
+  *  command-line options.
   */
  Diderot_Options_t *Diderot_OptNew ()
  {
      static const char *me = "Diderot_Options_New";
-     Diderot_Options_t *dopts = AIR_CALLOC(1, Diderot_Options_t);
+     Diderot_Options_t *opts = AIR_CALLOC(1, Diderot_Options_t);
-     if (dopts == 0) {
+     if (opts == 0) {
          fprintf(stderr, "%s: unable to allocate output\n", me);
          exit(1);
      }
-     dopts->progInfo = NULL;
+     opts->progInfo = 0;
-     dopts->mop = airMopNew();
+     opts->mop = airMopNew();
-     dopts->hopt = NULL;
+     opts->hopt = 0;
-     dopts->hparm = hestParmNew();
+     opts->hparm = hestParmNew();
-     dopts->hparm->noArgsIsNoProblem = AIR_TRUE;
+     opts->hparm->noArgsIsNoProblem = AIR_TRUE;
-     airMopAdd(dopts->mop, dopts->hparm, (airMopper)hestParmFree, airMopAlways);
+     airMopAdd (opts->mop, opts->hparm, (airMopper)hestParmFree, airMopAlways);
-     dopts->odef = NULL;
+     opts->odef = 0;
-     dopts->odefNum = 0;
+     opts->odefNum = 0;
    /*
    ** the airArray odefArr manages the allocation of odef, and as a
    ** convenience also sets odefNum to the number of values reliably
    ** set in odef
    */
-     dopts->odefArr = airArrayNew (
+     opts->odefArr = airArrayNew (
-         (void**)(&dopts->odef),
+         (void**)(&opts->odef),
-         &dopts->odefNum,
+         &opts->odefNum,
          sizeof(opt_def_t*),
 /* allocation increment */);
-     if (dopts->odefArr == 0) {
+     if (opts->odefArr == 0) {
          fprintf(stderr, "%s: unable to allocate option array\n", me);
          exit(1);
      }
-Line 130
+Line 135
    ** elements I of odef, and will call optDefNix(odef[I]) for
    ** elements of odef that are about to be freed
    */
-     airArrayPointerCB (dopts->odefArr, OptDefNew, optDefNix);
+     airArrayPointerCB (opts->odefArr, OptDefNew, optDefNix);
-     airMopAdd (dopts->mop, dopts->odefArr, (airMopper)airArrayNuke, airMopAlways);
+     airMopAdd (opts->mop, opts->odefArr, (airMopper)airArrayNuke, airMopAlways);
+   // register standard command-line options
+     Diderot_OptAddFlag (opts, "verbose", "enable runtime-system messages", &VerboseFlg);
+     Diderot_OptAddFlag (opts, "timing", "enable execution timing", &TimingFlg);
+     Diderot_OptAddFlag (opts, "nrrd", "enable nrrd output", &NrrdOutputFlg);
-     return dopts;
+     return opts;
  }
  /*! free everything associated with a Diderot_Options_t
-Line 267
+Line 277
  {
      char buf[AIR_STRLEN_HUGE] = "";
      if (hasDflt) {
-         sprintf(buf, "%ld", (long)*v);
+         snprintf(buf, sizeof(buf), "%ld", (long)*v);
      }
      opt_def_t *odf = OptAdd(dopts, name, desc, (void*)v, optTypeInt);
      hestOptAdd (
-Line 288
+Line 298
  {
      char buf[AIR_STRLEN_HUGE] = "";
      if (hasDflt) {
-         sprintf(buf, "%lf", (double)*v);
+         snprintf(buf, sizeof(buf), "%lf", (double)*v);
      }
      opt_def_t *odf = OptAdd(dopts, name, desc, (void*)v, optTypeReal);
      hestOptAdd (
-Line 312
+Line 322
      if (hasDflt) {
          Diderot_union2_t u;
          u.v = *v;
-         sprintf(buf, "%lf %lf", (double)(u.r[0]), (double)(u.r[1]));
+         snprintf(buf, sizeof(buf), "%lf %lf", (double)(u.r[0]), (double)(u.r[1]));
      }
      opt_def_t *odf = OptAdd(dopts, name, desc, (void*)v, optTypeReal2);
      hestOptAdd (
-Line 336
+Line 346
      if (hasDflt) {
          Diderot_union3_t u;
          u.v = *v;
-         sprintf(buf, "%lf %lf %lf",
+         snprintf(buf, sizeof(buf), "%lf %lf %lf",
                  (double)(u.r[0]), (double)(u.r[1]), (double)(u.r[2]));
      }
      opt_def_t *odf = OptAdd(dopts, name, desc, (void*)v, optTypeReal3);
-Line 362
+Line 372
      if (hasDflt) {
          Diderot_union4_t u;
          u.v = *v;
-         sprintf(buf, "%lf %lf %lf %lf",
+         snprintf(buf, sizeof(buf), "%lf %lf %lf %lf",
              (double)(u.r[0]), (double)(u.r[1]),
              (double)(u.r[2]), (double)(u.r[3]));
      }

 Legend:



Removed from v.1670
 


changed lines


 
Added in v.1671
 Legend:



Removed from v.1670
 


changed lines


 
Added in v.1671
-Removed from v.1670
+Added in v.1671

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0