beee82d43659b3f682f57301c4a64feec96314ff braney Thu Feb 1 14:25:25 2018 -0800 add support for math on bedGraph (including custom tracks) diff --git src/hg/hgCollection/hgCollection.c src/hg/hgCollection/hgCollection.c index b47e192..4e5a192 100644 --- src/hg/hgCollection/hgCollection.c +++ src/hg/hgCollection/hgCollection.c @@ -478,30 +478,32 @@ if (bigDataUrl == NULL) { if (startsWith("bigWig", tdb->type)) { dataUrl = getSqlBigWig(conn, db, tdb); hashReplace(tdb->settingsHash, "bigDataUrl", dataUrl); } } char *tdbType = trackDbSetting(tdb, "tdbType"); if (tdbType != NULL) hashReplace(tdb->settingsHash, "type", tdbType); hashReplace(tdb->settingsHash, "parent", parent); +hashReplace(tdb->settingsHash, "shortLabel", track->shortLabel); +hashReplace(tdb->settingsHash, "longLabel", track->longLabel); hashReplace(tdb->settingsHash, "track", makeUnique(collectionNameHash, name)); char priBuf[128]; safef(priBuf, sizeof priBuf, "%d", priority); hashReplace(tdb->settingsHash, "priority", cloneString(priBuf)); char colorString[64]; safef(colorString, sizeof colorString, "%d,%d,%d", (color >> 16) & 0xff,(color >> 8) & 0xff,color & 0xff); hashReplace(tdb->settingsHash, "color", colorString); struct dyString *dy = trackDbString(tdb); fprintf(f, "%s", dy->string); fprintf(f, "\n"); } static void outComposite(FILE *f, struct track *collection, int priority)