f041be1ae3ccc37baa7b0e8e27780d3cb64557ae galt Mon Feb 13 16:05:20 2017 -0800 code cleanup. diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index 4342e7d..56bde44 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -1090,33 +1090,32 @@ // slices, the imgTrack is in the best position to determine where to put the map item // returns count of map items added, which could be 0, 1 or more than one if item spans slices // NOTE: Precedence is given to first map item when adding items with same coordinates! { struct imgSlice *slice; char *imgFile = NULL; // name of file that hold the image char *neededId = NULL; // id is only added it it is NOT the trackId. if (imgTrack->tdb == NULL || differentStringNullOk(id, imgTrack->tdb->track)) neededId = id; // Trap surprising location s for map items, but only on test machines. if (hIsPrivateHost()) { int leftX, topY, rightX, bottomY; imgTrackCoordinates(imgTrack, &leftX, &topY, &rightX, &bottomY); - //if (topLeftY < topY || bottomRightY > bottomY) // TODO for sideLabels=0, many track item maps are extending down 1 pixel too far. EXISTING BUG. - if (topLeftY < topY || bottomRightY > (bottomY + 1)) // DEBUG RESTORE GALT Ignoring problem for now. + if (topLeftY < topY || bottomRightY > (bottomY + 1)) // Ignoring problem for now by using + 1. { char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->track : imgFile); warn("imgTrackAddMapItem(%s,%s) mapItem (%d,%d)(%d,%d) spills over track bounds(%d,%d)(%d,%d)", name,title,topLeftX,topLeftY,bottomRightX,bottomRightY,leftX,topY,rightX,bottomY); } } int count = 0; for (slice = imgTrack->slices;slice != NULL;slice=slice->next) { if (slice->type == stButton) // Buttons don't have maps. Overlap will be ignored! continue; if (slice->parentImg != NULL)