3bd303d90463041294d0879f7a3ef64c6f8dcaf4 braney Sun May 7 17:44:39 2017 -0700 ongoing work on custom composites diff --git src/hg/hgTracks/multiWig.c src/hg/hgTracks/multiWig.c index 0d4cc9f..a5f793a 100644 --- src/hg/hgTracks/multiWig.c +++ src/hg/hgTracks/multiWig.c @@ -392,48 +392,48 @@ pre->graphUpperLimit = graphUpperLimit; pre->graphLowerLimit = graphLowerLimit; } tgs->graphUpperLimit = graphUpperLimit; tgs->graphLowerLimit = graphLowerLimit; } } } } static void mergeWiggles(struct track *tg, boolean add) { struct preDrawContainer *firstPre = tg->preDrawContainer; struct track *firstTrack = tg; -struct wigCartOptions *wigCart = (struct wigCartOptions *) tg->wigCartData; +//struct wigCartOptions *wigCart = (struct wigCartOptions *) tg->wigCartData; int ii; for(tg = tg->next; tg; tg = tg->next) { struct preDrawContainer *pre = tg->preDrawContainer; for(ii=firstPre->preDrawZero; ii < firstPre->preDrawZero + firstPre->width; ii++) { struct preDrawElement *firstPreDraw = &firstPre->preDraw[ii]; struct preDrawElement *thisPreDraw = &pre->preDraw[ii]; if (add) firstPreDraw->smooth += thisPreDraw->smooth; else firstPreDraw->smooth -= thisPreDraw->smooth; } } -if (wigCart->autoScale == wiggleScaleAuto) +//if (wigCart->autoScale == wiggleScaleAuto) { double upperLimit = wigEncodeStartingUpperLimit; double lowerLimit = wigEncodeStartingLowerLimit; for(ii=firstPre->preDrawZero; ii < firstPre->preDrawZero + firstPre->width; ii++) { struct preDrawElement *firstPreDraw = &firstPre->preDraw[ii]; if (firstPreDraw->smooth < lowerLimit) lowerLimit = firstPreDraw->smooth; if (firstPreDraw->smooth > upperLimit) upperLimit = firstPreDraw->smooth; } firstTrack->graphLowerLimit = lowerLimit; firstTrack->graphUpperLimit = upperLimit; firstPre->graphLowerLimit = lowerLimit; firstPre->graphUpperLimit = upperLimit;