997313ba169e4423867bb78b32165b8f6b858c53
max
Thu Mar 28 16:15:09 2024 -0700
Revert "taking back assembly info link for next build, email from Lou"
This reverts commit 278473e4cc842cfbc4b46094dfb170572c8dbcd1.
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 7c53e4c..5b2c51f 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -4909,31 +4909,34 @@
if (withLeftLabels)
{
sliceWidth[stButton] = trackTabWidth + 1;
sliceWidth[stSide] = leftLabelWidth - sliceWidth[stButton] + 1;
sliceOffsetX[stSide] =
(revCmplDisp ? (tl.picWidth - sliceWidth[stSide] - sliceWidth[stButton])
: sliceWidth[stButton]);
sliceOffsetX[stButton] = (revCmplDisp ? (tl.picWidth - sliceWidth[stButton]) : 0);
}
sliceOffsetX[stData] = (revCmplDisp ? 0 : sliceWidth[stSide] + sliceWidth[stButton]);
sliceWidth[stData] = tl.picWidth - (sliceWidth[stSide] + sliceWidth[stButton]);
}
struct flatTracks *flatTracks = NULL;
struct flatTracks *flatTrack = NULL;
-rulerCds = cartUsualBoolean(cart, BASE_SHOWCODONS, TRUE);
+if (rulerMode != tvFull)
+ {
+ rulerCds = FALSE;
+ }
/* Figure out height of each visible track. */
pixHeight = gfxBorder;
// figure out height of ruler
if (rulerMode != tvHide)
{
if (!baseShowRuler && !baseTitle && !baseShowPos && !baseShowAsm && !baseShowScaleBar && !zoomedToBaseLevel && !rulerCds)
{
warn("Can't turn everything off in base position track. Turning ruler back on");
baseShowRuler = TRUE;
cartSetBoolean(cart, BASE_SHOWRULER, TRUE);
}
if (baseTitle)
@@ -9023,32 +9026,32 @@
hPrintf("%s %s on Archaeon %s Assembly",
organization, browserName, freezeName);
}
else
{
if (stringIn(database, freezeName))
hPrintf("%s %s on %s %s",
organization, browserName, organism, freezeName);
else
hPrintf("%s %s on %s %s (%s)",
organization, browserName, trackHubSkipHubName(organism), freezeName, trackHubSkipHubName(database));
}
}
hPrintf("");
- //hPrintf(""
- //"Assembly Info", cartSessionId(cart));
+ hPrintf(""
+ "Assembly Info", cartSessionId(cart));
printDatabaseInfoHtml(database);
// Disable recommended track set panel when changing tracks, session, database
char *sessionLabel = cartOptionalString(cart, hgsOtherUserSessionLabel);
char *oldDb = hashFindVal(oldVars, "db");
if (sessionLabel)
{
if (defaultTracks || hideAll || hideTracks ||
(oldDb && differentString(database, oldDb)) ||
!hasRecTrackSet(cart) ||
sameString(sessionLabel, "off"))
cartRemove(cart, hgsOtherUserSessionLabel);
}
sessionLabel = cartOptionalString(cart, hgsOtherUserSessionLabel);