1f163a84db47d2732e0b2d36d51a86a6308b2c34 tdreszer Mon Jul 23 11:52:04 2012 -0700 Another round of checkins as dictated by Jim. Required to add a space between 'for' and '('. Can this really be justified? diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 308f837..475bfb3 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -2254,31 +2254,32 @@ puts("<B>max:</B> "); if (isPhaseIII) { float maxHet = atof(cartUsualString(cart, HAP_MAX_OBSERVED_HET, HAP_MAX_OBSERVED_HET_DEFAULT)); cgiMakeDoubleVar(HAP_MAX_OBSERVED_HET, maxHet, 6); puts(" (range: 0.0 to 1.0)\n"); } else { float maxHet = atof(cartUsualString(cart, HAP_MAX_EXPECTED_HET, HAP_MAX_EXPECTED_HET_DEFAULT)); cgiMakeDoubleVar(HAP_MAX_EXPECTED_HET, maxHet, 6); puts(" (range: 0.0 to 0.5)\n"); } static char *orthoMenu[] = - { "no filter", + { + "no filter", "available", "matches major human allele", "matches minor human allele", "matches neither human allele" }; puts("<P><TABLE>"); for (i = 0; hapmapOrthoSpecies[i] != NULL; i++) { printf("<TR><TD><B>%s allele:</B></TD>\n<TD>", hapmapOrthoSpecies[i]); safef(cartVar, sizeof(cartVar), "%s_%s", HAP_ORTHO_PREFIX, hapmapOrthoSpecies[i]); cgiMakeDropList(cartVar, orthoMenu, 5, cartUsualString(cart, cartVar, HAP_FILTER_DEFAULT)); puts("</TD>"); safef(cartVar, sizeof(cartVar), "%s_%s", HAP_ORTHO_QUAL_PREFIX, hapmapOrthoSpecies[i]); int minQual = atoi(cartUsualString(cart, cartVar, HAP_ORTHO_QUAL_DEFAULT)); @@ -2843,37 +2844,37 @@ enum trackVisibility vis = tdb->visibility; boolean canPack = rTdbTreeCanPack(tdb); if (ajax) { // ajax popups should show currently inherited visability vis = tdbVisLimitedByAncestry(cart, tdb, TRUE); // composite children may inherit squish/pack vis so allow it. if (canPack == FALSE && tdbIsCompositeChild(tdb)) canPack = rTdbTreeCanPack(tdbGetComposite(tdb)); } else // But hgTrackUi page should show local vis vis = hTvFromString(cartUsualString(cart,tdb->track, hStringFromTv(vis))); if (tdbIsSuperTrackChild(tdb)) { - hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack, - "normalText superChild visDD", trackDbSetting(tdb, "onlyVisibility"), + hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack,"normalText superChild visDD", + trackDbSetting(tdb, "onlyVisibility"), "onchange='visTriggersHiddenSelect(this);'"); } else - hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack, - "normalText visDD", trackDbSetting(tdb, "onlyVisibility"),NULL); + hTvDropDownClassVisOnlyAndExtra(tdb->track,vis,canPack,"normalText visDD", + trackDbSetting(tdb, "onlyVisibility"),NULL); } if (!ajax) { printf(" "); cgiMakeButton("Submit", "Submit"); // Offer cancel button always? // composites and multiTracks (not standAlones or supers) if (tdbIsContainer(tdb)) { printf(" "); cgiMakeOnClickButton("window.history.back();","Cancel"); } if(tdbIsComposite(tdb)) printf("\n <a href='#' "