Changeset 1378
- Timestamp:
- Aug 4, 2004, 10:59:30 AM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 3 edited
-
astronomy/psMetadata.h (modified) (15 diffs)
-
collections/psMetadata.h (modified) (17 diffs)
-
types/psMetadata.h (modified) (17 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psMetadata.h
r1377 r1378 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 8$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-08-04 20:59: 04$12 * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-08-04 20:59:30 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 33 33 */ 34 34 typedef enum { 35 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items36 PS_META_BOOL, ///< Boolean data.37 PS_META_S32, ///< Signed 32-bit integer data.38 PS_META_F32, ///< Single-precision float data.39 PS_META_F64, ///< Double-precision float data.40 PS_META_STR, ///< String data (Stored in as void *).41 PS_META_IMG, ///< Image data (Stored in as void *).42 PS_META_JPEG, ///< JPEG data (Stored in as void .43 PS_META_PNG, ///< PNG data (Stored in as void *).44 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *).45 PS_META_UNKNOWN, ///< Other data (Stored in as void *).46 PS_META_NTYPE ///< Number of types. Must be last.35 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items 36 PS_META_BOOL, ///< Boolean data. 37 PS_META_S32, ///< Signed 32-bit integer data. 38 PS_META_F32, ///< Single-precision float data. 39 PS_META_F64, ///< Double-precision float data. 40 PS_META_STR, ///< String data (Stored in as void *). 41 PS_META_IMG, ///< Image data (Stored in as void *). 42 PS_META_JPEG, ///< JPEG data (Stored in as void . 43 PS_META_PNG, ///< PNG data (Stored in as void *). 44 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). 45 PS_META_UNKNOWN, ///< Other data (Stored in as void *). 46 PS_META_NTYPE ///< Number of types. Must be last. 47 47 } psMetadataType; 48 48 … … 102 102 */ 103 103 psMetadataItem *psMetadataItemAlloc( 104 const char *name, ///< Name of metadata item.105 psMetadataType type, ///< Type of metadata item.106 const char *comment, ///< Comment for metadata item.104 const char *name, ///< Name of metadata item. 105 psMetadataType type, ///< Type of metadata item. 106 const char *comment, ///< Comment for metadata item. 107 107 ... ///< Arguments for name formatting and metadata item data. 108 108 ); … … 122 122 */ 123 123 psMetadataItem *psMetadataItemAllocV( 124 const char *name, ///< Name of metadata item.125 psMetadataType type, ///< Type of metadata item.126 const char *comment, ///< Comment for metadata item.124 const char *name, ///< Name of metadata item. 125 psMetadataType type, ///< Type of metadata item. 126 const char *comment, ///< Comment for metadata item. 127 127 va_list list ///< Arguments for name formatting and metadata item data. 128 128 ); … … 145 145 */ 146 146 bool psMetadataAddItem( 147 psMetadata *restrict md, ///< Metadata collection to insert metadat item.148 int where, ///< Location to be added.147 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 148 int where, ///< Location to be added. 149 149 psMetadataItem *restrict item ///< Metadata item to be added. 150 150 ); … … 157 157 */ 158 158 bool psMetadataAdd( 159 psMetadata *restrict md, ///< Metadata collection to insert metadat item.160 int where, ///< Location to be added.161 const char *name, ///< Name of metadata item.162 psMetadataType type, ///< Type of metadata item.163 const char *comment, ///< Comment for metadata item.159 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 160 int where, ///< Location to be added. 161 const char *name, ///< Name of metadata item. 162 psMetadataType type, ///< Type of metadata item. 163 const char *comment, ///< Comment for metadata item. 164 164 ... ///< Arguments for name formatting and metadata item data. 165 165 ); … … 175 175 */ 176 176 bool psMetadataRemove( 177 psMetadata *restrict md, ///< Metadata collection to insert metadat item.178 int where, ///< Location to be removed.177 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 178 int where, ///< Location to be removed. 179 179 const char *restrict key ///< Name of metadata key. 180 180 ); … … 188 188 */ 189 189 psMetadataItem *psMetadataLookup( 190 psMetadata *restrict md, ///< Metadata collection to insert metadat item.190 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 191 191 const char *restrict key ///< Name of metadata key. 192 192 ); … … 199 199 */ 200 200 psMetadataItem *psMetadataGet( 201 psMetadata *restrict md, ///< Metadata collection to insert metadat item.201 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 202 202 int where ///< Location to be retrieved. 203 203 ); … … 210 210 */ 211 211 bool psMetadataSetIterator( 212 psMetadata *restrict md, ///< Metadata collection to iterate.212 psMetadata *restrict md, ///< Metadata collection to iterate. 213 213 int where ///< Location of iterator. 214 214 ); … … 221 221 */ 222 222 psMetadataItem *psMetadataGetNext( 223 psMetadata *restrict md, ///< Metadata collection to iterate.224 const char *restrict match, ///< Beginning of key name.223 psMetadata *restrict md, ///< Metadata collection to iterate. 224 const char *restrict match, ///< Beginning of key name. 225 225 int which ///< Iterator to be used. 226 226 ); … … 233 233 */ 234 234 psMetadataItem *psMetadataGetPrevious( 235 psMetadata *restrict md, ///< Metadata collection to iterate.236 const char *restrict match, ///< Beginning of key name.235 psMetadata *restrict md, ///< Metadata collection to iterate. 236 const char *restrict match, ///< Beginning of key name. 237 237 int which ///< Iterator to be used. 238 238 ); … … 249 249 */ 250 250 void psMetadataItemPrint( 251 FILE *fd, ///< Pointer to file to write metadata item.252 const char *format, ///< Format to print metadata item.251 FILE *fd, ///< Pointer to file to write metadata item. 252 const char *format, ///< Format to print metadata item. 253 253 const psMetadataItem *restrict metadataItem ///< Metadata item to print. 254 254 ); … … 261 261 */ 262 262 psMetadata *psMetadataReadHeader( 263 psMetadata *output, ///< Resulting metadata from read.264 const char *extname, ///< File name extension string.265 int extnum, ///< File name extension number.263 psMetadata *output, ///< Resulting metadata from read. 264 const char *extname, ///< File name extension string. 265 int extnum, ///< File name extension number. 266 266 const char *filename ///< Name of file to read. 267 267 ); … … 274 274 */ 275 275 psMetadata *psMetadataFReadHeader( 276 psMetadata *output, ///< Resulting metadata from read.277 const char *extname, ///< File name extension string.278 int extnum, ///< File name extension number.276 psMetadata *output, ///< Resulting metadata from read. 277 const char *extname, ///< File name extension string. 278 int extnum, ///< File name extension number. 279 279 fitsfile *fd ///< Pointer to file to read. 280 280 ); -
trunk/psLib/src/collections/psMetadata.h
r1374 r1378 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-08-04 00:55:17$12 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-08-04 20:59:04 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 18 18 #define PS_METADATA_H 19 19 20 20 21 /// @addtogroup Metadata 21 22 /// @{ 22 23 23 /** Maximum length of time string */ 24 #define MAX_STRING_LENGTH 256 24 /** Maximum length of string */ 25 #define MAX_STRING_LENGTH 1024 26 27 /** Maximum length of FITS line */ 28 #define FITS_LINE_SIZE 80 25 29 26 30 /** Metadata item type. … … 29 33 */ 30 34 typedef enum { 31 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items 32 PS_META_S32, ///< Signed 32-bit integer data. 33 PS_META_F32, ///< Single-precision float data. 34 PS_META_F64, ///< Double-precision float data. 35 PS_META_STR, ///< String data (Stored in as void *). 36 PS_META_IMG, ///< Image data (Stored in as void *). 37 PS_META_JPEG, ///< JPEG data (Stored in as void . 38 PS_META_PNG, ///< PNG data (Stored in as void *). 39 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). 40 PS_META_UNKNOWN, ///< Other data (Stored in as void *). 35 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items 36 PS_META_BOOL, ///< Boolean data. 37 PS_META_S32, ///< Signed 32-bit integer data. 38 PS_META_F32, ///< Single-precision float data. 39 PS_META_F64, ///< Double-precision float data. 40 PS_META_STR, ///< String data (Stored in as void *). 41 PS_META_IMG, ///< Image data (Stored in as void *). 42 PS_META_JPEG, ///< JPEG data (Stored in as void . 43 PS_META_PNG, ///< PNG data (Stored in as void *). 44 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). 45 PS_META_UNKNOWN, ///< Other data (Stored in as void *). 41 46 PS_META_NTYPE ///< Number of types. Must be last. 42 47 } psMetadataType; … … 54 59 union 55 60 { 56 psS32 S32; ///< Signed 32-bit integer data. 57 psF32 F32; ///< Single-precision float data. 58 psF64 F64; ///< Double-precision float data. 61 bool B; 62 psS32 S32; ///< Signed 32-bit integer data. 63 psF32 F32; ///< Single-precision float data. 64 psF64 F64; ///< Double-precision float data. 59 65 psPTR V; ///< Pointer to other type of data. 60 }data; 66 }data; ///< Union for data types. 61 67 char *comment; ///< Optional comment ("", not NULL). 62 68 psList *restrict items; ///< List of psMetadataItems with same name. … … 96 102 */ 97 103 psMetadataItem *psMetadataItemAlloc( 98 const char *name, 99 psMetadataType type, 100 const char *comment, 104 const char *name, ///< Name of metadata item. 105 psMetadataType type, ///< Type of metadata item. 106 const char *comment, ///< Comment for metadata item. 101 107 ... ///< Arguments for name formatting and metadata item data. 102 108 ); … … 116 122 */ 117 123 psMetadataItem *psMetadataItemAllocV( 118 const char *name, 119 psMetadataType type, 120 const char *comment, 124 const char *name, ///< Name of metadata item. 125 psMetadataType type, ///< Type of metadata item. 126 const char *comment, ///< Comment for metadata item. 121 127 va_list list ///< Arguments for name formatting and metadata item data. 122 128 ); … … 139 145 */ 140 146 bool psMetadataAddItem( 141 psMetadata *restrict md, 142 int where, 147 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 148 int where, ///< Location to be added. 143 149 psMetadataItem *restrict item ///< Metadata item to be added. 144 150 ); … … 151 157 */ 152 158 bool psMetadataAdd( 153 psMetadata *restrict md, 154 int where, 155 const char *name, 156 psMetadataType type, 157 const char *comment, 159 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 160 int where, ///< Location to be added. 161 const char *name, ///< Name of metadata item. 162 psMetadataType type, ///< Type of metadata item. 163 const char *comment, ///< Comment for metadata item. 158 164 ... ///< Arguments for name formatting and metadata item data. 159 165 ); … … 169 175 */ 170 176 bool psMetadataRemove( 171 psMetadata *restrict md, 172 int where, 177 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 178 int where, ///< Location to be removed. 173 179 const char *restrict key ///< Name of metadata key. 174 180 ); … … 182 188 */ 183 189 psMetadataItem *psMetadataLookup( 184 psMetadata *restrict md, 190 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 185 191 const char *restrict key ///< Name of metadata key. 186 192 ); … … 193 199 */ 194 200 psMetadataItem *psMetadataGet( 195 psMetadata *restrict md, 201 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 196 202 int where ///< Location to be retrieved. 197 203 ); … … 204 210 */ 205 211 bool psMetadataSetIterator( 206 psMetadata *restrict md, 212 psMetadata *restrict md, ///< Metadata collection to iterate. 207 213 int where ///< Location of iterator. 208 214 ); … … 215 221 */ 216 222 psMetadataItem *psMetadataGetNext( 217 psMetadata *restrict md, 218 const char *restrict match, 223 psMetadata *restrict md, ///< Metadata collection to iterate. 224 const char *restrict match, ///< Beginning of key name. 219 225 int which ///< Iterator to be used. 220 226 ); … … 227 233 */ 228 234 psMetadataItem *psMetadataGetPrevious( 229 psMetadata *restrict md, 230 const char *restrict match, 235 psMetadata *restrict md, ///< Metadata collection to iterate. 236 const char *restrict match, ///< Beginning of key name. 231 237 int which ///< Iterator to be used. 232 238 ); … … 243 249 */ 244 250 void psMetadataItemPrint( 245 FILE *fd, 246 const char *format, 251 FILE *fd, ///< Pointer to file to write metadata item. 252 const char *format, ///< Format to print metadata item. 247 253 const psMetadataItem *restrict metadataItem ///< Metadata item to print. 248 254 ); … … 255 261 */ 256 262 psMetadata *psMetadataReadHeader( 257 psMetadata *output, 258 const char *extname, 259 int extnum, 263 psMetadata *output, ///< Resulting metadata from read. 264 const char *extname, ///< File name extension string. 265 int extnum, ///< File name extension number. 260 266 const char *filename ///< Name of file to read. 261 267 ); … … 268 274 */ 269 275 psMetadata *psMetadataFReadHeader( 270 psMetadata *output, 271 const char *extname, 272 int extnum, 276 psMetadata *output, ///< Resulting metadata from read. 277 const char *extname, ///< File name extension string. 278 int extnum, ///< File name extension number. 273 279 fitsfile *fd ///< Pointer to file to read. 274 280 ); -
trunk/psLib/src/types/psMetadata.h
r1374 r1378 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-08-04 00:55:17$12 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-08-04 20:59:04 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 18 18 #define PS_METADATA_H 19 19 20 20 21 /// @addtogroup Metadata 21 22 /// @{ 22 23 23 /** Maximum length of time string */ 24 #define MAX_STRING_LENGTH 256 24 /** Maximum length of string */ 25 #define MAX_STRING_LENGTH 1024 26 27 /** Maximum length of FITS line */ 28 #define FITS_LINE_SIZE 80 25 29 26 30 /** Metadata item type. … … 29 33 */ 30 34 typedef enum { 31 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items 32 PS_META_S32, ///< Signed 32-bit integer data. 33 PS_META_F32, ///< Single-precision float data. 34 PS_META_F64, ///< Double-precision float data. 35 PS_META_STR, ///< String data (Stored in as void *). 36 PS_META_IMG, ///< Image data (Stored in as void *). 37 PS_META_JPEG, ///< JPEG data (Stored in as void . 38 PS_META_PNG, ///< PNG data (Stored in as void *). 39 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). 40 PS_META_UNKNOWN, ///< Other data (Stored in as void *). 35 PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items 36 PS_META_BOOL, ///< Boolean data. 37 PS_META_S32, ///< Signed 32-bit integer data. 38 PS_META_F32, ///< Single-precision float data. 39 PS_META_F64, ///< Double-precision float data. 40 PS_META_STR, ///< String data (Stored in as void *). 41 PS_META_IMG, ///< Image data (Stored in as void *). 42 PS_META_JPEG, ///< JPEG data (Stored in as void . 43 PS_META_PNG, ///< PNG data (Stored in as void *). 44 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). 45 PS_META_UNKNOWN, ///< Other data (Stored in as void *). 41 46 PS_META_NTYPE ///< Number of types. Must be last. 42 47 } psMetadataType; … … 54 59 union 55 60 { 56 psS32 S32; ///< Signed 32-bit integer data. 57 psF32 F32; ///< Single-precision float data. 58 psF64 F64; ///< Double-precision float data. 61 bool B; 62 psS32 S32; ///< Signed 32-bit integer data. 63 psF32 F32; ///< Single-precision float data. 64 psF64 F64; ///< Double-precision float data. 59 65 psPTR V; ///< Pointer to other type of data. 60 }data; 66 }data; ///< Union for data types. 61 67 char *comment; ///< Optional comment ("", not NULL). 62 68 psList *restrict items; ///< List of psMetadataItems with same name. … … 96 102 */ 97 103 psMetadataItem *psMetadataItemAlloc( 98 const char *name, 99 psMetadataType type, 100 const char *comment, 104 const char *name, ///< Name of metadata item. 105 psMetadataType type, ///< Type of metadata item. 106 const char *comment, ///< Comment for metadata item. 101 107 ... ///< Arguments for name formatting and metadata item data. 102 108 ); … … 116 122 */ 117 123 psMetadataItem *psMetadataItemAllocV( 118 const char *name, 119 psMetadataType type, 120 const char *comment, 124 const char *name, ///< Name of metadata item. 125 psMetadataType type, ///< Type of metadata item. 126 const char *comment, ///< Comment for metadata item. 121 127 va_list list ///< Arguments for name formatting and metadata item data. 122 128 ); … … 139 145 */ 140 146 bool psMetadataAddItem( 141 psMetadata *restrict md, 142 int where, 147 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 148 int where, ///< Location to be added. 143 149 psMetadataItem *restrict item ///< Metadata item to be added. 144 150 ); … … 151 157 */ 152 158 bool psMetadataAdd( 153 psMetadata *restrict md, 154 int where, 155 const char *name, 156 psMetadataType type, 157 const char *comment, 159 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 160 int where, ///< Location to be added. 161 const char *name, ///< Name of metadata item. 162 psMetadataType type, ///< Type of metadata item. 163 const char *comment, ///< Comment for metadata item. 158 164 ... ///< Arguments for name formatting and metadata item data. 159 165 ); … … 169 175 */ 170 176 bool psMetadataRemove( 171 psMetadata *restrict md, 172 int where, 177 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 178 int where, ///< Location to be removed. 173 179 const char *restrict key ///< Name of metadata key. 174 180 ); … … 182 188 */ 183 189 psMetadataItem *psMetadataLookup( 184 psMetadata *restrict md, 190 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 185 191 const char *restrict key ///< Name of metadata key. 186 192 ); … … 193 199 */ 194 200 psMetadataItem *psMetadataGet( 195 psMetadata *restrict md, 201 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 196 202 int where ///< Location to be retrieved. 197 203 ); … … 204 210 */ 205 211 bool psMetadataSetIterator( 206 psMetadata *restrict md, 212 psMetadata *restrict md, ///< Metadata collection to iterate. 207 213 int where ///< Location of iterator. 208 214 ); … … 215 221 */ 216 222 psMetadataItem *psMetadataGetNext( 217 psMetadata *restrict md, 218 const char *restrict match, 223 psMetadata *restrict md, ///< Metadata collection to iterate. 224 const char *restrict match, ///< Beginning of key name. 219 225 int which ///< Iterator to be used. 220 226 ); … … 227 233 */ 228 234 psMetadataItem *psMetadataGetPrevious( 229 psMetadata *restrict md, 230 const char *restrict match, 235 psMetadata *restrict md, ///< Metadata collection to iterate. 236 const char *restrict match, ///< Beginning of key name. 231 237 int which ///< Iterator to be used. 232 238 ); … … 243 249 */ 244 250 void psMetadataItemPrint( 245 FILE *fd, 246 const char *format, 251 FILE *fd, ///< Pointer to file to write metadata item. 252 const char *format, ///< Format to print metadata item. 247 253 const psMetadataItem *restrict metadataItem ///< Metadata item to print. 248 254 ); … … 255 261 */ 256 262 psMetadata *psMetadataReadHeader( 257 psMetadata *output, 258 const char *extname, 259 int extnum, 263 psMetadata *output, ///< Resulting metadata from read. 264 const char *extname, ///< File name extension string. 265 int extnum, ///< File name extension number. 260 266 const char *filename ///< Name of file to read. 261 267 ); … … 268 274 */ 269 275 psMetadata *psMetadataFReadHeader( 270 psMetadata *output, 271 const char *extname, 272 int extnum, 276 psMetadata *output, ///< Resulting metadata from read. 277 const char *extname, ///< File name extension string. 278 int extnum, ///< File name extension number. 273 279 fitsfile *fd ///< Pointer to file to read. 274 280 );
Note:
See TracChangeset
for help on using the changeset viewer.
