9a7ca8c4b0b6b064ef16f65b866e8314284d608d
kate
Fri Jan 28 16:53:38 2011 -0800
Merge branch 'master' of kate@hgwdev.cse.ucsc.edu:/data/git/kent
diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 5bab68d..ba50ac1 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -2443,35 +2443,31 @@
/* if bed has score then show optional filter based on score */
else if (sameWord(words[0], "bed") && wordCount == 3)
{
/* Note: jaxQTL3 is a bed 8 format track because of
thickStart/thickStart, but there is no valid score.
Similarly, the score field for wgRna track is no long used either.
It originally was usd to depict different RNA types. But the new
wgRna table has a new field 'type', which is used to store RNA
type info and from which to determine the display color of each entry.
*/
int bedFieldCount = atoi(words[1]);
if ((bedFieldCount >= 5 || trackDbSetting(tdb, "scoreMin") != NULL)
&& !sameString(track, "jaxQTL3") && !sameString(track, "wgRna")
&& !startsWith("encodeGencodeIntron", track))
{
- if (trackDbSetting(tdb, "scoreFilterMax"))
- scoreCfgUi(database, cart,tdb,tdb->track,NULL,
- sqlUnsigned(trackDbSetting(tdb, "scoreFilterMax")),FALSE);
- else
- scoreCfgUi(database, cart,tdb,tdb->track,NULL,1000,FALSE);
+ cfgByCfgType(cfgBedScore,database, cart, tdb,tdb->track, NULL, trackDbSettingClosestToHomeOn(tdb, "boxedCfg"));
}
}
else if (sameWord(words[0], "bed5FloatScore") || sameWord(words[0], "bed5FloatScoreWithFdr"))
scoreCfgUi(database, cart,tdb,tdb->track,NULL,1000,FALSE);
else if (sameWord(words[0], "psl"))
{
if (wordCount == 3)
if (sameWord(words[1], "xeno"))
crossSpeciesUi(tdb);
baseColorDrawOptDropDown(cart, tdb);
indelShowOptions(cart, tdb);
}
else if (sameWord(words[0], "factorSource"))
{
printf("
Cell Abbreviations:
\n");