7a22dde46e2ba888a438a27d36d64f56bcd86f97 braney Sun Apr 27 16:51:14 2014 -0700 make sure that stacked wiggles are not set to mean+whiskers diff --git src/hg/hgTracks/wigTrack.c src/hg/hgTracks/wigTrack.c index 063da80..8b5c513 100644 --- src/hg/hgTracks/wigTrack.c +++ src/hg/hgTracks/wigTrack.c @@ -1641,38 +1641,34 @@ wigCart->maxHeight = maxHeight; wigCart->defaultHeight = defaultHeight; wigCart->minHeight = minHeight; wigFetchMinMaxYWithCart(cart,tdb,tdb->track, &wigCart->minY, &wigCart->maxY, NULL, NULL, wordCount, words); wigCart->colorTrack = trackDbSetting(tdb, "wigColorBy"); char *containerType = trackDbSetting(tdb, "container"); if (containerType != NULL && sameString(containerType, "multiWig")) wigCart->isMultiWig = TRUE; wigCart->aggregateFunction = wigFetchAggregateFunctionWithCart(cart,tdb,tdb->track, (char **) NULL); -/* -char *aggregate = wigFetchAggregateValWithCart(cart, tdb); -if (aggregate != NULL) - { - wigCart->overlay = wigIsOverlayTypeAggregate(aggregate); - wigCart->transparent = sameString(WIG_AGGREGATE_TRANSPARENT, aggregate); - } -*/ +// can't do mean with whiskers in stacked mode +if ((wigCart->aggregateFunction == wiggleAggregateStacked) && + ( wigCart->windowingFunction == wiggleWindowingWhiskers)) + wigCart->windowingFunction = wiggleWindowingMax; return wigCart; } /* Make track group for wig multiple alignment. * WARNING ! - track->visibility is merely the default value * from the trackDb entry at this time. It will be set after this * by hgTracks from its cart UI setting. When called in * TotalHeight it will then be the requested visibility. */ void wigMethods(struct track *track, struct trackDb *tdb, int wordCount, char *words[]) { struct wigCartOptions *wigCart = wigCartOptionsNew(cart, tdb, wordCount, words); track->minRange = wigCart->minY; track->maxRange = wigCart->maxY;