9723799cf6f1a8fb714ae1493b224b8e91aebf09
tdreszer
Mon Jul 30 12:17:38 2012 -0700
Making final pass through tree of checkins as dictated by Jim. None of these changes should affect executables in any way. This pass is due to expanding fingerprint caused by kompare.
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 10af409..2772a0f 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -83,31 +83,31 @@
* next - living mostly in the cart. */
boolean baseShowPos; /* TRUE if should display full position at top of base track */
boolean baseShowAsm; /* TRUE if should display assembly info at top of base track */
boolean baseShowScaleBar; /* TRUE if should display scale bar at very top of base track */
boolean baseShowRuler; /* TRUE if should display the basic ruler in the base track (default) */
char *baseTitle = NULL; /* Title it should display top of base track (optional)*/
static char *userSeqString = NULL; /* User sequence .fa/.psl file. */
/* These variables are set by getPositionFromCustomTracks() at the very
* beginning of tracksDisplay(), and then used by loadCustomTracks(). */
char *ctFileName = NULL; /* Custom track file. */
struct customTrack *ctList = NULL; /* Custom tracks. */
boolean hasCustomTracks = FALSE; /* whether any custom tracks are for this db*/
struct slName *browserLines = NULL; /* Custom track "browser" lines. */
-boolean withNextItemArrows = FALSE; /* Display next feature (gene) navigation buttons near center labels? */
+boolean withNextItemArrows = FALSE; /* Display next feature (gene) navigation buttons */
boolean withPriorityOverride = FALSE; /* Display priority for each track to allow reordering */
int gfxBorder = hgDefaultGfxBorder; /* Width of graphics border. */
int guidelineSpacing = 12; /* Pixels between guidelines. */
boolean withIdeogram = TRUE; /* Display chromosome ideogram? */
int rulerMode = tvHide; /* on, off, full */
struct hvGfx *hvgSide = NULL; // Extra pointer to a sideLabel image that can be built if needed
char *rulerMenu[] =
/* dropdown for ruler visibility */
{
"hide",
"dense",
@@ -762,32 +762,31 @@
lf->name = cloneString(itemAcc);
char extraInfo[512];
safef(extraInfo, sizeof(extraInfo), "%s|%d|%d",
(itemName ? itemName : ""), tpsl->tStart, tpsl->tEnd);
lf->extra = cloneString(extraInfo);
slAddHead(&itemList, lf);
}
}
}
hFreeConn(&conn);
}
else
for (psl = pslList; psl != NULL; psl = psl->next)
if (sameString(psl->tName, chromName) && psl->tStart < winEnd && psl->tEnd > winStart)
{
- struct linkedFeatures *lf =
- lfFromPslx(psl, 1, FALSE, FALSE, tg);
+ struct linkedFeatures *lf = lfFromPslx(psl, 1, FALSE, FALSE, tg);
lf->name = cloneString("");
lf->extra = cloneString("");
slAddHead(&itemList, lf);
}
slSort(&itemList, linkedFeaturesCmp);
tg->items = itemList;
}
char *pcrResultTrackItemName(struct track *tg, void *item)
/* If lf->extra is non-empty, return it (display name for item).
* Otherwise default to item name. */
{
struct linkedFeatures *lf = item;
char *extra = (char *)lf->extra;
if (isNotEmpty(extra))
@@ -1320,31 +1319,32 @@
}
hvGfxTextRight(hvg, leftLabelX, y, leftLabelWidth-1,
track->lineHeight, labelColor, font,
track->shortLabel);
y += track->height;
break;
}
/* NOTE: might want to just restore savedVis here for all track types,
but I'm being cautious... */
if (sameString(track->tdb->type, "wigMaf"))
vis = savedVis;
hvGfxUnclip(hvg);
return y;
}
-static void doLabelNextItemButtons(struct track *track, struct track *parentTrack, struct hvGfx *hvg, MgFont *font, int y,
+static void doLabelNextItemButtons(struct track *track, struct track *parentTrack,
+ struct hvGfx *hvg, MgFont *font, int y,
int trackPastTabX, int trackPastTabWidth, int fontHeight,
int insideHeight, Color labelColor)
/* If the track allows label next-item buttons (next gene), draw them. */
/* The button will cause hgTracks to run again with the additional CGI */
/* vars nextItem=trackName or prevItem=trackName, which will then */
/* signal the browser to find the next thing on the track before it */
/* does anything else. */
{
int portWidth = insideWidth;
int portX = insideX;
// If a portal was established, then set the portal dimensions
int portalStart,chromStart;
double basesPerPixel;
if (theImgBox
&& imgBoxPortalDimensions(theImgBox,&chromStart,NULL,NULL,NULL,&portalStart,NULL,
@@ -1374,32 +1374,32 @@
int width = portWidth - (2 * arrowButtonWidth);
int x = portX + arrowButtonWidth;
// make toggle cover only actual label
int size = mgFontStringWidth(font,label) + 12; // get close enough to the label
if (width > size)
{
x += width/2 - size/2;
width = size;
}
mapBoxToggleVis(hvg, x, y + 1, width, insideHeight, (theImgBox ? track : parentTrack));
#else///ifndef IMAGEv2_SHORT_TOGGLE
mapBoxToggleVis(hvg, portX + arrowButtonWidth, y + 1, portWidth - (2 * arrowButtonWidth),
insideHeight, (theImgBox ? track : parentTrack));
#endif///ndef IMAGEv2_SHORT_TOGGLE
safef(buttonText, ArraySize(buttonText), "hgt.nextItem=%s", track->track);
-mapBoxReinvoke(hvg, portX + portWidth - arrowButtonWidth, y + 1, arrowButtonWidth, insideHeight, track, FALSE,
- NULL, 0, 0, (revCmplDisp ? "Prev item" : "Next item"), buttonText);
+mapBoxReinvoke(hvg, portX + portWidth - arrowButtonWidth, y + 1, arrowButtonWidth, insideHeight,
+ track, FALSE, NULL, 0, 0, (revCmplDisp ? "Prev item" : "Next item"), buttonText);
}
static int doCenterLabels(struct track *track, struct track *parentTrack,
struct hvGfx *hvg, MgFont *font, int y)
/* Draw center labels. Return y coord */
{
if (track->limitedVis != tvHide)
{
if (isCenterLabelIncluded(track))
{
int trackPastTabX = (withLeftLabels ? trackTabWidth : 0);
int trackPastTabWidth = tl.picWidth - trackPastTabX;
int fontHeight = mgFontLineHeight(font);
int insideHeight = fontHeight-1;
boolean toggleDone = FALSE;
@@ -1663,31 +1663,32 @@
{
if (tdbIsCompositeChild(subtrack->tdb))
{
if (!subtrack->limitedVisSet)
{
subtrack->visibility = tdbVisLimitedByAncestors(cart, subtrack->tdb, TRUE, TRUE);
limitVisibility(subtrack);
}
}
else
limitVisibility(subtrack);
return subtrack->limitedVis;
}
static int makeRulerZoomBoxes(struct hvGfx *hvg, struct cart *cart, int winStart,int winEnd,
- int insideWidth,int seqBaseCount,int rulerClickY,int rulerClickHeight)
+ int insideWidth,int seqBaseCount,int rulerClickY,
+ int rulerClickHeight)
/* Make hit boxes that will zoom program around ruler. */
{
int boxes = 30;
int winWidth = winEnd - winStart;
int newWinWidth = winWidth;
int i, ws, we = 0, ps, pe = 0;
int mid, ns, ne;
double wScale = (double)winWidth/boxes;
double pScale = (double)insideWidth/boxes;
char message[32];
char *zoomType = cartCgiUsualString(cart, RULER_BASE_ZOOM_VAR, ZOOM_3X);
safef(message, sizeof(message), "%s zoom", zoomType);
if (sameString(zoomType, ZOOM_1PT5X))
newWinWidth = winWidth/1.5;
@@ -4571,31 +4572,32 @@
* so that zoom/scrolling always has current position to work
* from. */
// This 'dirty' field is used to check if js/ajax changes to the page have occurred.
// If so and it is reached by the back button, a page reload will occur instead.
hPrintf("\n");
// Unfortunately this does not work in IE, so IE will get reloaded only after this full load
// NOTE: Larry and I have seen that the new URL is not even used, but this will abort
// the page load and hasten the isDirty() check in hgTracks.js
hPrintf("\n",hgTracksName(),cart->sessionId);
hPrintf("", chromName, winStart+1, winEnd);
hPrintf("\n%s", trackGroupsHidden1->string);
hPrintf("\n");
- hPrintf("