1e2be13e95b64bdae18e7e8e4b623c4751075620 angie Fri Jul 6 09:09:38 2012 -0700 Bug #8420 (BAM checkbox behavior): Fixed as suggested by Tim, thanks! diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 19f34e8..b694e0c 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -6082,44 +6082,45 @@ if (inputs) { \ for (var i=0; i < inputs.length; i++) { \ if (inputs[i].type == 'radio') { \ inputs[i].checked = (inputs[i].value == '%s'); \ } \ } \ }\"" void bamCfgUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed) /* BAM: short-read-oriented alignment file format. */ { boxed = cfgBeginBoxAndTitle(tdb, boxed, title); char cartVarName[1024]; printf("<TABLE%s><TR><TD>",boxed?" width='100%'":""); -char *tdbShowNames = cartOrTdbString(cart, tdb, BAM_SHOW_NAMES, "off"); +char *showNames = cartOrTdbString(cart, tdb, BAM_SHOW_NAMES, "0"); safef(cartVarName, sizeof(cartVarName), "%s.%s", name, BAM_SHOW_NAMES); -cgiMakeCheckBox(cartVarName, !sameOk(tdbShowNames, "off")); +cgiMakeCheckBox(cartVarName, SETTING_IS_ON(showNames)); printf("</TD><TD>Display read names</TD>"); if (boxed && fileExists(hHelpFile("hgBamTrackHelp"))) printf("<TD style='text-align:right'><A HREF=\"../goldenPath/help/hgBamTrackHelp.html\" TARGET=_BLANK>BAM " "configuration help</A></TD>"); printf("</TR>\n"); boolean canPair = (cartOrTdbString(cart, tdb, BAM_PAIR_ENDS_BY_NAME, NULL) != NULL); if (canPair) { + char *doPairing = cartOrTdbString(cart, tdb, BAM_PAIR_ENDS_BY_NAME, "0"); printf("<TR><TD>"); safef(cartVarName, sizeof(cartVarName), "%s." BAM_PAIR_ENDS_BY_NAME, name); - cgiMakeCheckBox(cartVarName, TRUE); + cgiMakeCheckBox(cartVarName, SETTING_IS_ON(doPairing)); printf("</TD><TD>Attempt to join paired end reads by name</TD></TR>\n"); } printf("<TR><TD colspan=2>Minimum alignment quality:\n"); safef(cartVarName, sizeof(cartVarName), "%s." BAM_MIN_ALI_QUAL, name); cgiMakeIntVar(cartVarName, atoi(cartOrTdbString(cart, tdb, BAM_MIN_ALI_QUAL, BAM_MIN_ALI_QUAL_DEFAULT)), 4); printf("</TD></TR></TABLE>"); if (isCustomTrack(name)) { // Auto-magic baseColor defaults for BAM, same as in hgTracks.c newCustomTrack hashAdd(tdb->settingsHash, BASE_COLOR_USE_SEQUENCE, cloneString("lfExtra")); hashAdd(tdb->settingsHash, BASE_COLOR_DEFAULT, cloneString("diffBases")); hashAdd(tdb->settingsHash, SHOW_DIFF_BASES_ALL_SCALES, cloneString(".")); hashAdd(tdb->settingsHash, "showDiffBasesMaxZoom", cloneString("100"));