1eb6da6c4fd33797ce4896da20a31b74e05e2ab9 kate Wed Jul 22 11:46:36 2015 -0700 Label fix. Clarify imageV2 warning. refs #15645 diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index 72d2790..223022b 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -1080,31 +1080,31 @@ 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) { 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)", + 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) { if (imgFile == NULL) imgFile = slice->parentImg->file; } if (topLeftX < (slice->offsetX + slice->width-1) @@ -1529,31 +1529,31 @@ //return slRemoveEl(&(imgBox->imgTracks),imgTrack); //} void imgBoxTracksNormalizeOrder(struct imgBox *imgBox) // This routine sorts the imgTracks { slSort(&(imgBox->imgTracks), imgTrackOrderCmp); } void imgBoxShow(struct dyString **dy,struct imgBox *imgBox,int indent) // show the imgBox { if (imgBox) { struct dyString *myDy = addIndent(dy,indent); - dyStringPrintf(myDy,"imgBox: %s.%s:%d-%d %c width:%d basePer:%g sideLabe:%s w:%d " + dyStringPrintf(myDy,"imgBox: %s.%s:%d-%d %c width:%d basePer:%g sideLabel:%s w:%d " "portal:%s %d-%d w:%d",(imgBox->db ? imgBox->db : ""), (imgBox->chrom ? imgBox->chrom : ""),imgBox->chromStart,imgBox->chromEnd, (imgBox->plusStrand ? '+' : '-'),imgBox->width,imgBox->basesPerPixel, (imgBox->showSideLabel ? "Yes" : "No"),imgBox->sideLabelWidth, (imgBox->showPortal ? "Yes" : "No"), imgBox->portalStart,imgBox->portalEnd,imgBox->portalWidth); indent++; struct image *img; for (img=imgBox->images;img!=NULL;img=img->next) imgShow(&myDy,img,"data ",indent); if (imgBox->bgImg) imgShow(&myDy,imgBox->bgImg,"bgnd ",indent); if (dy == NULL) warn("%s",dyStringCannibalize(&myDy));