9944d8c4a72a426a07ed2d33a5ea535811dd4461 galt Sun Feb 7 23:26:52 2016 -0800 Issue 16666. Makes autoscale work with multi-region for wig, bedGraph, bigWig, and multiWig. doWiggle still TODO. diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index da83a93..384cff9 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -4479,32 +4479,34 @@ } static void genericDrawItemsWiggle(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color, enum trackVisibility vis) /* Draw a list of linked features into a wiggle. */ { struct preDrawContainer *pre = tg->preDrawContainer = initPreDrawContainer(insideWidth); unsigned *counts = countOverlaps(tg); countsToPixels(counts, pre); freez(&counts); hvGfxSetClip(hvg, insideX, yOff, insideWidth, tg->height); tg->mapsSelf = FALSE; // some magic to turn off the link out -wigDrawPredraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis, +wigPreDrawPredraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis, tg->preDrawContainer, tg->preDrawContainer->preDrawZero, tg->preDrawContainer->preDrawSize, &tg->graphUpperLimit, &tg->graphLowerLimit); +wigDrawPredraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis, + tg->preDrawContainer, tg->preDrawContainer->preDrawZero, tg->preDrawContainer->preDrawSize, tg->graphUpperLimit, tg->graphLowerLimit); tg->mapsSelf = TRUE; hvGfxUnclip(hvg); } static void genericDrawItemsPackSquish(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color, enum trackVisibility vis) /* genericDrawItems logic for pack and squish modes */ { double scale = scaleForWindow(width, seqStart, seqEnd); int lineHeight = tg->lineHeight; struct spaceNode *sn; int maxHeight = maximumTrackHeight(tg); int overflowRow = (maxHeight - tl.fontHeight +1) / lineHeight; boolean firstOverflow = TRUE;