4e0b790163445a3403862af2b61f1466b6ff245b kate Thu Feb 19 17:21:58 2015 -0800 Some initial display work for GTEX gene expression track. refs #13504 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index c58b312..7043349 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -3671,31 +3671,31 @@ } #endif//ndef IMAGEv2_SHORT_MAPITEMS y += tg->lineHeight; } } } void genericDrawItems(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg, int xOff, int yOff, int width, MgFont *font, Color color, enum trackVisibility vis) /* Draw generic item list. Features must be fixed height * and tg->drawItemAt has to be filled in. */ { if (tg->mapItem == NULL) tg->mapItem = genericMapItem; -if (vis != tvDense && baseColorCanDraw(tg)) +if (vis != tvDense && (! bedItemRgb(tg->tdb)) && baseColorCanDraw(tg)) baseColorInitTrack(hvg, tg); boolean doWiggle = cartOrTdbBoolean(cart, tg->tdb, "doWiggle" , FALSE); if (doWiggle) { genericDrawItemsWiggle(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis); } else if (vis == tvPack || vis == tvSquish) { genericDrawItemsPackSquish(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis); } else genericDrawItemsFullDense(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis); @@ -12751,30 +12751,32 @@ else if (sameWord(type, "bamWig")) { bamWigMethods(track, tdb, wordCount, words); } else if (sameWord(type, "interaction")) { interactionMethods(track); } else if (sameWord(type, "gvf")) { gvfMethods(track); } /* add handlers for wildcard */ if (startsWith("peptideAtlas", track->track)) peptideAtlasMethods(track); +else if (startsWith("gtexGene", track->track)) + gtexGeneMethods(track); #endif /* GBROWSE */ } static void compositeLoad(struct track *track) /* Load all subtracks */ { struct track *subtrack; long thisTime = 0, lastTime = 0; for (subtrack = track->subtracks; subtrack != NULL; subtrack = subtrack->next) { if (isSubtrackVisible(subtrack) && ( limitedVisFromComposite(subtrack) != tvHide)) { if (!subtrack->parallelLoading) {