src/hg/hgTracks/variation.c 1.145
1.145 2009/11/11 20:41:30 tdreszer
Cleanup before checkin of imageV2 framework without features. Also made track toggle work better for composites, but only in imageV2
Index: src/hg/hgTracks/variation.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/variation.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -b -B -U 4 -r1.144 -r1.145
--- src/hg/hgTracks/variation.c 14 Sep 2009 15:25:46 -0000 1.144
+++ src/hg/hgTracks/variation.c 11 Nov 2009 20:41:30 -0000 1.145
@@ -1228,10 +1228,9 @@
int xr, int yr, int xb, int yb,
char *name, char *shortLabel, char *trackName)
/* Print out image map rectangle that invokes hgTrackUi. */
{
-#ifdef IMAGEv2_UI
-if(theImgBox && curMap)
+if(theImgBox && curImgTrack)
{
char link[512];
safef(link,sizeof(link),"%s?%s=%u&g=%s&i=%s", hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart), trackName, name);
@@ -1239,9 +1238,9 @@
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: mapSetItemAdd(curMap,link,title,
+ // 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));
@@ -1249,9 +1248,8 @@
// 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);
}
else
-#endif//def IMAGEv2_UI
{
hPrintf("<AREA SHAPE=POLY COORDS=\"%d,%d,%d,%d,%d,%d,%d,%d\" ",
hvGfxAdjX(hvg, xl), yl,
hvGfxAdjX(hvg, xt), yt,
@@ -1269,10 +1267,9 @@
/* Print out image map rectangle that invokes hgTrackUi. */
{
xOff = hvGfxAdjXW(hvg, xOff, insideWidth);
char *track = tg->tdb->parent ? tg->tdb->parent->tableName : tg->tdb->tableName;
-#ifdef IMAGEv2_UI
-if(theImgBox && curMap)
+if(theImgBox && curImgTrack)
{
char link[512];
safef(link,sizeof(link),"%s?%s=%u&g=%s&i=%s",hgTrackUiName(),
cartSessionVarName(), cartSessionId(cart), track, track);
@@ -1283,12 +1280,10 @@
if(xOff < insideX && xOff+insideWidth > insideX)
warn("mapTrackBackground(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",tg->mapName,xOff, yOff, xOff+insideWidth, yOff+tg->height, link);
#endif//def IMAGEv2_SHORT_MAPITEMS
imgTrackAddMapItem(curImgTrack,link,title,xOff, yOff, xOff+insideWidth, yOff+tg->height);
- //mapSetItemAdd(curMap,link,title,xOff, yOff, xOff+insideWidth, yOff+tg->height);
}
else
-#endif//def IMAGEv2_UI
{
hPrintf("<AREA SHAPE=RECT COORDS=\"%d,%d,%d,%d\" ",
xOff, yOff, xOff+insideWidth, yOff+tg->height);
hPrintf("HREF=\"%s?%s=%u&c=%s&g=%s&i=%s\"", hgTrackUiName(),