9275ee8d88f2f0b40c9331a2c5139b13f617421d
kate
  Thu Oct 3 14:46:24 2019 -0700
Fixes to filter activated labeling. refs #23365

diff --git src/hg/hgTracks/bedTrack.c src/hg/hgTracks/bedTrack.c
index 20454a2..e399778 100644
--- src/hg/hgTracks/bedTrack.c
+++ src/hg/hgTracks/bedTrack.c
@@ -75,37 +75,39 @@
 if (startsWith("bedTabix", tg->tdb->type ) || startsWith("longTabix", tg->tdb->type ))
     {
     struct hash *settings = tg->tdb->settingsHash;
     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 (filters || 
-        (tdbIsCompositeChild(tg->tdb) && 
-            compositeHideEmptySubtracks(cart, tdbGetComposite(tg->tdb), NULL, NULL)))
+    struct bigBedFilter *filters = bigBedBuildFilters(cart, bbi, tg->tdb);
+    if (filters)
        labelTrackAsFiltered(tg);
 
+    struct trackDb *parentTdb = tdbGetComposite(tg->tdb);
+    if (parentTdb && compositeHideEmptySubtracks(cart, parentTdb, NULL, NULL))
+        parentTdb->longLabel = labelAsFiltered(parentTdb->longLabel);
+
      if (tg->itemName == bedName && !trackDbSettingClosestToHomeOn(tg->tdb, "linkIdInName"))
         tg->itemName = bigBedItemName;
 
     bigBedLabelCalculateFields(cart, tg->tdb, bbi,  &tg->labelColumns);
     for (bb = bbList; bb != NULL; bb = bb->next)
         {
         bigBedIntervalToRow(bb, chromName, startBuf, endBuf, bedRow, ArraySize(bedRow));
         if (!bigBedFilterInterval(bedRow, filters))
             continue;
         bed = loader(bedRow);
         // FIXME BRANEY: either disable for all tracks with NUM_FIELDS > label field or better,
         // fix how label is stored so it doesn't trash custom bed field
         // BRANEY says: the loader should be returning bed structures which include the label field.
         if (differentString(tg->tdb->type, "bigInteract"))
             bed->label = bigBedMakeLabel(tg->tdb, tg->labelColumns, bb, chromName);