5b97c90762187cf1993742fe8c422308e08d082c
tdreszer
Wed Jul 11 17:08:55 2012 -0700
Next batch of many checkins as dictated by Jim. Formatting if and limiting lines to 100 chars. Changes limited to lines last touched by tdreszer (git blame) so as not to ruin history. None of these changes should affect executables in any way.
diff --git src/hg/hgTracks/variation.c src/hg/hgTracks/variation.c
index cca02be..4fa7427 100644
--- src/hg/hgTracks/variation.c
+++ src/hg/hgTracks/variation.c
@@ -1555,31 +1555,32 @@
char link[512];
safef(link,sizeof(link),"%s?%s=%u&g=%s&i=%s", hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart), trackName, name);
char title[128];
safef(title,sizeof(title),"%s controls", shortLabel);
// Add map item to currnent map (TODO: pass in map)
// FIXME: What am I going to do about poly cords???
// FIXME: What am I going to do about poly cords???
// FIXME: imgTrackAddMapItem(curImgTrack,link,title,
// FIXME: hvGfxAdjX(hvg, xl), yl,
// FIXME: hvGfxAdjX(hvg, xt), yt,
// FIXME: hvGfxAdjX(hvg, xr), yr,
// FIXME: hvGfxAdjX(hvg, xb), yb));
// FIXME: What am I going to do about poly cords???
// FIXME: What am I going to do about poly cords???
- warn("Track named %s has called for a POLY map titled '%s controls', but imageV2 doesn't yet support this. No map item made.",trackName,shortLabel);
+ warn("Track named %s has called for a POLY map titled '%s controls', but imageV2 doesn't "
+ "yet support this. No map item made.",trackName,shortLabel);
}
else
{
hPrintf("\n");
}
}
@@ -1587,31 +1588,32 @@
void mapTrackBackground(struct track *tg, struct hvGfx *hvg, int xOff, int yOff)
/* Print out image map rectangle that invokes hgTrackUi. */
{
xOff = hvGfxAdjXW(hvg, xOff, insideWidth);
char *track = tg->tdb->parent ? tg->tdb->parent->track : tg->tdb->track;
if(theImgBox && curImgTrack)
{
char link[512];
safef(link,sizeof(link),"%s?%s=%u&g=%s&i=%s",hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart), track, track);
char title[128];
safef(title,sizeof(title),"%s controls", tg->track);
// Add map item to currnent map (TODO: pass in map)
#ifdef IMAGEv2_SHORT_MAPITEMS
if(xOff < insideX && xOff+insideWidth > insideX)
- warn("mapTrackBackground(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",tg->track,xOff, yOff, xOff+insideWidth, yOff+tg->height, link);
+ warn("mapTrackBackground(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",
+ tg->track,xOff, yOff, xOff+insideWidth, yOff+tg->height, link);
#endif//def IMAGEv2_SHORT_MAPITEMS
imgTrackAddMapItem(curImgTrack,link,title,xOff, yOff, xOff+insideWidth, yOff+tg->height, tg->track);
}
else
{
hPrintf("height);
hPrintf("HREF=\"%s?%s=%u&c=%s&g=%s&i=%s\"", hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart), chromName, track, track);
mapStatusMessage("%s controls", tg->track);
hPrintf(">\n");
}
}
int ldTotalHeight(struct track *tg, enum trackVisibility vis)