src/hg/lib/trackDbCustom.c 1.66

1.66 2009/05/22 10:11:16 mikep
added 'colorByStrand' option which specifies a + and - strand color to override the main 'color', currently works for bed/bigBed tracks which have base coloring
Index: src/hg/lib/trackDbCustom.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/trackDbCustom.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -b -B -U 4 -r1.65 -r1.66
--- src/hg/lib/trackDbCustom.c	18 May 2009 20:45:14 -0000	1.65
+++ src/hg/lib/trackDbCustom.c	22 May 2009 10:11:16 -0000	1.66
@@ -33,19 +33,17 @@
 else
    return 1;
 }
 
-static void parseColor(struct lineFile *lf, char *text,
-	unsigned char *r, unsigned char *g, unsigned char *b)
+void parseColor(char *text, unsigned char *r, unsigned char *g, unsigned char *b)
 /* Turn comma-separated string of three numbers into three
  * color components. */
 {
 char *words[4];
 int wordCount;
 wordCount = chopString(text, ", \t", words, ArraySize(words));
 if (wordCount != 3)
-    errAbort("Expecting 3 comma separated values line %d of %s",
-    		lf->lineIx, lf->fileName);
+    errAbort("Expecting 3 comma separated values in %s.", text);
 *r = atoi(words[0]);
 *g = atoi(words[1]);
 *b = atoi(words[2]);
 }
@@ -105,13 +103,13 @@
     bt->visibility =  parseVisibility(value, lf);
     }
 else if (sameWord(var, "color"))
     {
-    parseColor(lf, value, &bt->colorR, &bt->colorG, &bt->colorB);
+    parseColor(value, &bt->colorR, &bt->colorG, &bt->colorB);
     }
 else if (sameWord(var, "altColor"))
     {
-    parseColor(lf, value, &bt->altColorR, &bt->altColorG, &bt->altColorB);
+    parseColor(value, &bt->altColorR, &bt->altColorG, &bt->altColorB);
     }
 else if (sameWord(var, "type"))
     {
     bt->type = cloneString(value);