33990deeb6214328424d9acf9bfaf667ae8f3f4f angie Wed Mar 28 15:34:14 2012 -0700 Feature #6152 (Variant Annotation Tool): Added annoStreamWig and annoGrateWig,which led to some significant changes: annoRow is now polymorphic (words[] vs. wig float[]), annoFilter has a new function to apply filter(s) to a single number, and annoFormatTab can print out per-base wiggle values or average wiggle values (hardcoded to do per-base until a real config option is added). One puny test case was verified against mysql & table browser output. diff --git src/hg/inc/wiggle.h src/hg/inc/wiggle.h index 0ccc92f..8aa27d9 100644 --- src/hg/inc/wiggle.h +++ src/hg/inc/wiggle.h @@ -488,16 +488,35 @@ #define WIG_RETURN_DATA FALSE #define WIG_ALL_DATA FALSE void wigFreeData(struct wiggleData **wigData); /* free everything in the wiggleData structure */ #define wiggleDataFreeList(a) wigFreeData(a) int minSpan(struct sqlConnection *conn, char *table, char *chrom, int winStart, int winEnd, struct cart *cart, struct trackDb *tdb); /* determine minimum span in this area */ int spanInUse(struct sqlConnection *conn, char *table, char *chrom, int winStart, int winEnd, struct cart *cart); /* determine span used in drawing in hgTracks */ +#define wiggleAsText \ +"table wiggle\n" \ +"\"Wiggle track values to display as y-values (first 6 fields are bed6)\"\n" \ +" (\n" \ +" string chrom; \"Reference sequence chromosome or scaffold\"\n" \ +" uint chromStart; \"Start position in chromosome\"\n" \ +" uint chromEnd; \"End position in chromosome\"\n" \ +" string name; \"Name of item\"\n" \ +" uint span; \"each value spans this many bases\"\n" \ +" uint count; \"number of values in this block\"\n" \ +" uint offset; \"offset in File to fetch data\"\n" \ +" string file; \"path name to data file, one byte per value\"\n" \ +" double lowerLimit; \"lowest data value in this block\"\n" \ +" double dataRange; \"lowerLimit + dataRange = upperLimit\"\n" \ +" uint validCount; \"number of valid data values in this block\"\n" \ +" double sumData; \"sum of the data points, for average and stddev calc\"\n" \ +" double sumSquares; \"sum of data points squared, for stddev calc\"\n" \ +" )\n" + #endif /* WIGGLE_H */