5de752e3fa6fd4941978107956e2a87b4c5b46ee kate Thu Jul 16 12:04:16 2015 -0700 Add support for GTEX tissue color scheme. refs #15645 diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 2eb1555..9fbe3b5 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -34,39 +34,39 @@ #include "tfbsConsSites.h" #include "hapmapSnps.h" #include "nonCodingUi.h" #include "expRecord.h" #include "wikiTrack.h" #include "hubConnect.h" #include "trackHub.h" #include "pcrResult.h" #include "dgv.h" #include "transMapStuff.h" #include "vcfUi.h" #include "bbiFile.h" #include "ensFace.h" #include "microarray.h" #include "trackVersion.h" +#include "gtexUi.h" #ifdef USE_HAL #include "halBlockViz.h" #endif #define MAIN_FORM "mainForm" #define WIGGLE_HELP_PAGE "../goldenPath/help/hgWiggleTrackHelp.html" - struct cart *cart = NULL; /* Cookie cart with UI settings */ char *database = NULL; /* Current database. */ char *chromosome = NULL; /* Chromosome. */ struct hash *trackHash = NULL; /* Hash of all tracks in database. */ void tfbsConsSitesUi(struct trackDb *tdb) { float tfbsConsSitesCutoff = sqlFloat(cartUsualString(cart,TFBS_SITES_CUTOFF,TFBS_SITES_CUTOFF_DEFAULT)); printf("<BR><B>Z score cutoff (default %s, minimum %s): </B>", TFBS_SITES_CUTOFF_DEFAULT, TFBS_SITES_CUTOFF_MINIMUM); cgiMakeDoubleVar(TFBS_SITES_CUTOFF,tfbsConsSitesCutoff,5); } void stsMapUi(struct trackDb *tdb) @@ -2969,30 +2969,32 @@ dgvUi(tdb); else if (sameString(track, "all_mrna") || sameString(track, "mrna") || sameString(track, "all_est") || sameString(track, "est") || sameString(track, "tightMrna") || sameString(track, "tightEst") || sameString(track, "intronEst") || sameString(track, "xenoMrna") || sameString(track, "xenoEst")) mrnaCfgUi(cart, tdb, tdb->track, NULL, boxed); else if (sameString(track, "lrg")) lrgCfgUi(cart, tdb, tdb->track, NULL, boxed); else if (sameString(track, "lrgTranscriptAli")) lrgTranscriptAliCfgUi(cart, tdb, tdb->track, NULL, boxed); +else if (startsWith(track, "gtexGene")) + gtexGeneUi(cart, tdb, tdb->track, NULL, boxed); else if (tdb->type != NULL) { // NOTE for developers: please avoid special cases and use cfgTypeFromTdb//cfgByCfgType() // When you do, then multi-view cfg and subtrack cfg will work. eCfgType cType = cfgTypeFromTdb(tdb,FALSE); if (cType != cfgNone) { cfgByCfgType(cType,database, cart, tdb,tdb->track, NULL, boxed); #ifdef USE_HAL if (cType == cfgSnake) cfgHalSnake(tdb, tdb->track); #endif } // NOTE: these cases that fall through the cracks should probably get folded into cfgByCfgType() else if (startsWithWord("expRatio", tdb->type)) expRatioUi(tdb);