936b5b5319541bf59421b258703a4f6af54790e3 tdreszer Wed Jul 30 08:45:57 2014 -0700 Two problems noticed by Angie in code review. Redmine #13704. diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 7a32cdf..6221d2d 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -2409,43 +2409,38 @@ struct rgbColor itemRgb; itemRgb.r = (lf->filterColor & 0xff0000) >> 16; itemRgb.g = (lf->filterColor & 0xff00) >> 8; itemRgb.b = lf->filterColor & 0xff; *retColor = *retBarbColor = hvGfxFindColorIx(hvg, itemRgb.r, itemRgb.g, itemRgb.b); } else *retColor = *retBarbColor = lf->filterColor; } else if (tg->itemColor) { *retColor = tg->itemColor(tg, lf, hvg); *retBarbColor = tg->ixAltColor; } -else if (tg->colorShades) +else { boolean isXeno = (tg->subType == lfSubXeno) || (tg->subType == lfSubChain) || startsWith("mrnaBla", tg->table); *retColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx+isXeno,*retColor); *retBarbColor = colorBySpectrumOrDefault(hvg,tg,lf->grayIx, *retBarbColor); } -else - { - *retColor = tg->ixColor; - *retBarbColor = tg->ixAltColor; - } } Color linkedFeaturesNameColor(struct track *tg, void *item, struct hvGfx *hvg) /* Determine the color of the name for the linked feature. */ { Color col, barbCol; lfColors(tg, item, hvg, &col, &barbCol); return col; } struct simpleFeature *simpleFeatureCloneList(struct simpleFeature *list) /* Just copies the simpleFeature list. This is good for making a copy */ /* when the codon list is made. */ { struct simpleFeature *ret = NULL;