c322057bea6c18cddb7a7c13584af545c62f3189 jcasper Wed Oct 21 14:09:04 2015 -0700 Adding colorblindness-friendly colors for upcoming release of new ORegAnno data, refs #15957 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 3dcc8f8..4761bc2 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -11074,30 +11074,41 @@ if (el->id != NULL) id = el->id; else id = el->name; sqlSafef(query, sizeof(query), "select * from oregannoAttr where attribute = 'type' and id = '%s'", id); details = oregannoAttrLoadByQuery(conn, query); /* ORegAnno colors 666600 (Dark Green), CCCC66 (Tan), CC0033 (Red), CCFF99 (Background Green) */ if (sameString(details->attrVal, "REGULATORY POLYMORPHISM")) itemColor = hvGfxFindColorIx(hvg, 204, 0, 51); /* red */ else if (sameString(details->attrVal, "TRANSCRIPTION FACTOR BINDING SITE")) itemColor = hvGfxFindColorIx(hvg, 165, 165, 65); /* tan, darkened some */ else if (sameString(details->attrVal, "REGULATORY REGION")) itemColor = hvGfxFindColorIx(hvg, 102, 102, 0); /* dark green */ +/* New ORegAnno colors (colorblind friendly) */ +else if (sameString(details->attrVal, "Regulatory Polymorphism")) + itemColor = hvGfxFindColorIx(hvg, 0, 114, 178); /* Blue */ +else if (sameString(details->attrVal, "Transcription Factor Binding Site")) + itemColor = hvGfxFindColorIx(hvg, 230, 159, 0); /* Orange */ +else if (sameString(details->attrVal, "Regulatory Region")) + itemColor = hvGfxFindColorIx(hvg, 86, 180, 233); /* Sky Blue */ +else if (sameString(details->attrVal, "Regulatory Haplotype")) + itemColor = hvGfxFindColorIx(hvg, 213, 94, 0); /* Vermillion */ +else if (sameString(details->attrVal, "miRNA Binding Site")) + itemColor = hvGfxFindColorIx(hvg, 0, 158, 115); /* bluish Green */ oregannoAttrFreeList(&details); hFreeConn(&conn); return itemColor; } Color omiciaColor(struct track *tg, void *item, struct hvGfx *hvg) /* color by confidence score */ { struct bed *el = item; if (sameString(tg->table, "omiciaHand")) return hvGfxFindColorIx(hvg, 0, 0, 0); else if (el->score < 200) return MG_BLACK; else if (el->score < 600) return hvGfxFindColorIx(hvg, 230, 130, 0); /* orange */