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/lib/annoGratorQuery.c src/lib/annoGratorQuery.c index 1e2332a..17145fd 100644 --- src/lib/annoGratorQuery.c +++ src/lib/annoGratorQuery.c @@ -131,31 +131,30 @@ annoRowFreeList((struct annoRow **)&(oneRowList->val), slCount(grator->asObj->columnList)); slFreeList(&oneRowList); } } void annoGratorQueryFree(struct annoGratorQuery **pQuery) /* Close and free all inputs and outputs; free self. */ { if (pQuery == NULL) return; struct annoGratorQuery *query = *pQuery; freez(&(query->assemblyName)); if (query->csAllocdHere) hashFree(&(query->chromSizes)); -twoBitClose(&(query->tbf)); query->primarySource->close(&(query->primarySource)); struct annoStreamer *grator = (struct annoStreamer *)(query->integrators), *nextGrator; for (; grator != NULL; grator = nextGrator) { nextGrator = grator->next; grator->close(&grator); } struct annoFormatter *formatter, *nextFormatter; for (formatter = query->formatters; formatter != NULL; formatter = nextFormatter) { nextFormatter = formatter->next; formatter->close(&formatter); } freez(pQuery); }