src/hg/hgTrackUi/hgTrackUi.c 1.514
1.514 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/hgTrackUi/hgTrackUi.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTrackUi/hgTrackUi.c,v
retrieving revision 1.513
retrieving revision 1.514
diff -b -B -U 4 -r1.513 -r1.514
--- src/hg/hgTrackUi/hgTrackUi.c 12 Jan 2010 23:36:03 -0000 1.513
+++ src/hg/hgTrackUi/hgTrackUi.c 22 Jan 2010 22:52:03 -0000 1.514
@@ -1044,23 +1044,22 @@
/* Radio button for red/green or blue/yellow */
{
char radioName[256];
char *colorSetting = NULL;
-boolean rgChecked = FALSE;
-boolean rgwChecked = FALSE;
+char *tdbSetting = trackDbSettingOrDefault(tdb, "expColor", "redGreen");
safef(radioName, sizeof(radioName), "%s.color", tdb->tableName);
-colorSetting = cartUsualString(cart, radioName, "redGreen");
-if (sameString(colorSetting, "redGreen"))
- rgChecked = TRUE;
-if (sameString(colorSetting, "redBlueOnWhite"))
- rgwChecked = TRUE;
-puts("<BR><B>Color: </B> ");
-cgiMakeRadioButton(radioName, "redGreen", rgChecked);
-puts("red/green");
-cgiMakeRadioButton(radioName, "yellowBlue", !(rgChecked || rgwChecked));
-puts("yellow/blue\n");
-cgiMakeRadioButton(radioName, "redBlueOnWhite", rgwChecked);
+colorSetting = cartUsualString(cart, radioName, tdbSetting);
+puts("<BR><B>Color: </B><BR> ");
+cgiMakeRadioButton(radioName, "redGreen", sameString(colorSetting, "redGreen"));
+puts("red/green<BR>");
+cgiMakeRadioButton(radioName, "redBlue", sameString(colorSetting, "redBlue"));
+puts("red/blue<BR>");
+cgiMakeRadioButton(radioName, "yellowBlue", sameString(colorSetting, "yellowBlue"));
+puts("yellow/blue<BR>\n");
+cgiMakeRadioButton(radioName, "redBlueOnWhite", sameString(colorSetting, "redBlueOnWhite"));
puts("red/blue on white background<BR>");
+cgiMakeRadioButton(radioName, "redBlueOnYellow", sameString(colorSetting, "redBlueOnYellow"));
+puts("red/blue on yellow background<BR>");
}
void expRatioUi(struct trackDb *tdb)
/* UI options for the expRatio tracks. */