Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 1407) +++ trunk/psLib/src/collections/psMetadata.h (revision 1426) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 22:44:25 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,16 +34,16 @@ */ typedef enum { - PS_META_ITEM_SET = 0, // /< Null. Metadata is in psMetadataItem.items - PS_META_BOOL, // /< Boolean data. - PS_META_S32, // /< Signed 32-bit integer data. - PS_META_F32, // /< Single-precision float data. - PS_META_F64, // /< Double-precision float data. - PS_META_STR, // /< String data (Stored in as void *). - PS_META_IMG, // /< Image data (Stored in as void *). - PS_META_JPEG, // /< JPEG data (Stored in as void . - PS_META_PNG, // /< PNG data (Stored in as void *). - PS_META_ASTROM, // /< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, // /< Other data (Stored in as void *). - PS_META_NTYPE // /< Number of types. Must be last. + PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items + PS_META_BOOL, ///< Boolean data. + PS_META_S32, ///< Signed 32-bit integer data. + PS_META_F32, ///< Single-precision float data. + PS_META_F64, ///< Double-precision float data. + PS_META_STR, ///< String data (Stored in as void *). + PS_META_IMG, ///< Image data (Stored in as void *). + PS_META_JPEG, ///< JPEG data (Stored in as void . + PS_META_PNG, ///< PNG data (Stored in as void *). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). + PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -55,16 +55,16 @@ typedef struct psMetadataItem { - const int id; // /< Unique ID for metadata item. - char *restrict name; // /< Name of metadata item. - psMetadataType type; // /< Type of metadata item. + const int id; ///< Unique ID for metadata item. + char *restrict name; ///< Name of metadata item. + psMetadataType type; ///< Type of metadata item. union { bool B; - psS32 S32; // /< Signed 32-bit integer data. - psF32 F32; // /< Single-precision float data. - psF64 F64; // /< Double-precision float data. - psPTR V; // /< Pointer to other type of data. - } data; // /< Union for data types. - char *comment; // /< Optional comment ("", not NULL). - psList *restrict items; // /< List of psMetadataItems with same name. + psS32 S32; ///< Signed 32-bit integer data. + psF32 F32; ///< Single-precision float data. + psF64 F64; ///< Double-precision float data. + psPTR V; ///< Pointer to other type of data. + } data; ///< Union for data types. + char *comment; ///< Optional comment ("", not NULL). + psList *restrict items; ///< List of psMetadataItems with same name. } psMetadataItem; @@ -102,8 +102,8 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataItemAlloc(const char *name, // /< Name of metadata item. - psMetadataType type, // /< Type of metadata item. - const char *comment, // /< Comment for metadata item. - ... // /< Arguments for name formatting and metadata item data. +psMetadataItem *psMetadataItemAlloc(const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. + ... ///< Arguments for name formatting and metadata item data. ); @@ -121,8 +121,8 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataItemAllocV(const char *name, // /< Name of metadata item. - psMetadataType type, // /< Type of metadata item. - const char *comment, // /< Comment for metadata item. - va_list list // /< Arguments for name formatting and metadata item +psMetadataItem *psMetadataItemAllocV(const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. + va_list list ///< Arguments for name formatting and metadata item // data. ); @@ -134,5 +134,5 @@ * @return psMetadata*: Pointer metadata. */ -psMetadata *psMetadataAlloc(void // /< Void. +psMetadata *psMetadataAlloc(void ///< Void. ); @@ -143,7 +143,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem(psMetadata * restrict md, // /< Metadata collection to insert metadat item. - int where, // /< Location to be added. - psMetadataItem * restrict item // /< Metadata item to be added. +bool psMetadataAddItem(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be added. + psMetadataItem * restrict item ///< Metadata item to be added. ); @@ -154,10 +154,10 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd(psMetadata * restrict md, // /< Metadata collection to insert metadat item. - int where, // /< Location to be added. - const char *name, // /< Name of metadata item. - psMetadataType type, // /< Type of metadata item. - const char *comment, // /< Comment for metadata item. - ... // /< Arguments for name formatting and metadata item data. +bool psMetadataAdd(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be added. + const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. + ... ///< Arguments for name formatting and metadata item data. ); @@ -171,7 +171,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove(psMetadata * restrict md, // /< Metadata collection to insert metadat item. - int where, // /< Location to be removed. - const char *restrict key // /< Name of metadata key. +bool psMetadataRemove(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be removed. + const char *restrict key ///< Name of metadata key. ); @@ -183,7 +183,7 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataLookup(psMetadata * restrict md, // /< Metadata collection to insert metadat +psMetadataItem *psMetadataLookup(psMetadata * restrict md, ///< Metadata collection to insert metadat // item. - const char *restrict key // /< Name of metadata key. + const char *restrict key ///< Name of metadata key. ); @@ -194,6 +194,6 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataGet(psMetadata * restrict md, // /< Metadata collection to insert metadat item. - int where // /< Location to be retrieved. +psMetadataItem *psMetadataGet(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + int where ///< Location to be retrieved. ); @@ -204,6 +204,6 @@ * @return void: void. */ -bool psMetadataSetIterator(psMetadata * restrict md, // /< Metadata collection to iterate. - int where // /< Location of iterator. +bool psMetadataSetIterator(psMetadata * restrict md, ///< Metadata collection to iterate. + int where ///< Location of iterator. ); @@ -214,7 +214,7 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, // /< Metadata collection to iterate. - const char *restrict match, // /< Beginning of key name. - int which // /< Iterator to be used. +psMetadataItem *psMetadataGetNext(psMetadata * restrict md, ///< Metadata collection to iterate. + const char *restrict match, ///< Beginning of key name. + int which ///< Iterator to be used. ); @@ -225,7 +225,7 @@ * @return psMetadataItem*: Pointer metadata item. */ -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, // /< Metadata collection to iterate. - const char *restrict match, // /< Beginning of key name. - int which // /< Iterator to be used. +psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, ///< Metadata collection to iterate. + const char *restrict match, ///< Beginning of key name. + int which ///< Iterator to be used. ); @@ -240,7 +240,7 @@ * @return psMetadataItem*: Pointer metadata item. */ -void psMetadataItemPrint(FILE * fd, // /< Pointer to file to write metadata item. - const char *format, // /< Format to print metadata item. - const psMetadataItem * restrict metadataItem // /< Metadata item to print. +void psMetadataItemPrint(FILE * fd, ///< Pointer to file to write metadata item. + const char *format, ///< Format to print metadata item. + const psMetadataItem * restrict metadataItem ///< Metadata item to print. ); @@ -252,8 +252,8 @@ * @return psMetadata*: Pointer metadata. */ -psMetadata *psMetadataReadHeader(psMetadata * output, // /< Resulting metadata from read. - char *extname, // /< File name extension string. - int extnum, // /< File name extension number. Starts at 1. - char *filename // /< Name of file to read. +psMetadata *psMetadataReadHeader(psMetadata * output, ///< Resulting metadata from read. + char *extname, ///< File name extension string. + int extnum, ///< File name extension number. Starts at 1. + char *filename ///< Name of file to read. ); @@ -264,8 +264,8 @@ * @return psMetadata*: Pointer metadata. */ -psMetadata *psMetadataFReadHeader(psMetadata * output, // /< Resulting metadata from read. - char *extName, // /< File name extension string. - int extNum, // /< File name extension number. - fitsfile * fd // /< Pointer to file to read. +psMetadata *psMetadataFReadHeader(psMetadata * output, ///< Resulting metadata from read. + char *extName, ///< File name extension string. + int extNum, ///< File name extension number. + fitsfile * fd ///< Pointer to file to read. );