ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/eplus_idf.h
(Generate patch)

Comparing ray/src/util/eplus_idf.h (file contents):
Revision 2.3 by greg, Sun Feb 9 02:18:16 2014 UTC vs.
Revision 2.6 by greg, Mon Feb 10 04:51:26 2014 UTC

# Line 23 | Line 23 | extern "C" {
23   typedef struct s_idf_field {
24          struct s_idf_field      *next;          /* next in parameter list */
25          char                    *rem;           /* string following argument */
26 <        char                    arg[2];         /* argument (extends struct) */
26 >        char                    val[2];         /* value (extends struct) */
27   } IDF_FIELD;
28  
29   /* Input Data File parameter */
# Line 31 | Line 31 | typedef struct s_idf_parameter {
31          const char              *pname;         /* parameter name (type) */
32          struct s_idf_parameter  *pnext;         /* next parameter same type */
33          struct s_idf_parameter  *dnext;         /* next parameter in IDF */
34 +        int                     nfield;         /* field count */
35          IDF_FIELD               *flist;         /* field list */
36          char                    rem[1];         /* comment (extends struct) */
37   } IDF_PARAMETER;
# Line 54 | Line 55 | extern int             idf_addfield(IDF_PARAMETER *param, const c
55   /* Retrieve the indexed field from parameter (first field index is 1) */
56   extern IDF_FIELD        *idf_getfield(IDF_PARAMETER *param, int fn);
57  
58 < /* Delete the specified parameter from our IDF */
58 > /* Delete the specified parameter from the IDF */
59   extern int              idf_delparam(IDF_LOADED *idf, IDF_PARAMETER *param);
60  
61 + /* Move the specified parameter to the given position in the IDF */
62 + extern int              idf_movparam(IDF_LOADED *idf, IDF_PARAMETER *param,
63 +                                                IDF_PARAMETER *prev);
64 +
65   /* Get a named parameter list */
66   extern IDF_PARAMETER    *idf_getparam(IDF_LOADED *idf, const char *pname);
67  
# Line 66 | Line 71 | extern IDF_PARAMETER   *idf_readparam(IDF_LOADED *idf, F
71   /* Initialize an IDF struct */
72   extern IDF_LOADED       *idf_create(const char *hdrcomm);
73  
74 + /* Add comment(s) to header */
75 + extern int              idf_add2hdr(IDF_LOADED *idf, const char *hdrcomm);
76 +
77   /* Load an Input Data File */
78   extern IDF_LOADED       *idf_load(const char *fname);
79  
80   /* Write a parameter and fields to an open file */
81 < int                     idf_writeparam(IDF_PARAMETER *param, FILE *fp);
81 > int                     idf_writeparam(IDF_PARAMETER *param, FILE *fp,
82 >                                        int incl_comm);
83  
84   /* Write out an Input Data File */
85 < extern int              idf_write(IDF_LOADED *idf, const char *fname);
85 > extern int              idf_write(IDF_LOADED *idf, const char *fname,
86 >                                        int incl_comm);
87  
88   /* Free a loaded IDF */
89   extern void             idf_free(IDF_LOADED *idf);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines