Changeset 1313
- Timestamp:
- Jul 28, 2004, 1:50:56 PM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 3 edited
-
astronomy/psMetadata.h (modified) (12 diffs)
-
collections/psMetadata.h (modified) (12 diffs)
-
types/psMetadata.h (modified) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astronomy/psMetadata.h
r1289 r1313 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-07-2 3 18:52:05$12 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-07-28 23:50:56 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii 16 16 */ 17 # ifndef PS_METADATA_H 18 # define PS_METADATA_H 19 20 #include "psType.h" 21 #include "psList.h" 22 #include "psHash.h" 17 #ifndef PS_METADATA_H 18 #define PS_METADATA_H 19 23 20 24 21 /// @addtogroup Metadata 25 22 /// @{ 23 24 /** Maximum length of time string */ 25 #define MAX_STRING_LENGTH 256 26 26 27 27 /** Metadata item type. … … 36 36 PS_META_STR, ///< String data (Stored in as void *). 37 37 PS_META_IMG, ///< Image data (Stored in as void *). 38 PS_META_JP G,///< JPEG data (Stored in as void .38 PS_META_JPEG, ///< JPEG data (Stored in as void . 39 39 PS_META_PNG, ///< PNG data (Stored in as void *). 40 40 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). … … 43 43 } psMetadataType; 44 44 45 /** Metadata item flags.46 *47 * Enumeration for maintaining optional metadata item flags.48 */49 typedef enum {50 PS_META_TYPE_MASK = 0xffff, ///< Mask to hold metadata type enum.51 PS_META_UNIQUE = 0x10000, ///< Metadata item name is unique (default).52 PS_META_NON_UNIQUE = 0x20000 ///< Metadata item name may be repeated.53 }psMetadataFlags;54 55 45 /** Metadata item data structure. 56 46 * … … 63 53 char *restrict name; ///< Name of metadata item. 64 54 psMetadataType type; ///< Type of metadata item. 65 psMetadataFlags flags; ///< Flags associated with metadata item 66 const union 55 union 67 56 { 68 57 psS32 S32; ///< Signed 32-bit integer data. … … 70 59 psF64 F64; ///< Double-precision float data. 71 60 psPTR V; ///< Pointer to other type of data. 72 } 73 data; ///< Union for data types. 61 }data; ///< Union for data types. 74 62 char *comment; ///< Optional comment ("", not NULL). 75 63 psList *restrict items; ///< List of psMetadataItems with same name. … … 86 74 { 87 75 psList *restrict list; 88 ps List*restrict table;76 psHash *restrict table; 89 77 } 90 78 psMetadata; … … 110 98 psMetadataItem *psMetadataItemAlloc( 111 99 const char *name, ///< Name of metadata item. 112 int format, ///< Binary OR combination of metadata type and metadata flag.100 psMetadataType type, ///< Type of metadata item. 113 101 const char *comment, ///< Comment for metadata item. 114 102 ... ///< Arguments for name formatting and metadata item data. … … 130 118 psMetadataItem *psMetadataItemAllocV( 131 119 const char *name, ///< Name of metadata item. 132 int format, ///< Binary OR combination of metadata type and metadata flag.120 psMetadataType type, ///< Type of metadata item. 133 121 const char *comment, ///< Comment for metadata item. 134 122 va_list list ///< Arguments for name formatting and metadata item data. … … 151 139 * @return bool: True for success, false for failure. 152 140 */ 153 bool *psMetadataAddItem(141 bool psMetadataAddItem( 154 142 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 155 143 int where, ///< Location to be added. … … 163 151 * @return bool: True for success, false for failure. 164 152 */ 165 bool *psMetadataAdd(153 bool psMetadataAdd( 166 154 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 167 155 int where, ///< Location to be added. 168 156 const char *name, ///< Name of metadata item. 169 int format, ///< Binary OR combination of metadata type and metadata flag.157 psMetadataType type, ///< Type of metadata item. 170 158 const char *comment, ///< Comment for metadata item. 171 159 ... ///< Arguments for name formatting and metadata item data. … … 181 169 * @return bool: True for success, false for failure. 182 170 */ 183 bool *psMetadataRemove(171 bool psMetadataRemove( 184 172 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 185 173 int where, ///< Location to be removed. … … 257 245 void psMetadataItemPrint( 258 246 FILE *fd, ///< Pointer to file to write metadata item. 259 const char *format, ///< Format to print metadat item.247 const char *format, ///< Format to print metadata item. 260 248 const psMetadataItem *restrict md ///< Metadata item to print. 261 249 ); -
trunk/psLib/src/collections/psMetadata.h
r1289 r1313 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-07-2 3 18:52:05$12 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-07-28 23:50:56 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii 16 16 */ 17 # ifndef PS_METADATA_H 18 # define PS_METADATA_H 19 20 #include "psType.h" 21 #include "psList.h" 22 #include "psHash.h" 17 #ifndef PS_METADATA_H 18 #define PS_METADATA_H 19 23 20 24 21 /// @addtogroup Metadata 25 22 /// @{ 23 24 /** Maximum length of time string */ 25 #define MAX_STRING_LENGTH 256 26 26 27 27 /** Metadata item type. … … 36 36 PS_META_STR, ///< String data (Stored in as void *). 37 37 PS_META_IMG, ///< Image data (Stored in as void *). 38 PS_META_JP G,///< JPEG data (Stored in as void .38 PS_META_JPEG, ///< JPEG data (Stored in as void . 39 39 PS_META_PNG, ///< PNG data (Stored in as void *). 40 40 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). … … 43 43 } psMetadataType; 44 44 45 /** Metadata item flags.46 *47 * Enumeration for maintaining optional metadata item flags.48 */49 typedef enum {50 PS_META_TYPE_MASK = 0xffff, ///< Mask to hold metadata type enum.51 PS_META_UNIQUE = 0x10000, ///< Metadata item name is unique (default).52 PS_META_NON_UNIQUE = 0x20000 ///< Metadata item name may be repeated.53 }psMetadataFlags;54 55 45 /** Metadata item data structure. 56 46 * … … 63 53 char *restrict name; ///< Name of metadata item. 64 54 psMetadataType type; ///< Type of metadata item. 65 psMetadataFlags flags; ///< Flags associated with metadata item 66 const union 55 union 67 56 { 68 57 psS32 S32; ///< Signed 32-bit integer data. … … 70 59 psF64 F64; ///< Double-precision float data. 71 60 psPTR V; ///< Pointer to other type of data. 72 } 73 data; ///< Union for data types. 61 }data; ///< Union for data types. 74 62 char *comment; ///< Optional comment ("", not NULL). 75 63 psList *restrict items; ///< List of psMetadataItems with same name. … … 86 74 { 87 75 psList *restrict list; 88 ps List*restrict table;76 psHash *restrict table; 89 77 } 90 78 psMetadata; … … 110 98 psMetadataItem *psMetadataItemAlloc( 111 99 const char *name, ///< Name of metadata item. 112 int format, ///< Binary OR combination of metadata type and metadata flag.100 psMetadataType type, ///< Type of metadata item. 113 101 const char *comment, ///< Comment for metadata item. 114 102 ... ///< Arguments for name formatting and metadata item data. … … 130 118 psMetadataItem *psMetadataItemAllocV( 131 119 const char *name, ///< Name of metadata item. 132 int format, ///< Binary OR combination of metadata type and metadata flag.120 psMetadataType type, ///< Type of metadata item. 133 121 const char *comment, ///< Comment for metadata item. 134 122 va_list list ///< Arguments for name formatting and metadata item data. … … 151 139 * @return bool: True for success, false for failure. 152 140 */ 153 bool *psMetadataAddItem(141 bool psMetadataAddItem( 154 142 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 155 143 int where, ///< Location to be added. … … 163 151 * @return bool: True for success, false for failure. 164 152 */ 165 bool *psMetadataAdd(153 bool psMetadataAdd( 166 154 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 167 155 int where, ///< Location to be added. 168 156 const char *name, ///< Name of metadata item. 169 int format, ///< Binary OR combination of metadata type and metadata flag.157 psMetadataType type, ///< Type of metadata item. 170 158 const char *comment, ///< Comment for metadata item. 171 159 ... ///< Arguments for name formatting and metadata item data. … … 181 169 * @return bool: True for success, false for failure. 182 170 */ 183 bool *psMetadataRemove(171 bool psMetadataRemove( 184 172 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 185 173 int where, ///< Location to be removed. … … 257 245 void psMetadataItemPrint( 258 246 FILE *fd, ///< Pointer to file to write metadata item. 259 const char *format, ///< Format to print metadat item.247 const char *format, ///< Format to print metadata item. 260 248 const psMetadataItem *restrict md ///< Metadata item to print. 261 249 ); -
trunk/psLib/src/types/psMetadata.h
r1289 r1313 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-07-2 3 18:52:05$12 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-07-28 23:50:56 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii 16 16 */ 17 # ifndef PS_METADATA_H 18 # define PS_METADATA_H 19 20 #include "psType.h" 21 #include "psList.h" 22 #include "psHash.h" 17 #ifndef PS_METADATA_H 18 #define PS_METADATA_H 19 23 20 24 21 /// @addtogroup Metadata 25 22 /// @{ 23 24 /** Maximum length of time string */ 25 #define MAX_STRING_LENGTH 256 26 26 27 27 /** Metadata item type. … … 36 36 PS_META_STR, ///< String data (Stored in as void *). 37 37 PS_META_IMG, ///< Image data (Stored in as void *). 38 PS_META_JP G,///< JPEG data (Stored in as void .38 PS_META_JPEG, ///< JPEG data (Stored in as void . 39 39 PS_META_PNG, ///< PNG data (Stored in as void *). 40 40 PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). … … 43 43 } psMetadataType; 44 44 45 /** Metadata item flags.46 *47 * Enumeration for maintaining optional metadata item flags.48 */49 typedef enum {50 PS_META_TYPE_MASK = 0xffff, ///< Mask to hold metadata type enum.51 PS_META_UNIQUE = 0x10000, ///< Metadata item name is unique (default).52 PS_META_NON_UNIQUE = 0x20000 ///< Metadata item name may be repeated.53 }psMetadataFlags;54 55 45 /** Metadata item data structure. 56 46 * … … 63 53 char *restrict name; ///< Name of metadata item. 64 54 psMetadataType type; ///< Type of metadata item. 65 psMetadataFlags flags; ///< Flags associated with metadata item 66 const union 55 union 67 56 { 68 57 psS32 S32; ///< Signed 32-bit integer data. … … 70 59 psF64 F64; ///< Double-precision float data. 71 60 psPTR V; ///< Pointer to other type of data. 72 } 73 data; ///< Union for data types. 61 }data; ///< Union for data types. 74 62 char *comment; ///< Optional comment ("", not NULL). 75 63 psList *restrict items; ///< List of psMetadataItems with same name. … … 86 74 { 87 75 psList *restrict list; 88 ps List*restrict table;76 psHash *restrict table; 89 77 } 90 78 psMetadata; … … 110 98 psMetadataItem *psMetadataItemAlloc( 111 99 const char *name, ///< Name of metadata item. 112 int format, ///< Binary OR combination of metadata type and metadata flag.100 psMetadataType type, ///< Type of metadata item. 113 101 const char *comment, ///< Comment for metadata item. 114 102 ... ///< Arguments for name formatting and metadata item data. … … 130 118 psMetadataItem *psMetadataItemAllocV( 131 119 const char *name, ///< Name of metadata item. 132 int format, ///< Binary OR combination of metadata type and metadata flag.120 psMetadataType type, ///< Type of metadata item. 133 121 const char *comment, ///< Comment for metadata item. 134 122 va_list list ///< Arguments for name formatting and metadata item data. … … 151 139 * @return bool: True for success, false for failure. 152 140 */ 153 bool *psMetadataAddItem(141 bool psMetadataAddItem( 154 142 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 155 143 int where, ///< Location to be added. … … 163 151 * @return bool: True for success, false for failure. 164 152 */ 165 bool *psMetadataAdd(153 bool psMetadataAdd( 166 154 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 167 155 int where, ///< Location to be added. 168 156 const char *name, ///< Name of metadata item. 169 int format, ///< Binary OR combination of metadata type and metadata flag.157 psMetadataType type, ///< Type of metadata item. 170 158 const char *comment, ///< Comment for metadata item. 171 159 ... ///< Arguments for name formatting and metadata item data. … … 181 169 * @return bool: True for success, false for failure. 182 170 */ 183 bool *psMetadataRemove(171 bool psMetadataRemove( 184 172 psMetadata *restrict md, ///< Metadata collection to insert metadat item. 185 173 int where, ///< Location to be removed. … … 257 245 void psMetadataItemPrint( 258 246 FILE *fd, ///< Pointer to file to write metadata item. 259 const char *format, ///< Format to print metadat item.247 const char *format, ///< Format to print metadata item. 260 248 const psMetadataItem *restrict md ///< Metadata item to print. 261 249 );
Note:
See TracChangeset
for help on using the changeset viewer.
