2a4f1d79a36aac4a294c5d332f3b599ebe9be0dc
larrym
Mon May 14 16:32:21 2012 -0700
fix cruft that was causing an empty "Ensembl" in blue bar for fr2 (pointed out by greg); menuBar => printMenuBar to fix name collision with some new code
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 3b21926..f756a51 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -4447,31 +4447,31 @@
{
ideoTrack->limitedVisSet = TRUE;
ideoTrack->limitedVis = tvHide; /* Don't draw in main gif. */
}
makeActiveImage(trackList, psOutput);
fflush(stdout);
return; // bail out b/c we are done
}
if (!hideControls)
{
/* set white-space to nowrap to prevent buttons from wrapping when screen is
* narrow */
hPrintf("
\n");
- menuBar();
+ printMenuBar();
/* Show title . */
freezeName = hFreezeFromDb(database);
if(freezeName == NULL)
freezeName = "Unknown";
hPrintf("
");
if (startsWith("zoo",database) )
{
hPrintf("%s %s on %s June 2002 Assembly %s target1",
organization, browserName, organism, freezeName);
}
else
{
if (sameString(organism, "Archaea"))
{
@@ -5055,31 +5055,31 @@
int ret = round(x*guideBases);
return (ret == 0) ? 1 : ret;
}
void handlePostscript()
/* Deal with Postscript output. */
{
struct tempName psTn, ideoPsTn;
char *pdfFile = NULL, *ideoPdfFile = NULL;
ZeroVar(&ideoPsTn);
trashDirFile(&psTn, "hgt", "hgt", ".eps");
if(!trackImgOnly)
{
- menuBar();
+ printMenuBar();
printf("PDF Output
\n");
printf("PDF images can be printed with Acrobat Reader "
"and edited by many drawing programs such as Adobe "
"Illustrator or Inkscape.
");
}
doTrackForm(psTn.forCgi, &ideoPsTn);
pdfFile = convertEpsToPdf(psTn.forCgi);
if (strlen(ideoPsTn.forCgi))
ideoPdfFile = convertEpsToPdf(ideoPsTn.forCgi);
if(pdfFile != NULL)
{
printf("