2eb99e0866866ceddb4a2cce801a37bb0df7997e kate Wed Oct 21 17:59:25 2015 -0700 Cleanup trackUi in prep for merging into main. refs #15645 diff --git src/hg/hgTracks/gtexTracks.c src/hg/hgTracks/gtexTracks.c index 390c029..ea9436b 100644 --- src/hg/hgTracks/gtexTracks.c +++ src/hg/hgTracks/gtexTracks.c @@ -357,34 +357,34 @@ hashAdd(modelHash, model->name, model); } sqlFreeResult(&sr); hFreeConn(&conn); return modelHash; } static void gtexGeneLoadItems(struct track *tg) { // Get track UI info struct gtexGeneExtras *extras; AllocVar(extras); tg->extraUiData = extras; // TODO: move test to lib -char *graphType = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_GRAPH, - GTEX_GRAPH_DEFAULT); -extras->graphType = cloneString(graphType); -if (sameString(graphType, GTEX_GRAPH_AGE) || sameString(graphType, GTEX_GRAPH_SEX)) +char *samples = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_SAMPLES, + GTEX_SAMPLES_DEFAULT); +extras->graphType = cloneString(samples); +if (sameString(samples, GTEX_SAMPLES_COMPARE_SEX)) extras->isComparison = TRUE; extras->maxMedian = gtexMaxMedianScore(NULL); // Construct track items // Get geneModels in range //TODO: version the table name ? char *modelTable = "gtexGeneModel"; struct hash *modelHash = loadGeneModels(modelTable); // Get geneBeds (names and all-sample tissue median scores) in range bedLoadItem(tg, tg->table, (ItemLoader)gtexGeneBedLoad); uglyf("Loaded %d gtexGene items<BR>\n", slCount(tg->items));