be4311c07e14feb728abc6425ee606ffaa611a58 markd Fri Jan 22 06:46:58 2021 -0800 merge with master diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 632cbf3..9d102a6 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -4057,34 +4057,38 @@ boolean nextItemCompatible(struct track *tg) /* Check to see if we draw nextPrev item buttons on a track. */ { return (withNextExonArrows && tg->nextExonButtonable && tg->nextPrevExon); } boolean exonNumberMapsCompatible(struct track *tg, enum trackVisibility vis) /* Check to see if we draw exon and intron maps labeling their number. */ { if (tg->tdb) { char *type = tg->tdb->type; if (sameString(type, "interact") || sameString(type, "bigInteract")) return FALSE; - if (startsWith("bigGenePred", type) || startsWith("genePred", type)) - return TRUE; } -boolean exonNumbers = sameString(trackDbSettingOrDefault(tg->tdb, "exonNumbers", "off"), "on"); + +char *defVal = "off"; +char *type = tg->tdb->type; +if (startsWith("bigGenePred", type) || startsWith("genePred", type)) + defVal = "on"; + +boolean exonNumbers = sameString(trackDbSettingOrDefault(tg->tdb, "exonNumbers", defVal), "on"); return (withExonNumbers && exonNumbers && (vis==tvFull || vis==tvPack) && (winEnd - winStart < 400000) && (tg->nextPrevExon==linkedFeaturesNextPrevItem)); } void genericMapItem(struct track *tg, struct hvGfx *hvg, void *item, char *itemName, char *mapItemName, int start, int end, int x, int y, int width, int height) /* This is meant to be used by genericDrawItems to set to tg->mapItem in */ /* case tg->mapItem isn't set to anything already. */ { // Don't bother if we are imageV2 and a dense child. if (!theImgBox || tg->limitedVis != tvDense || !tdbIsCompositeChild(tg->tdb)) { char *directUrl = trackDbSetting(tg->tdb, "directUrl"); boolean withHgsid = (trackDbSetting(tg->tdb, "hgsid") != NULL);