a6f9e0e10222729e05e349e994ecf3f24bece3fb kate Thu Apr 13 14:46:50 2017 -0700 Add support for hex color codes in trackDb setting. refs #18736 diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c index 6bc0d3f..78b3cec 100644 --- src/hg/lib/barChartUi.c +++ src/hg/lib/barChartUi.c @@ -189,35 +189,42 @@ warn("barChart track %s mismatch between label (%d) and color (%d) settings", tdb->track, count, colorCount); } int i; char buf[6]; for (i=0; i<count; i++) { AllocVar(categ); categ->id = i; safef(buf, sizeof buf, "%d", i); categ->name = cloneString(buf); categ->label = words[i]; if (colors) { unsigned rgb; - if (htmlColorForName(colorWords[i], &rgb)) + char *color = colorWords[i]; + if (htmlColorForCode(color, &rgb)) + { categ->color = rgb; + } + else if (htmlColorForName(color, &rgb)) + { + categ->color = rgb; + } else warn("barChart track %s unknown color %s. Must be one of %s\n", - tdb->track, colorWords[i], slNameListToString(htmlColorNames(),',')); + tdb->track, color, slNameListToString(htmlColorNames(),',')); } else { categ->color = ((rainbow[i].r & 0xff)<<16) + ((rainbow[i].g & 0xff)<<8) + ((rainbow[i].b & 0xff)); } slAddHead(&categs, categ); } slReverse(&categs); } return categs; } struct barChartCategory *barChartUiGetCategoryById(int id, char *database,