c49da1b974470a3aef749f0702ce2c23d3e8d7ea braney Sun Feb 25 11:19:48 2024 -0800 Revert "get hgTrackUi to do the right thing if "type bigBed" is specified." This reverts commit f3c7b669da695e4919410f08f0a3f6fa21778796. Conflicts: src/hg/lib/trackDbCustom.c diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 8c25744..54eabdd 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -6763,52 +6763,52 @@ else safef(labelBuf, sizeof(labelBuf),"%s%s", filterByRange ? "": "Minimum ", field); showScoreFilter(cart,tdb,opened,boxed,parentLevel,name,title,label,scoreName); count++; } if (as != NULL) asObjectFree(&as); } if (count > 0) puts(""); return count; } -boolean bedScoreHasCfgUi(struct trackDb *tdb, boolean defaultOff) +boolean bedScoreHasCfgUi(struct trackDb *tdb) // Confirms that this track has a bedScore Cfg UI { // Assumes that cfgType == cfgBedScore if (trackDbSettingClosestToHome(tdb, FILTER_BY)) return TRUE; if (trackDbSettingClosestToHome(tdb, GRAY_LEVEL_SCORE_MIN)) return TRUE; -boolean blocked = defaultOff; +boolean blocked = FALSE; struct trackDbFilter *filterSettings = tdbGetTrackNumFilters( tdb); if (filterSettings != NULL) { boolean one = FALSE; struct trackDbFilter *oneFilter = filterSettings; char *noScoreFilter = trackDbSetting(tdb, NO_SCORE_FILTER); if (noScoreFilter) blocked = TRUE; for (;oneFilter != NULL;oneFilter=oneFilter->next) { - if (defaultOff || differentString(oneFilter->fieldName,"score")) // scoreFilter is implicit + if (differentString(oneFilter->fieldName,"score")) // scoreFilter is implicit { // but could be blocked one = TRUE; break; } } if (one) return TRUE; } if (!blocked) // scoreFilter is implicit unless NO_SCORE_FILTER return TRUE; return FALSE; }