0440cfd6ef79932ae3d3d1934d9665b2848e8952
kate
  Mon Oct 7 14:54:50 2019 -0700
Add filter activated notice to bigNarrowPeak. refs #24271

diff --git src/hg/hgTracks/bedTrack.c src/hg/hgTracks/bedTrack.c
index babf553..a29d39b 100644
--- src/hg/hgTracks/bedTrack.c
+++ src/hg/hgTracks/bedTrack.c
@@ -77,38 +77,33 @@
     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)
+    if (filters || compositeHideEmptySubtracks(cart, tg->tdb, NULL, NULL))
        labelTrackAsFiltered(tg);
 
-    // also label parent composite track filtered
-    struct trackDb *parentTdb = tdbGetComposite(tg->tdb);
-    if (parentTdb && (filters || 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);