a715f8ee926e405d684ba6891aef9ef7c6b28475 braney Fri Feb 1 16:41:47 2019 -0800 circle primitive and a basic version of lollipops diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 9d9e9b3..830ef31 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -4507,30 +4507,31 @@ || sameWord(type, "bed6FloatScore") || sameWord(type, "bedDetail") || sameWord(type, "bigBed") || sameWord(type, "bigGenePred") || sameWord(type, "broadPeak") || sameWord(type, "chain") || sameWord(type, "factorSource") || sameWord(type, "genePred") || sameWord(type, "gvf") || sameWord(type, "narrowPeak") || sameWord(type, "psl") || sameWord(type, "barChart") || sameWord(type, "bigBarChart") || sameWord(type, "interact") || sameWord(type, "bigInteract") +|| sameWord(type, "bigLolly") //|| track->loadItems == loadSimpleBed //|| track->bedSize >= 3 // should pick up several ENCODE BED-Plus types. ) && track->canPack ) { return TRUE; } return FALSE; } boolean isTypeUseItemNameAsKey(struct track *track) /* Check if track type is like expRatio and key is just item name. */ { @@ -6099,49 +6100,52 @@ tg->loadItems = ctWigLoadItems; tg->customPt = ct; tg->nextItemButtonable = FALSE; } else if (sameString(type, "bigWig")) { tg = trackFromTrackDb(tdb); tg->bbiFile = ct->bbiFile; tg->nextItemButtonable = FALSE; if (trackShouldUseAjaxRetrieval(tg)) tg->loadItems = dontLoadItems; } else if (sameString(type, "bigBed")|| sameString(type, "bigGenePred") || sameString(type, "bigNarrowPeak") || sameString(type, "bigPsl") || sameString(type, "bigMaf")|| sameString(type, "bigChain") || + sameString(type, "bigLolly") || sameString(type, "bigBarChart") || sameString(type, "bigInteract")) { struct bbiFile *bbi = ct->bbiFile; /* Find field counts, and from that revise the tdb->type to be more complete. */ char extra = (bbi->fieldCount > bbi->definedFieldCount ? '+' : '.'); char typeBuf[64]; if (sameString(type, "bigGenePred")) safef(typeBuf, sizeof(typeBuf), "bigGenePred"); else if (sameString(type, "bigNarrowPeak")) safef(typeBuf, sizeof(typeBuf), "bigNarrowPeak"); else if (sameString(type, "bigChain")) safef(typeBuf, sizeof(typeBuf), "bigChain"); else if (sameString(type, "bigMaf")) safef(typeBuf, sizeof(typeBuf), "bigMaf"); else if (sameString(type, "bigPsl")) safef(typeBuf, sizeof(typeBuf), "bigPsl"); else if (sameString(type, "bigBarChart")) safef(typeBuf, sizeof(typeBuf), "bigBarChart"); + else if (sameString(type, "bigLolly")) + safef(typeBuf, sizeof(typeBuf), "bigLolly"); else if (sameString(type, "bigInteract")) safef(typeBuf, sizeof(typeBuf), "bigInteract"); else safef(typeBuf, sizeof(typeBuf), "bigBed %d %c", bbi->definedFieldCount, extra); tdb->type = cloneString(typeBuf); /* Finish wrapping track around tdb. */ tg = trackFromTrackDb(tdb); tg->bbiFile = bbi; tg->nextItemButtonable = TRUE; if (trackShouldUseAjaxRetrieval(tg)) tg->loadItems = dontLoadItems; } else if (sameString(type, "bedGraph")) {