src/hg/hgTracks/chromGraphTrack.c 1.19
1.19 2009/11/11 20:41:27 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/chromGraphTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/chromGraphTrack.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -B -U 4 -r1.18 -r1.19
--- src/hg/hgTracks/chromGraphTrack.c 14 Sep 2009 15:23:48 -0000 1.18
+++ src/hg/hgTracks/chromGraphTrack.c 11 Nov 2009 20:41:27 -0000 1.19
@@ -179,10 +179,9 @@
/* Do map box */
xOff = hvGfxAdjXW(hvg, xOff, width);
char *encodedTrack = cgiEncode(tg->mapName);
-#ifdef IMAGEv2_UI
-if(theImgBox && curMap)
+if(theImgBox && curImgTrack)
{
char link[512]; // FIXME: winStart/winEnd are not right when using a portal
safef(link,sizeof(link),"%s&o=%d&t=%d&g=%s", hgcNameAndSettings(),
winStart, winEnd, encodedTrack);
@@ -190,12 +189,10 @@
if(xOff < insideX && xOff+width > insideX)
warn("cgDrawEither(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",encodedTrack,xOff, yOff, xOff+width, yOff+height, link);
#endif//def IMAGEv2_SHORT_MAPITEMS
imgTrackAddMapItem(curImgTrack,link,NULL,xOff,yOff,xOff+width,yOff+height);
- //mapSetItemAdd(curMap,link,NULL,xOff,yOff,xOff+width,yOff+height);
}
else
-#endif//def IMAGEv2_UI
{
hPrintf("<AREA SHAPE=RECT COORDS=\"%d,%d,%d,%d\" ", xOff, yOff, xOff+width,
yOff+height);
hPrintf("HREF=\"%s&o=%d&t=%d&g=%s&c=%s&l=%d&r=%d&db=%s&pix=%d\">\n",