0268341f3b2ad1ed31c6dfee5a23f3035355f1ea braney Wed Sep 28 18:41:27 2016 -0700 use default maf in dense and squish modes diff --git src/hg/hgTracks/wigMafTrack.c src/hg/hgTracks/wigMafTrack.c index 3f1d0dd..3ae9816 100644 --- src/hg/hgTracks/wigMafTrack.c +++ src/hg/hgTracks/wigMafTrack.c @@ -579,52 +579,53 @@ struct wigMafItem *miList = NULL, *mi; int scoreHeight = tl.fontHeight * 4; struct track *wigTrack = track->subtracks; struct mafPriv *mp = getMafPriv(track); mp->list = (char *)-1; /* no maf's loaded or attempted to load */ /* if we're out in summary view and rendering a custom * track we force dense mode since we don't have * a summary table (yet). */ if (inSummaryMode(cart, track->tdb, winBaseCount) && isCustomTrack(track->table)) track->limitedVis = tvDense; /* Load up mafs and store in track so drawer doesn't have * to do it again. */ -/* Make up tracks for display. */ -if (track->limitedVis == tvFull || track->limitedVis == tvPack) - { char *defaultOn = trackDbSetting(track->tdb, "speciesDefaultOn"); char *defaultMaf = trackDbSetting(track->tdb, "defaultMaf"); // check to see if all species that are on are in defaultMaf if (defaultOn && defaultMaf && hTableExists(database, defaultMaf)) { struct wigMafItem *speciesList = newSpeciesItems(track, tl.fontHeight), *wmi; struct slName *defaultNames = slNameListFromString(defaultOn, ' '); boolean allOnInDefault = TRUE; for(wmi = speciesList; wmi; wmi = wmi->next) { if (!slNameInList(defaultNames, wmi->db)) allOnInDefault = FALSE; } if (allOnInDefault) track->table = defaultMaf; } + +/* Make up tracks for display. */ +if (track->limitedVis == tvFull || track->limitedVis == tvPack) + { if (isBaseLevel) { miList = loadBaseByBaseItems(track); } /* zoomed out */ else { miList = loadPairwiseItems(track); } } else if (track->limitedVis == tvSquish) { if (!wigTrack) { scoreHeight = tl.fontHeight * 4;