56f851c10e07b46bb5c033f871aa7885743739b7 kate Thu Oct 3 15:33:01 2019 -0700 Fix bug with bigNarrowPeak packability. refs #24249 diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index aa405ba..00fe37c 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -429,32 +429,33 @@ 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) labelTrackAsFiltered(track); +// also label parent composite track filtered struct trackDb *parentTdb = tdbGetComposite(track->tdb); -if (parentTdb && compositeHideEmptySubtracks(cart, parentTdb, NULL, NULL)) +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;