src/hg/hgTracks/expRatioTracks.c 1.41

Index: src/hg/hgTracks/expRatioTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/expRatioTracks.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -B -U 4 -r1.40 -r1.41
--- src/hg/hgTracks/expRatioTracks.c	14 Oct 2008 19:20:37 -0000	1.40
+++ src/hg/hgTracks/expRatioTracks.c	26 Jun 2009 20:17:51 -0000	1.41
@@ -10,8 +10,9 @@
 #include "cheapcgi.h"
 #include "expRecord.h"
 #include "microarray.h"
 #include "spaceSaver.h"
+#include "imageV2.h"
 
 Color shadesOfLowe1[10+1];
 Color shadesOfLowe2[10+1];
 Color shadesOfLowe3[10+1];
@@ -172,13 +173,25 @@
 {
 char *encodedItem1 = cgiEncode(item1);
 char *encodedItem2 = cgiEncode(item2);
 x = hvGfxAdjXW(hvg, x, width);
+#ifdef IMAGEv2_UI
+if(curMap != NULL)
+    {
+    char link[512];
+    safef(link,sizeof(link),"%s&o=%d&t=%d&g=%s&i=%s&i2=%s&c=%s&l=%d&r=%d&db=%s&pix=%d",
+        hgcNameAndSettings(), start, end, track, encodedItem1, encodedItem2,chromName, winStart,
+        winEnd, database, tl.picWidth);
+    // Add map item to currnent map (TODO: pass in map)
+    mapSetItemAdd(curMap,link,statusLine,x, y, x+width, y+height);
+    }
+#else//ifndef IMAGEv2_UI
 hPrintf("<AREA SHAPE=RECT COORDS=\"%d,%d,%d,%d\" ", x, y, x+width, y+height);
 hPrintf("HREF=\"%s&o=%d&t=%d&g=%s&i=%s&i2=%s&c=%s&l=%d&r=%d&db=%s&pix=%d\" ", 
        hgcNameAndSettings(), start, end, track, encodedItem1, encodedItem2,chromName, winStart, winEnd, 
        database, tl.picWidth);
 hPrintf("TITLE=\"%s\">\n", statusLine); 
+#endif//ndef IMAGEv2_UI
 freeMem(encodedItem1);
 freeMem(encodedItem2);
 }
 
@@ -1428,12 +1441,23 @@
 if ((nProbes > MICROARRAY_CLICK_LIMIT) && 
     !(sameString(tg->mapName, "expRatioUCSFDemo") || sameString(tg->mapName, "cnvLungBroadv2")  || sameString(tg->mapName, "CGHBreastCancerUCSF")  || sameString(tg->mapName, "expBreastCancerUCSF")) )
     {
     int xOffRc = hvGfxAdjXW(hvg, xOff, insideWidth);
+    #ifdef IMAGEv2_UI
+    if(curMap != NULL)
+        {
+        char link[512];
+        safef(link,sizeof(link),"%s&g=%s&c=%s&l=%d&r=%d&db=%s&i=zoomInMore",
+    	    hgcNameAndSettings(), tg->mapName, chromName, winStart, winEnd, database);
+        // Add map item to currnent map (TODO: pass in map)
+        mapSetItemAdd(curMap,link,"zoomInMore",xOffRc, y, xOffRc+insideWidth, y+totalHeight);
+        }
+    #else//ifndef IMAGEv2_UI
     hPrintf("<AREA SHAPE=RECT COORDS=\"%d,%d,%d,%d\" ", xOffRc, y, xOffRc+insideWidth, y+totalHeight);
     hPrintf("HREF=\"%s&g=%s&c=%s&l=%d&r=%d&db=%s&i=zoomInMore\" ", 
 	    hgcNameAndSettings(), tg->mapName, chromName, winStart, winEnd, database);
     hPrintf("TITLE=\"zoomInMore\">\n");
+    #endif//ndef IMAGEv2_UI
      }
 else
     {
     struct linkedFeatures *probe;