src/hg/hgTrackUi/hgTrackUi.c 1.508
1.508 2009/11/30 19:26:50 angie
Change bam cart variable names and bamTrack code to use Tim's cart and trackDb ClosestToHome API.
Index: src/hg/hgTrackUi/hgTrackUi.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTrackUi/hgTrackUi.c,v
retrieving revision 1.507
retrieving revision 1.508
diff -b -B -U 4 -r1.507 -r1.508
--- src/hg/hgTrackUi/hgTrackUi.c 4 Nov 2009 00:20:17 -0000 1.507
+++ src/hg/hgTrackUi/hgTrackUi.c 30 Nov 2009 19:26:50 -0000 1.508
@@ -2180,29 +2180,29 @@
puts("<BR>");
if (canPair)
{
printf("<B>Attempt to join paired end reads by name:</B>\n");
- safef(cartVarName, sizeof(cartVarName), "%s_" BAM_PAIR_ENDS_BY_NAME, tdb->tableName);
+ safef(cartVarName, sizeof(cartVarName), "%s." BAM_PAIR_ENDS_BY_NAME, tdb->tableName);
cartMakeCheckBox(cart, cartVarName, TRUE);
puts("<BR>");
}
printf("<B>Minimum alignment quality:</B>\n");
-safef(cartVarName, sizeof(cartVarName), "%s_" BAM_MIN_ALI_QUAL, tdb->tableName);
+safef(cartVarName, sizeof(cartVarName), "%s." BAM_MIN_ALI_QUAL, tdb->tableName);
cartMakeIntVar(cart, cartVarName,
atoi(trackDbSettingOrDefault(tdb, BAM_MIN_ALI_QUAL, BAM_MIN_ALI_QUAL_DEFAULT)), 4);
puts("<BR>");
baseColorDrawOptDropDown(cart, tdb);
printf("<BR>\n");
printf("<B>Additional coloring modes:</B><BR>\n");
-safef(cartVarName, sizeof(cartVarName), "%s_" BAM_COLOR_MODE, tdb->tableName);
+safef(cartVarName, sizeof(cartVarName), "%s." BAM_COLOR_MODE, tdb->tableName);
char *selected = cartUsualString(cart, cartVarName,
trackDbSettingOrDefault(tdb, BAM_COLOR_MODE, BAM_COLOR_MODE_DEFAULT));
cgiMakeRadioButton(cartVarName, BAM_COLOR_MODE_STRAND, sameString(selected, BAM_COLOR_MODE_STRAND));
printf("Color by strand (blue for +, red for -)<BR>\n");
cgiMakeRadioButton(cartVarName, BAM_COLOR_MODE_GRAY, sameString(selected, BAM_COLOR_MODE_GRAY));
printf("Use gray for\n");
char cartVarName2[1024];
-safef(cartVarName2, sizeof(cartVarName2), "%s_" BAM_GRAY_MODE, tdb->tableName);
+safef(cartVarName2, sizeof(cartVarName2), "%s." BAM_GRAY_MODE, tdb->tableName);
int grayMenuSize = canPair ? ArraySize(grayLabels) : ArraySize(grayLabels)-1;
char *sel2 = cartUsualString(cart, cartVarName2,
trackDbSettingOrDefault(tdb, BAM_GRAY_MODE, BAM_GRAY_MODE_DEFAULT));
char onChange[2048];
@@ -2211,9 +2211,9 @@
cgiMakeDropListFull(cartVarName2, grayLabels, grayValues, grayMenuSize, sel2, onChange);
printf("<BR>\n");
cgiMakeRadioButton(cartVarName, BAM_COLOR_MODE_TAG, sameString(selected, BAM_COLOR_MODE_TAG));
printf("Use R,G,B colors specified in user-defined tag ");
-safef(cartVarName2, sizeof(cartVarName2), "%s_" BAM_COLOR_TAG, tdb->tableName);
+safef(cartVarName2, sizeof(cartVarName2), "%s." BAM_COLOR_TAG, tdb->tableName);
sel2 = cartUsualString(cart, cartVarName2,
trackDbSettingOrDefault(tdb, BAM_COLOR_TAG, BAM_COLOR_TAG_DEFAULT));
safef(onChange, sizeof(onChange), UPDATE_RADIO_FORMAT,
"onkeypress", cartVarName, BAM_COLOR_MODE_TAG);