74c4f40fb0f7d09717be5a5ff61b1107123d617a larrym Tue Nov 30 13:48:40 2010 -0800 add kindOfParent to ruler trackDbJson (fixes problem where ruler wasn't getting a modal config dialog) diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index 5318a3f..c66816c 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -239,31 +239,31 @@ kindOfChild = kocCompositeChild; else if (tdbIsMultiTrackChild(tdb)) kindOfChild = kocMultiTrackChild; return kindOfChild; } ///////////////////////// // JSON support. Eventually the whole imgTbl could be written out as JSON void jsonTdbSettingsBuild(struct dyString **jsonTdbSettingsString, struct track *track, boolean configurable) // Creates then successively adds trackDb settings to the jsonTdbSettingsString // Initially pass in NULL pointer to a dyString to properly begin building { if (*jsonTdbSettingsString==NULL) { *jsonTdbSettingsString = newDyString(1024); - dyStringPrintf(*jsonTdbSettingsString, "<!-- trackDbJson -->\n<script>var trackDbJson = {\n\"ruler\": {\"shortLabel\": \"ruler\", \"longLabel\": \"Base Position Controls\", \"canPack\": 0, \"visibility\": %d},\n", rulerMode); + dyStringPrintf(*jsonTdbSettingsString, "<!-- trackDbJson -->\n<script>var trackDbJson = {\n\"ruler\": {\"shortLabel\": \"ruler\", \"longLabel\": \"Base Position Controls\", \"canPack\": 0, \"visibility\": %d, \"configureBy\": \"popup\", \"kindOfParent\": 0},\n", rulerMode); } else dyStringAppend(*jsonTdbSettingsString, ",\n"); // track name and type dyStringPrintf(*jsonTdbSettingsString, "\t\"%s\": {", track->track); dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"type\": \"%s\",", track->tdb->type); // Tell which kind of parent and which kind of child enum kindOfParent kindOfParent = tdbKindOfParent(track->tdb); enum kindOfChild kindOfChild = tdbKindOfChild(track->tdb); dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"kindOfParent\": %d,\n\t\t\"kindOfChild\": %d,",kindOfParent,kindOfChild); // Tell something about the parent and/or children if (kindOfChild != kocOrphan)