a047d7a9dc2efc45c2204365481de77513581efa braney Thu Jan 18 17:45:02 2018 -0800 add mathWig options to hgTracksUi diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 02552fd..64a5f5b 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -14181,43 +14181,43 @@ return track->height; } int trackPriCmp(const void *va, const void *vb) /* Compare for sort based on priority */ { const struct track *a = *((struct track **)va); const struct track *b = *((struct track **)vb); return (a->priority - b->priority); } void buildMathWig(struct trackDb *tdb) /* Turn a mathWig composite into a mathWig track. */ { -char *viewFunc = trackDbSetting(tdb, "viewFunc"); +char *viewFunc = cartOrTdbString(cart, tdb, "viewFunc" , FALSE); -if ((viewFunc == NULL) || sameString("show all", viewFunc)) +if ((viewFunc == NULL) || sameString("showAll", viewFunc)) return; struct trackDb *subTracks = tdb->subtracks; tdb->subtracks = NULL; tdb->type = "mathWig"; struct dyString *dy = newDyString(1024); -if (sameString("add all", viewFunc)) +if (sameString("addAll", viewFunc)) dyStringPrintf(dy, "+ "); else dyStringPrintf(dy, "- "); struct trackDb *subTdb; for (subTdb=subTracks; subTdb; subTdb = subTdb->next) { char *bigDataUrl = trackDbSetting(subTdb, "bigDataUrl"); if (bigDataUrl != NULL) dyStringPrintf(dy, "%s ",bigDataUrl); else // native tracks are prepended with '$' dyStringPrintf(dy, "$%s ",trackDbSetting(subTdb, "table")); } hashAdd(tdb->settingsHash, "mathDataUrl", dy->string); }