084ff19da15f2ec5e61464cc413754fb759e4a36 larrym Sun Dec 5 21:46:13 2010 -0800 add limitedVis to trackDbJson diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index c66816c..cd77c7b 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -282,32 +282,35 @@ // Configuring? if (!configurable || track->hasUi == FALSE) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"none\","); else if (sameString(trackDbSettingClosestToHomeOrDefault(track->tdb, "configureByPopup", matchRegex(track->track, "^snp[0-9]+$") || matchRegex(track->track, "^cons[0-9]+way") || matchRegex(track->track, "^multiz") ? "off" : "on"), "off")) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"clickThrough\","); else dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"configureBy\": \"popup\","); // Remote access by URL? if (sameWord(track->tdb->type, "remote") && trackDbSetting(track->tdb, "url") != NULL) dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"url\": \"%s\",", trackDbSetting(track->tdb, "url")); // Close with some standard vars -dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"shortLabel\": \"%s\",\n\t\t\"longLabel\": \"%s\",\n\t\t\"canPack\": %d,\n\t\t\"visibility\": %d\n\t}", - javaScriptLiteralEncode(track->shortLabel), javaScriptLiteralEncode(track->longLabel), track->canPack, track->limitedVis); +dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"shortLabel\": \"%s\",\n\t\t\"longLabel\": \"%s\",\n\t\t\"canPack\": %d,", + javaScriptLiteralEncode(track->shortLabel), javaScriptLiteralEncode(track->longLabel), track->canPack); +if(track->limitedVis != track->visibility) + dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"limitedVis\": %d,", track->limitedVis); +dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"visibility\": %d\n\t}", track->visibility); } char *jsonTdbSettingsUse(struct dyString **jsonTdbSettingsString) // Closes and returns the contents of the jsonTdbSettingsString { dyStringAppend(*jsonTdbSettingsString, "}\n</script>\n<!-- trackDbJson -->\n"); return dyStringCannibalize(jsonTdbSettingsString); } ///////////////////////// // IMAGEv2 // The new way to do images: PLEASE REFER TO imageV2.h FOR A DETAILED DESCRIPTION /////////////////////////