e7fea0a31b28f2e17c44b19af2128a177e45e785 kate Tue Sep 11 13:49:29 2018 -0700 Fix compiler warnings (and superfluous vars). diff --git src/hg/hgTracks/interactTrack.c src/hg/hgTracks/interactTrack.c index ac1563c..1559dcf 100644 --- src/hg/hgTracks/interactTrack.c +++ src/hg/hgTracks/interactTrack.c @@ -336,31 +336,30 @@ if (vis != tvDense) { char *drawMode = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, INTERACT_DRAW, INTERACT_DRAW_DEFAULT); if (sameString(drawMode, INTERACT_DRAW_CURVE)) draw = DRAW_CURVE; else if (sameString(drawMode, INTERACT_DRAW_ELLIPSE)) draw = DRAW_ELLIPSE; doDashes = cartUsualBooleanClosestToHome(cart, tg->tdb, FALSE, INTERACT_DIRECTION_DASHES, INTERACT_DIRECTION_DASHES_DEFAULT); } double scale = scaleForWindow(width, seqStart, seqEnd); struct interact *inter = NULL; char buffer[1024]; char itemBuf[2048]; -int chromStart, chromEnd; // Gather info for layout struct interactTrackInfo *tInfo = interactGetTrackInfo(tg, seqStart, hvg, xOff, font, scale); setYOff(tg, yOff); // TODO: better to stash this in tInfo, and save that in track struct */ int highlightColor = MG_WHITE; boolean drawUp = trackDbSettingClosestToHomeOn(tg->tdb, INTERACT_UP) && vis == tvFull; // Get spectrum range int scoreMin = atoi(trackDbSettingClosestToHomeOrDefault(tg->tdb, "scoreMin", "0")); int scoreMax = atoi(trackDbSettingClosestToHomeOrDefault(tg->tdb, "scoreMax", "1000")); // Draw items struct hash *footHash = hashNew(0); // track feet so we can override color to black for overlapping struct hash *footHashOther = hashNew(0); // has for items on other chrom for (inter = (struct interact *)tg->items; inter; inter = inter->next) @@ -407,44 +406,44 @@ // draw the vertical boolean isReversed = tInfo->isDirectional && differentString(inter->chrom, inter->sourceChrom); drawLine(tg, hvg, x, yOffOther, x, yPos, color, isReversed && doDashes, drawUp); if (vis == tvDense) continue; // add map box to foot char *nameBuf = (inter->chromStart == inter->sourceStart ? inter->sourceName : inter->targetName); drawFootMapbox(tg, hvg, inter->chromStart, inter->chromEnd, nameBuf, statusBuf, x - footWidth, yOffOther, footWidth, peakColor, highlightColor, drawUp); // add map box to vertical - mapBoxHgcOrHgGene(hvg, chromStart, chromEnd, x - 2, yOffOther, 4, + mapBoxHgcOrHgGene(hvg, inter->chromStart, inter->chromEnd, x - 2, yOffOther, 4, height, tg->track, itemBuf, statusBuf, NULL, TRUE, NULL); if (tInfo->doOtherLabels) { // draw label safef(buffer, sizeof buffer, "%s", sameString(inter->chrom, inter->sourceChrom) ? inter->targetChrom : inter->sourceChrom); if (drawUp) yPos = flipY(tg, yPos); hvGfxTextCentered(hvg, x, yPos + 2, 4, 4, MG_BLUE, font, buffer); int labelWidth = vgGetFontStringWidth(hvg->vg, font, buffer); // add map box to label - mapBoxHgcOrHgGene(hvg, chromStart, chromEnd, x - labelWidth/2, + mapBoxHgcOrHgGene(hvg, inter->chromStart, inter->chromEnd, x - labelWidth/2, yPos, labelWidth, tInfo->fontHeight, tg->track, itemBuf, statusBuf, NULL, TRUE, NULL); } continue; } // Draw same chromosome interaction // source region unsigned s = interactRegionCenter(inter->sourceStart, inter->sourceEnd); int sX = getX(s, seqStart, scale, xOff); int sWidth = regionFootWidth(inter->sourceStart, inter->sourceEnd, scale); boolean sOnScreen = (s >= seqStart) && (s< seqEnd); // target region @@ -487,32 +486,30 @@ } if (tOnScreen) { drawFoot(tg, hvg, inter->targetChrom, inter->targetStart, inter->targetEnd, tX - tWidth, yTarget, tWidth + tWidth + 1, footColor, drawUp, footHash); if (vis == tvDense || !sOnScreen || draw == DRAW_LINE || hvg->rc) { // draw vertical from foot to peak drawLine(tg, hvg, tX, yTarget, tX, peak, color, isReversed && doDashes, drawUp); } } if (vis == tvDense) continue; // Full mode: add map boxes and draw interaction - chromStart = inter->chromStart; - chromEnd = inter->chromEnd; if (sOnScreen) { // draw grab box and map box to source region drawFootMapbox(tg, hvg, inter->chromStart, inter->chromEnd, inter->sourceName, statusBuf, sX, ySource, sWidth, peakColor, highlightColor, drawUp); } if (tOnScreen) { // draw grab box and add map box to target region drawFootMapbox(tg, hvg, inter->chromStart, inter->chromEnd, inter->targetName, statusBuf, tX, yTarget, tWidth, tInfo->isDirectional ? MG_MAGENTA : peakColor, highlightColor, drawUp); } if ((s < seqStart && t < seqStart) || (s > seqEnd && t > seqEnd)) @@ -525,31 +522,31 @@ lowerX = sOnScreen ? sX : xOff; upperX = tOnScreen ? tX : xOff + width; } else { lowerX = tOnScreen ? tX : xOff; upperX = sOnScreen ? sX : xOff + width; } if (draw == DRAW_LINE || !sOnScreen || !tOnScreen || hvg->rc) { // draw horizontal line between region centers at 'peak' height drawLine(tg, hvg, lowerX, peak, upperX, peak, color, isReversed && doDashes, drawUp); // draw grab box and map box on mid-point of horizontal line int xMap = lowerX + (double)(upperX-lowerX)/2; - drawPeakMapbox(tg, hvg, chromStart, chromEnd, itemBuf, statusBuf, + drawPeakMapbox(tg, hvg, inter->chromStart, inter->chromEnd, itemBuf, statusBuf, xMap, peak, peakColor, highlightColor, drawUp); continue; } // Draw curves if (draw == DRAW_CURVE) { int peakX = ((upperX - lowerX + 1) / 2) + lowerX; //int fudge = drawUp ? -30 : 30; int fudge = 30; int peakY = peak + fudge; // admittedly a hack (obscure how to define ypeak of curve) int y1 = isReversed ? yTarget : ySource; int y2 = isReversed ? ySource : yTarget; if (drawUp) { y1 = flipY(tg, y1);