0440cfd6ef79932ae3d3d1934d9665b2848e8952 kate Mon Oct 7 14:54:50 2019 -0700 Add filter activated notice to bigNarrowPeak. refs #24271 diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 00fe37c..e5dd9fe 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -426,38 +426,33 @@ if (scoreFilter) minScore = atoi(scoreFilter); struct bbiFile *bbi = fetchBbiForTrack(track); int seqTypeField = 0; if (sameString(track->tdb->type, "bigPsl")) { seqTypeField = bbExtraFieldIndex(bbi, "seqType"); } int mouseOverIdx = bbExtraFieldIndex(bbi, mouseOverField); track->bbiFile = NULL; struct bigBedFilter *filters = bigBedBuildFilters(cart, bbi, track->tdb) ; -if (filters) +if (filters || compositeHideEmptySubtracks(cart, track->tdb, NULL, NULL)) labelTrackAsFiltered(track); -// also label parent composite track filtered -struct trackDb *parentTdb = tdbGetComposite(track->tdb); -if (parentTdb && (filters || compositeHideEmptySubtracks(cart, parentTdb, NULL, NULL))) - parentTdb->longLabel = labelAsFiltered(parentTdb->longLabel); - for (bb = bbList; bb != NULL; bb = bb->next) { struct linkedFeatures *lf = NULL; if (sameString(track->tdb->type, "bigPsl")) { char *seq, *cds; struct psl *psl = pslFromBigPsl(chromName, bb, seqTypeField, &seq, &cds); int sizeMul = pslIsProtein(psl) ? 3 : 1; boolean isXeno = 0; // just affects grayIx boolean nameGetsPos = FALSE; // we want the name to stay the name lf = lfFromPslx(psl, sizeMul, isXeno, nameGetsPos, track); lf->original = psl; if ((seq != NULL) && (lf->orientation == -1)) reverseComplement(seq, strlen(seq));