85be21057a058a0bdb12caac2bae553376442f5a angie Mon Apr 15 10:56:28 2013 -0700 Refactoring to remove dependencies on annoGratorQuery from streamers,grators and formatters. Instead, provide basic assembly info and explicitly pass streamers(/grators) along with the rows that they produced into formatters. ref #6152 diff --git src/lib/annoGrateWig.c src/lib/annoGrateWig.c index bafc248..f916fc7 100644 --- src/lib/annoGrateWig.c +++ src/lib/annoGrateWig.c @@ -88,21 +88,21 @@ struct annoGrator *annoGrateWigNew(struct annoStreamer *wigSource) /* Create an annoGrator subclass for source with rowType == arWig. */ { if (wigSource->rowType != arWig) errAbort("annoGrateWigNew: expected source->rowType arWig (%d), got %d", arWig, wigSource->rowType); struct annoGrateWig *self; AllocVar(self); struct annoGrator *gSelf = (struct annoGrator *)self; annoGratorInit(gSelf, wigSource); gSelf->integrate = agwIntegrate; self->mySource = annoGratorNew(wigSource); return gSelf; } -struct annoGrator *annoGrateBigWigNew(char *fileOrUrl) +struct annoGrator *annoGrateBigWigNew(char *fileOrUrl, struct annoAssembly *aa) /* Create an annoGrator subclass for bigWig file or URL. */ { -struct annoStreamer *bigWigSource = annoStreamBigWigNew(fileOrUrl); +struct annoStreamer *bigWigSource = annoStreamBigWigNew(fileOrUrl, aa); return annoGrateWigNew(bigWigSource); }