96bb082b01866c65273531541c20204851c47380
larrym
  Fri Aug 13 00:30:54 2010 -0700
move trackDbJson code into imageV2.c and print it out from w/n imageBoxDraw to fix problems with subtracks
diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 71d8d4d..da00f4e 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -4311,23 +4311,6 @@
     }
 }
 
-#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-static void trackJson(struct dyString *trackDbJson, struct track *track, int count)
-{
-// add entry for given track to the trackDbJson string
-if(count)
-    dyStringAppend(trackDbJson, "\n,");
-dyStringPrintf(trackDbJson, "\t%s: {", track->track);
-if(tdbIsSuperTrackChild(track->tdb) || tdbIsCompositeChild(track->tdb))
-    dyStringPrintf(trackDbJson, "\n\t\tparentTrack: '%s',", track->tdb->parent->track);
-dyStringPrintf(trackDbJson, "\n\t\ttype: '%s',", track->tdb->type);
-if(sameWord(track->tdb->type, "remote") && trackDbSetting(track->tdb, "url") != NULL)
-    dyStringPrintf(trackDbJson, "\n\t\turl: '%s',", trackDbSetting(track->tdb, "url"));
-dyStringPrintf(trackDbJson, "\n\t\tshortLabel: '%s',\n\t\tlongLabel: '%s',\n\t\tcanPack: %d,\n\t\tvisibility: %d\n\t}",
-               javaScriptLiteralEncode(track->shortLabel), javaScriptLiteralEncode(track->longLabel), track->canPack, track->limitedVis);
-}
-#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-
 void printTrackInitJavascript(struct track *trackList)
 {
 hPrintf("<input type='hidden' id='%s' name='%s' value=''>\n", hgtJsCommand, hgtJsCommand);
@@ -4378,11 +4361,6 @@
 boolean showTrackControls = cartUsualBoolean(cart, "trackControlsOnMain", TRUE);
 long thisTime = 0, lastTime = 0;
 char *clearButtonJavascript;
-#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-struct dyString *trackDbJson = newDyString(1000);
-int trackDbJsonCount = 1;
-dyStringPrintf(trackDbJson, "<script>var trackDbJson = {\nruler: {shortLabel: 'ruler', longLabel: 'Base Position Controls', canPack: 0, visibility: %d}", rulerMode);
-#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
 
 basesPerPixel = ((float)winBaseCount) / ((float)insideWidth);
 zoomedToBaseLevel = (winBaseCount <= insideWidth / tl.mWidth);
@@ -4500,27 +4478,8 @@
 	    thisTime = clock1000();
 	    track->loadTime = thisTime - lastTime;
 	    }
-#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-	trackJson(trackDbJson, track, trackDbJsonCount++);
-	if (trackIsCompositeWithSubtracks(track))
-	    {
-	    struct track *subtrack;
-	    for (subtrack = track->subtracks;  subtrack != NULL; subtrack = subtrack->next)
-		{
-		// isSubtrackVisible is causing a problem in panTro2
-		if (isSubtrackVisible(subtrack))
-		    trackJson(trackDbJson, subtrack, trackDbJsonCount++);
 		}
 	    }
-#endif///defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-	}
-    }
-
-#if defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
-dyStringAppend(trackDbJson, "}\n</script>\n");
-if(!trackImgOnly)
-    hPrintf(dyStringContents(trackDbJson));
-#endif/// defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
 
 printTrackInitJavascript(trackList);