836dbade1ea9efd5a8cc07d3024540e913b968f9
tdreszer
Mon Dec 6 09:56:57 2010 -0800
Changed message wording as per Katrina's request in rm #1878
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index f39c5f6..5fb0b77 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -2018,32 +2018,32 @@
else if (track->limitedVis != tvHide)
flatTracksAdd(&flatTracks,track,cart);
}
flatTracksSort(&flatTracks); // Now we should have a perfectly good flat track list!
struct track *prevTrack = NULL;
for (flatTrack = flatTracks,prevTrack=NULL; flatTrack != NULL; flatTrack = flatTrack->next)
{
track = flatTrack->track;
assert(track->limitedVis != tvHide);
int totalHeight = pixHeight+trackPlusLabelHeight(track,fontHeight);
if (maxSafeHeight < totalHeight)
{
char numBuf[SMALLBUF];
sprintLongWithCommas(numBuf, maxSafeHeight);
if (safeHeight) // Only one message
- warn("Image is over %s pixels high (%d pix) at track:
\"%s\".%s", numBuf, totalHeight, track->tdb->longLabel,
- (flatTrack->next != NULL?"
Additional tracks may have been set to hide at this zoom level.":""));
+ warn("Image is over %s pixels high (%d pix) atthe following track which is now hidden:
\"%s\".%s", numBuf, totalHeight, track->tdb->longLabel,
+ (flatTrack->next != NULL?"
Additional tracks may have also been hidden at this zoom level.":""));
safeHeight = FALSE;
track->limitedVis = tvHide;
track->limitedVisSet = TRUE;
}
if (track->limitedVis != tvHide)
{
track->prevTrack = prevTrack; // Important for keeping track of conditional center labels!
pixHeight += trackPlusLabelHeight(track, fontHeight);
prevTrack = track;
}
}
imagePixelHeight = pixHeight;
if (psOutput)
{