b8180d9f6d41dc708a2f249ba892cbca311e7a06 jcasper Mon Feb 27 11:38:55 2023 -0800 Adding transparency support for colors refs #30569 diff --git src/hg/hgTracks/gtexEqtlClusterTrack.c src/hg/hgTracks/gtexEqtlClusterTrack.c index 6034c79..303b807 100644 --- src/hg/hgTracks/gtexEqtlClusterTrack.c +++ src/hg/hgTracks/gtexEqtlClusterTrack.c @@ -129,32 +129,31 @@ int i; for (i=0; i<eqtl->expCount; i++) if (!eqtlIsExcludedTissue(eqtl, i)) return i; return -1; } static struct rgbColor eqtlTissueColor(struct track *track, struct gtexEqtlCluster *eqtl) /* Return tissue color for single-tissue item, or NULL if none found */ { int i = eqtlTissueIndex(eqtl); assert(i>=0); struct gtexEqtlClusterTrack *extras = (struct gtexEqtlClusterTrack *)track->extraUiData; struct gtexTissue *tis = (struct gtexTissue *)hashFindVal(extras->tissueHash, eqtl->expNames[i]); assert (tis); -return (struct rgbColor){.r=COLOR_32_BLUE(tis->color), .g=COLOR_32_GREEN(tis->color), - .b=COLOR_32_RED(tis->color)}; +return bedColorToRgb(tis->color); } static char *eqtlSourcesLabel(struct gtexEqtlCluster *eqtl) /* Right label is tissue (or number of tissues if >1) */ { int ct = eqtlTissueCount(eqtl); if (ct == 1) { int i = eqtlTissueIndex(eqtl); if (i<0) errAbort("GTEx eQTL %s/%s track tissue index is negative", eqtl->name, eqtl->target); return eqtl->expNames[i]; } struct dyString *ds = dyStringNew(0); dyStringPrintf(ds, "%d tissues", ct);