c80e398658551ac68d8b01bcfa9bf48b0e00b102 larrym Fri Dec 10 14:02:56 2010 -0800 modify configureBy defaults to cover more snp tracks diff --git src/hg/hgTracks/imageV2.c src/hg/hgTracks/imageV2.c index 5d79422..c4e8612 100644 --- src/hg/hgTracks/imageV2.c +++ src/hg/hgTracks/imageV2.c @@ -277,31 +277,31 @@ dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"parentTrack\": \"%s\",\n\t\t\"parentLabel\": \"%s\",", parentTdb->track, javaScriptLiteralEncode(parentTdb->shortLabel)); if (kindOfChild != kocFolderContent && !track->canPack) { dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"shouldPack\": 0,"); // default vis is full, but pack is an option track->canPack = parentTdb->canPack; } } dyStringPrintf(*jsonTdbSettingsString, "\n\t\t\"hasChildren\": %d,", slCount(track->tdb->subtracks)); // 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")) + 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,", 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); } @@ -1796,34 +1796,34 @@ useMap = imageMapDraw(map,name); else if(slice->link != NULL) { if(skipToSpaces(slice->link) != NULL) hPrintf(" <A HREF=%s",slice->link); else hPrintf(" <A HREF='%s'",slice->link); if (slice->title != NULL) { if (sliceType == stButton) { enum browserType browser = cgiClientBrowser(NULL,NULL,NULL); char *newLine = NEWLINE_TO_USE(browser); char *ellipsis = ELLIPSIS_TO_USE(browser); if(imgTrack->reorderable) - hPrintf(" TITLE='%s%sclick to configure%s%sdrag to reorder%s'",htmlEncode(slice->title), newLine, + hPrintf(" TITLE='%s%sclick or right click to configure%s%sdrag to reorder%s'",htmlEncode(slice->title), newLine, ellipsis, newLine,(tdbIsCompositeChild(imgTrack->tdb)?" highlighted subtrack":"") ); else - hPrintf(" TITLE='%s%sclick to configure%s'",htmlEncode(slice->title), newLine, ellipsis); + hPrintf(" TITLE='%s%sclick or right click to configure%s'",htmlEncode(slice->title), newLine, ellipsis); } else hPrintf(" TITLE='Click for: 
%s'", htmlEncode(slice->title) ); } hPrintf(">\n" ); } imageDraw(imgBox,imgTrack,slice,name,offsetX,offsetY,useMap); if(slice->link != NULL) hPrintf("</A>"); if(slice->parentImg) hPrintf("</div>"); }