8597b56d9756fb1397f6eae2bdd8c8aa9ea58c02
tdreszer
Tue Sep 7 12:51:14 2010 -0700
Larry found this bug where the image file was being built with much empty space at bottom when doing flatTracks and subTrack level vis
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 9ad6800..f57f13b 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -2034,7 +2034,6 @@
{
subtrack->hasUi = track->hasUi;
flatTracksAdd(&flatTracks,subtrack,cart);
- pixHeight += trackPlusLabelHeight(subtrack, fontHeight);
}
#endif//def FLAT_TRACK_LIST
}
@@ -2057,15 +2056,31 @@
track->limitedVis = tvHide;
track->limitedVisSet = TRUE;
}
+ #ifndef FLAT_TRACK_LIST
else
- #ifdef FLAT_TRACK_LIST
- if (!tdbIsComposite(track->tdb))
- #endif//def FLAT_TRACK_LIST
pixHeight += trackPlusLabelHeight(track, fontHeight);
+ #endif//def FLAT_TRACK_LIST
}
}
#ifdef FLAT_TRACK_LIST
flatTracksSort(&flatTracks); // Now we should have a perfectly good flat track list!
+for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next)
+ {
+ track = flatTrack->track;
+ if (maxSafeHeight < (pixHeight+trackPlusLabelHeight(track,fontHeight)))
+ {
+ char numBuf[SMALLBUF];
+ sprintLongWithCommas(numBuf, maxSafeHeight);
+ printf("warning: image is over %s pixels high at "
+ "track '%s',
remaining tracks set to hide "
+ "for this view.
\n", numBuf, track->tdb->shortLabel);
+ safeHeight = FALSE;
+ track->limitedVis = tvHide;
+ track->limitedVisSet = TRUE;
+ }
+ else
+ pixHeight += trackPlusLabelHeight(track, fontHeight);
+ }
#endif//def FLAT_TRACK_LIST
imagePixelHeight = pixHeight;
@@ -5633,9 +5648,12 @@
#endif/// def CONTEXT_MENU
jsIncludeFile("jquery-ui.js", NULL);
+//if (!trackImgOnly)
+ {
hPrintf("