7bc28d01fc11bfeab43b5a970094fce125cf5193 braney Fri Oct 25 12:00:25 2024 -0700 Revert "letting users specify a bigBed to color wiggles" This reverts commit f6b1bdaa2f9c39ba2100187c8f596e71c844d846. diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index e8950f7..532341b 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -966,31 +966,31 @@ if ((superTrack != NULL) && startsWith("on", superTrack)) isSuper = TRUE; if (!(trackDbSetting(tdb, "compositeTrack") || trackDbSetting(tdb, "container") || isSuper)) { errAbort("Parent track %s is not compositeTrack, container, or superTrack in hub %s genome %s", tdb->track, hub->url, genome->name); } } else { /* Check type field. */ char *type = requiredSetting(hub, genome, tdb, "type"); - if (0)//! isCustomComposite(tdb)) + if (! isCustomComposite(tdb)) { if (startsWithWord("mathWig", type) ) { requiredSetting(hub, genome, tdb, "mathDataUrl"); } else { /* RMH: Added bigRmsk to support RepeatMasker data in bigBed track hub format */ if (!(startsWithWord("wig", type)|| startsWithWord("bedGraph", type))) { if (!(startsWithWord("bigWig", type) || startsWithWord("bigBed", type) || #ifdef USE_HAL startsWithWord("pslSnake", type) || startsWithWord("halSnake", type) || @@ -1612,32 +1612,32 @@ dumpTdbAndParents(dy, tdb, existHash, NULL); return dy; } static void walkTree(FILE *f, struct cart *cart, struct trackDb *tdb, struct dyString *visDy) /* walk tree looking for visible tracks. */ { for(; tdb; tdb = tdb->next) { if (tdb->subtracks) walkTree(f, cart, tdb->subtracks, visDy); else { -// if (!startsWith("big", tdb->type)) - // continue; + if (!startsWith("big", tdb->type)) + continue; boolean isVisible = FALSE; if (tdb->parent == NULL) { char *cartVis = cartOptionalString(cart, tdb->track); if (cartVis != NULL) { tdb->visibility = hTvFromString(cartVis); } isVisible = tdb->visibility != tvHide; } else if (isParentVisible(cart, tdb) && isSubtrackVisible(cart, tdb)) { char *cartVis = cartOptionalString(cart, tdb->parent->track); tdb->visibility = hTvFromString(cartVis); isVisible = TRUE;