f50a54ddd5728460bd8dd33a5fccd6fa3e84eef6 hiram Wed Mar 1 12:25:33 2017 -0800 correct colors on scaffold names when in chain tracks refs #18656 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 6017951..0b4c4f6 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -9142,32 +9142,34 @@ { char *skipped = NULL; int i = 0; for (i = 0; prefixes[i] != NULL; i++) { skipped = stringIn(prefixes[i], name); if (skipped != NULL) { skipped += strlen(prefixes[i]); break; } } /* perhaps a contig name of some other prefix */ if (NULL == skipped && scaffoldPrefixes == prefixes) { - skipped = cloneString(name); + skipped = cloneString(name); /* will be memory leak */ chopSuffixAt(skipped, 'v'); /* remove the vNN version, usually v1 */ + chopSuffixAt(skipped, '.'); /* remove the vNN version, could be .1 */ + chopSuffixAt(skipped, ' '); /* chain names have blank+N */ eraseNonDigits(skipped); /* strip characters, leave digits only */ if (0 == strlen(skipped)) /* if none left, did not work */ skipped = NULL; } return skipped; } Color getScaffoldColor(char *scaffoldNum, struct hvGfx *hvg) /* assign fake chrom color to scaffold/contig, based on number */ { int scafNum = atoi(scaffoldNum) % SCAF_COLORS + 1; if (!scafColorsMade) makeScaffoldShades(hvg); if (scafNum < 0 || scafNum > SCAF_COLORS) scafNum = 0;