src/hg/hgTracks/simpleTracks.c 1.122
1.122 2010/01/22 22:52:03 aamp
Microarray tracks and custom microarray tracks now support the "expColor" trackDb setting which can be "redGreen" (default), "redBlue", "redBlueOnWhite", "yellowBlue", or "redBlueOnYellow". Some things wre changed around so that adding more color options in the future is a cinch.
Index: src/hg/hgTracks/simpleTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/simpleTracks.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -b -B -U 4 -r1.121 -r1.122
--- src/hg/hgTracks/simpleTracks.c 14 Jan 2010 22:36:31 -0000 1.121
+++ src/hg/hgTracks/simpleTracks.c 22 Jan 2010 22:52:03 -0000 1.122
@@ -141,8 +141,10 @@
Color shadesOfGreenOnWhite[EXPR_DATA_SHADES];
Color shadesOfRedOnWhite[EXPR_DATA_SHADES];
Color shadesOfBlueOnWhite[EXPR_DATA_SHADES];
Color shadesOfYellowOnWhite[EXPR_DATA_SHADES];
+Color shadesOfRedOnYellow[EXPR_DATA_SHADES];
+Color shadesOfBlueOnYellow[EXPR_DATA_SHADES];
Color orangeColor = 0;
Color brickColor = 0;
Color blueColor = 0;
Color darkBlueColor = 0;
@@ -2114,27 +2116,19 @@
static struct rgbColor red = {255, 0, 0};
static struct rgbColor green = {0, 255, 0};
static struct rgbColor blue = {0, 0, 255};
static struct rgbColor yellow = {255, 255, 0};
+static struct rgbColor white = {255, 255, 255};
hvGfxMakeColorGradient(hvg, &black, &blue, EXPR_DATA_SHADES, shadesOfBlue);
hvGfxMakeColorGradient(hvg, &black, &red, EXPR_DATA_SHADES, shadesOfRed);
hvGfxMakeColorGradient(hvg, &black, &green, EXPR_DATA_SHADES, shadesOfGreen);
hvGfxMakeColorGradient(hvg, &black, &yellow, EXPR_DATA_SHADES, shadesOfYellow);
-exprBedColorsMade = TRUE;
-}
-
-void makeRedBlueShadesOnWhiteBackground(struct hvGfx *hvg)
-/* Allocate the shades of Red, Green, Blue and Yellow for expression tracks */
-{
-static struct rgbColor red = {255, 0, 0};
-static struct rgbColor green = {0, 255, 0};
-static struct rgbColor blue = {0, 0, 255};
-static struct rgbColor yellow = {255, 255, 0};
-static struct rgbColor white = {255, 255, 255};
hvGfxMakeColorGradient(hvg, &white, &blue, EXPR_DATA_SHADES, shadesOfBlueOnWhite);
hvGfxMakeColorGradient(hvg, &white, &red, EXPR_DATA_SHADES, shadesOfRedOnWhite);
hvGfxMakeColorGradient(hvg, &white, &green, EXPR_DATA_SHADES, shadesOfGreenOnWhite);
hvGfxMakeColorGradient(hvg, &white, &yellow, EXPR_DATA_SHADES, shadesOfYellowOnWhite);
+hvGfxMakeColorGradient(hvg, &yellow, &blue, EXPR_DATA_SHADES, shadesOfBlueOnYellow);
+hvGfxMakeColorGradient(hvg, &yellow, &red, EXPR_DATA_SHADES, shadesOfRedOnYellow);
exprBedColorsMade = TRUE;
}
Color getOrangeColor()