ebb119f63d024ea706a6922adf67bb9956d5f049 kate Tue Sep 3 16:33:52 2019 -0700 More fixes for multi-region (cross-chrom and non-cluster mode). refs #22422 diff --git src/hg/hgTracks/interactTrack.c src/hg/hgTracks/interactTrack.c index c05d09f..4010ea8 100644 --- src/hg/hgTracks/interactTrack.c +++ src/hg/hgTracks/interactTrack.c @@ -245,49 +245,30 @@ struct interactTrackInfo { boolean isDirectional; // source and target are distinct item types char *offset; // which end to draw offset (source or target) char *clusterMode; // cluster by source or target (or no cluster if NULL) boolean drawUp; // draw interactions with peak up (hill) boolean doOtherLabels; // true to suppress labels on other chrom items (prevent overlap) int maxSize; // longest interaction (midpoint to midpoint) in bp int fontHeight; int sameCount; // number of same chromosome interactions in window int sameHeight; // vertical space for same chromosome interactions int otherCount; // number of other chromosome interactions in window int otherHeight; // vertical space for other chromosome interactions } interactTrackInfo; -boolean interactIsClusterMode(struct track *tg) -/* Determine if track is interact and is in cluster view */ -{ -char *typeLine = tg->tdb->type, *words[8], *type; -int wordCount; -if (typeLine == NULL) - return FALSE; -wordCount = chopLine(cloneString(typeLine), words); -if (wordCount <= 0) - return FALSE; -type = words[0]; -if (sameString(type, "interact") || sameString(type, "bigInteract")) - { - struct interactTrackInfo *tInfo = tg->customPt; - return tInfo->clusterMode == NULL ? FALSE : TRUE; - } -return FALSE; -} - static void interactGetLayoutInfo(struct track *tg, int seqStart, struct hvGfx *hvg, int xOff, MgFont *font, double scale) /* Get layout info from interact items in window */ { struct interactTrackInfo *tInfo = tg->customPt; tInfo->doOtherLabels = TRUE; char *otherChrom = NULL; int prevLabelEnd = 0, prevLabelStart = 0; char *prevLabel = 0; struct interact *inter; for (inter = (struct interact *)tg->items; inter; inter = inter->next) { otherChrom = interactOtherChrom(inter); if (otherChrom == NULL)