c43e813a238e650c17e8dee441653d9037a86e18 kate Sun Apr 15 21:51:04 2018 -0700 Fix problem with r,g,b color specs. Now also supports #RRGGBB anand 16 HTML color names. refs #21109 diff --git src/hg/hgTracks/interactTrack.c src/hg/hgTracks/interactTrack.c index 4854c15..e066ac5 100644 --- src/hg/hgTracks/interactTrack.c +++ src/hg/hgTracks/interactTrack.c @@ -36,31 +36,31 @@ There must be a better way..., e.g.: unsigned red = COLOR_32_RED(inter->color); unsigned green = COLOR_32_GREEN(inter->color); unsigned blue = COLOR_32_BLUE(inter->color); */ unsigned red = (inter->color & 0xff0000) >> 16; unsigned green = (inter->color & 0xff00) >> 8; unsigned blue = inter->color & 0xff; return hvGfxFindColorIx(hvg, red, green, blue); } void interactLoadItems(struct track *tg) /* Load all interact items in region */ { -loadSimpleBedWithLoader(tg, (bedItemLoader)interactLoad); +loadSimpleBedWithLoader(tg, (bedItemLoader)interactLoadAndValidate); if (tg->limitedVisSet) { // too many items to display // borrowed behaviors in bamTrack and vcfTrack // TODO BRANEY: make this behavior generic for bigBeds // (bigBedSelectRange) tg->drawItems = bigDrawWarning; tg->networkErrMsg = "Too many items in display (zoom in)"; tg->totalHeight = bigWarnTotalHeight; return; } // filter on score char buf[1024]; @@ -338,31 +338,30 @@ if (sOnScreen) { // draw foot of source region hvGfxLine(hvg, sX - sWidth, yOff, sX + sWidth, yOff, color); if (vis == tvDense || !tOnScreen || draw == DRAW_LINE) { // draw vertical if (isReversed) hvGfxDottedLine(hvg, sX, yOff, sX, peak, color, TRUE); else hvGfxLine(hvg, sX, yOff, sX, peak, color); } } if (tOnScreen) { -if (sOnScreen) // draw foot of target region hvGfxLine(hvg, tX - tWidth, yOff, tX + tWidth, yOff, color); if (vis == tvDense || !sOnScreen || draw == DRAW_LINE) { // draw vertical if (isReversed) hvGfxDottedLine(hvg, tX, yOff, tX, peak, color, TRUE); else hvGfxLine(hvg, tX, yOff, tX, peak, color); } } if (vis == tvDense) continue; // Full mode: add map boxes and draw interaction