f7148e5113be698a6fe208b4b233540be2000636 kate Thu Apr 23 11:30:36 2020 -0700 Change note on longlabel when hide empty is on. Also, limit to composite track label (don't display on subtracks). refs #23365 diff --git src/hg/hgTracks/bedTrack.c src/hg/hgTracks/bedTrack.c index 180ca43..4642115 100644 --- src/hg/hgTracks/bedTrack.c +++ src/hg/hgTracks/bedTrack.c @@ -78,31 +78,31 @@ char *bigDataUrl = hashFindVal(settings, "bigDataUrl"); struct bedTabixFile *btf = bedTabixFileMayOpen(bigDataUrl, NULL, 0, 0); list = bedTabixReadBeds(btf, chromName, winStart, winEnd, loader); bedTabixFileClose(&btf); } else if (tg->isBigBed) { // avoid opening an unneeded db connection for bigBed; required not to use mysql for parallel fetch tracks struct lm *lm = lmInit(0); struct bigBedInterval *bb, *bbList = bigBedSelectRange(tg, chromName, winStart, winEnd, lm); struct bbiFile *bbi = fetchBbiForTrack(tg); char *bedRow[bbi->fieldCount]; char startBuf[16], endBuf[16]; struct bigBedFilter *filters = bigBedBuildFilters(cart, bbi, tg->tdb); if (compositeChildHideEmptySubtracks(cart, tg->tdb, NULL, NULL)) - labelTrackAsFiltered(tg); + labelTrackAsHideEmpty(tg); if (tg->itemName == bedName && !trackDbSettingClosestToHomeOn(tg->tdb, "linkIdInName")) tg->itemName = bigBedItemName; bigBedLabelCalculateFields(cart, tg->tdb, bbi, &tg->labelColumns); unsigned filtered = 0; for (bb = bbList; bb != NULL; bb = bb->next) { bigBedIntervalToRow(bb, chromName, startBuf, endBuf, bedRow, ArraySize(bedRow)); if (!bigBedFilterInterval(bedRow, filters)) { filtered++; continue; } bed = loader(bedRow);