494ba676944a710a244db32fdc74f8ba01ff5148 tdreszer Thu Sep 9 10:40:02 2010 -0700 Cleaned up a lot of obsolete ifdefs, now that dragReorder and flatTracks are on the RR diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c index 4163a83..617982b 100644 --- src/hg/hgTracks/config.c +++ src/hg/hgTracks/config.c @@ -1,516 +1,512 @@ /* config - put up track and display configuration page. */ #include "common.h" #include "dystring.h" #include "cheapcgi.h" #include "htmshell.h" #include "hdb.h" #include "hCommon.h" #include "cart.h" #include "web.h" #include "customTrack.h" #include "hgTracks.h" #include "hgConfig.h" #include "jsHelper.h" #include "imageV2.h" #include "searchTracks.h" static void textSizeDropDown() /* Create drop down for font size. */ { static char *sizes[] = {"6", "8", "10", "12", "14", "18", "24", "34"}; hDropList(textSizeVar, sizes, ArraySize(sizes), tl.textSize); } -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI static void printGroupListHtml(char *groupCgiName, struct group *groupList, char *defaultGroup) /* Make an HTML select input listing the groups. */ { char *groups[128]; char *labels[128]; char *defaultLabel = NULL; int numGroups = 0; struct group *group = NULL; for (group = groupList; group != NULL; group = group->next) { groups[numGroups] = group->name; labels[numGroups] = group->name; if (sameWord(defaultGroup, groups[numGroups])) defaultLabel = groups[numGroups]; numGroups++; if (numGroups >= ArraySize(groups)) internalErr(); } cgiMakeDropListFull(groupCgiName, labels, groups, numGroups, defaultLabel, NULL); } -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI static void trackConfig(struct track *trackList, struct group *groupList, char *groupTarget, int changeVis) /* Put up track configurations. If groupTarget is * NULL then set visibility for tracks in all groups. Otherwise, * just set it for the given group. If vis is -2, then visibility is * unchanged. If -1 then set visibility to default, otherwise it should * be tvHide, tvDense, etc. */ { -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI char pname[512]; char gname[512]; -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI struct group *group; boolean showedRuler = FALSE; setRulerMode(); changeTrackVis(groupList, groupTarget, changeVis); /* Set up ruler mode according to changeVis. */ #ifdef BOB_DOESNT_LIKE if (changeVis != -2) { if (groupTarget == NULL || (groupList != NULL && sameString(groupTarget, groupList->name))) { if (changeVis == -1) rulerMode = tvFull; else rulerMode = changeVis; } } #endif /* BOB_DOESNT_LIKE */ jsInit(); cgiMakeHiddenVar(configGroupTarget, "none"); boolean isFirstNotCtGroup = TRUE; for (group = groupList; group != NULL; group = group->next) { struct trackRef *tr; if (group->trackList == NULL) continue; /* check if group section should be displayed */ char *otherState; char *indicator; char *indicatorImg; boolean isOpen = !isCollapsedGroup(group); collapseGroupGoodies(isOpen, FALSE, &indicatorImg, &indicator, &otherState); hTableStart(); hPrintf(""); hPrintf(""); hPrintf("\n",group->name); hPrintf("", collapseGroupVar(group->name),collapseGroupVar(group->name), (isOpen?0:1)); hPrintf("%s  ", hgTracksName(), cartSidUrlString(cart),collapseGroupVar(group->name), otherState, group->name, group->name, group->name, indicatorImg, indicator); hPrintf(" %s ", wrapWhiteFont(group->label)); hPrintf("   "); hPrintf("", configHideAll, "hide all", configGroupTarget, group->name, jsSetVerticalPosition("mainForm")); hPrintf(" "); hPrintf("", configShowAll, "show all", configGroupTarget, group->name, jsSetVerticalPosition("mainForm")); hPrintf(" "); hPrintf("", configDefaultAll, "default", configGroupTarget, group->name, jsSetVerticalPosition("mainForm")); hPrintf(" "); /* do not want all the submit buttons named the same. It is * confusing to the javascript submit() function. */ char submitName[256]; safef(submitName, sizeof(submitName), "%sSubmit", group->name); cgiMakeButton(submitName, "submit"); -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI if (withPriorityOverride) { hPrintf("      "); hPrintf("      "); hPrintf("      "); hPrintf("%s", wrapWhiteFont("Group Order: ")); } -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI if (withPriorityOverride) { hPrintf("\n"); safef(pname, sizeof(pname), "%s.priority",group->name); hDoubleVar(pname, (double)group->priority, 4); hPrintf("\n"); if (isOpen) hPrintf(" %s ", wrapWhiteFont("Group")); hPrintf("\n"); } -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); /* First non-CT group gets ruler. */ if (!showedRuler && isFirstNotCtGroup && differentString(group->name, "user")) { showedRuler = TRUE; hPrintf("",(isOpen ? "" : "style='display: none'"), group->name); hPrintf(""); hPrintf("", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), chromName, RULER_TRACK_NAME); hPrintf("%s", RULER_TRACK_LABEL); hPrintf(""); hPrintf(""); hTvDropDownClass("ruler", rulerMode, FALSE, rulerMode ? "normalText" : "hiddenText"); hPrintf(""); hPrintf(""); hPrintf("Chromosome position in bases. (Clicks here zoom in 3x)"); hPrintf(""); -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI if (withPriorityOverride) { hPrintf(""); hPrintf(""); hPrintf(""); hPrintf(""); } -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); } if (differentString(group->name, "user")) isFirstNotCtGroup = FALSE; /* Scan track list to determine which supertracks have visible member * tracks, and to insert a track in the list for the supertrack. * Sort tracks and supertracks together by priority */ groupTrackListAddSuper(cart, group); -#if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) if (!withPriorityOverride) -#endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) { /* sort hierarchically by priority, considering supertracks */ struct trackRef *refList = NULL, *ref; for (tr = group->trackList; tr != NULL; tr = tr->next) { struct track *track = tr->track; if (tdbIsSuperTrackChild(track->tdb)) /* ignore supertrack member tracks till supertrack is found */ continue; AllocVar(ref); ref->track = track; slAddTail(&refList, ref); if (tdbIsSuper(track->tdb)) { struct trackRef *tr2; for (tr2 = group->trackList; tr2 != NULL; tr2 = tr2->next) { char *parent = tr2->track->tdb->parentName; if (parent && sameString(parent, track->track)) { AllocVar(ref); ref->track = tr2->track; slAddTail(&refList, ref); } } } } group->trackList = refList; } /* Loop through this group and display */ int rowCount=1; for (tr = group->trackList; tr != NULL; tr = tr->next) { struct track *track = tr->track; struct trackDb *tdb = track->tdb; hPrintf("",(isOpen ? "" : "style='display: none'"),group->name, rowCount++); hPrintf(""); if (tdbIsSuperTrackChild(tdb)) /* indent members of a supertrack */ hPrintf("    "); if(trackDbSetting(track->tdb, "wgEncode") != NULL) hPrintf("\n"); if (track->hasUi) hPrintf("", tdb->parent ? "TITLE=\"Part of super track: " : "", tdb->parent ? tdb->parent->shortLabel : "", tdb->parent ? "...\"" : "", hgTrackUiName(), cartSessionVarName(), cartSessionId(cart), track->track); hPrintf(" %s", track->shortLabel); if (tdbIsSuper(track->tdb)) hPrintf("..."); if (track->hasUi) hPrintf(""); hPrintf(""); hPrintf(""); if (tdbIsSuperTrackChild(tdb)) /* indent members of a supertrack */ hPrintf("    "); /* If track is not on this chrom print an informational message for the user. */ if (hTrackOnChrom(track->tdb, chromName)) { if (tdbIsSuper(track->tdb)) { /* supertrack dropdown is hide/show */ superTrackDropDown(cart, track->tdb, 1); } else { /* check for option of limiting visibility to one mode */ hTvDropDownClassVisOnly(track->track, track->visibility, track->canPack, (track->visibility == tvHide) ? "hiddenText" : "normalText", trackDbSetting(track->tdb, "onlyVisibility")); } } else hPrintf("[No data-%s]", chromName); hPrintf(""); hPrintf(""); hPrintf("%s", track->longLabel); hPrintf(""); -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI if (withPriorityOverride) { hPrintf(""); safef(pname, sizeof(pname), "%s.priority",track->track); hDoubleVar(pname, (double)track->priority, 4); hPrintf(""); hPrintf("\n"); /* suppress group pull-down for supertrack members */ if (tdbIsSuperTrackChild(track->tdb)) hPrintf(" "); else { safef(gname, sizeof(gname), "%s.group",track->track); printGroupListHtml(gname, groupList, track->groupName); } hPrintf(""); } -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); } hTableEnd(); hPrintf("
"); } } void configPageSetTrackVis(int vis) /* Do config page after setting track visibility. If vis is -2, then visibility * is unchanged. If -1 then set visibility to default, otherwise it should * be tvHide, tvDense, etc. */ { struct dyString *title = dyStringNew(0); char *groupTarget = NULL; struct track *trackList = NULL; struct track *ideoTrack = NULL; struct group *groupList = NULL; -#if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) withPriorityOverride = cartUsualBoolean(cart, configPriorityOverride, FALSE); -#endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) /* Get track list and group them. */ ctList = customTracksParseCart(database, cart, &browserLines, &ctFileName); trackList = getTrackList(&groupList, vis); /* The ideogram for some reason is considered a track. * We don't really want to process it as one though, so * we see if it's there, and if necessary remove it. */ ideoTrack = chromIdeoTrack(trackList); if (ideoTrack != NULL) removeTrackFromGroup(ideoTrack); /* Fetch group to change on if any from CGI, * and remove var so it doesn't get used again. */ groupTarget = cloneString(cartUsualString(cart, configGroupTarget, "")); cartRemove(cart, configGroupTarget); if (sameString(groupTarget, "none")) freez(&groupTarget); dyStringPrintf(title, "Configure Image"); hPrintf("
\n", hgTracksName(), cartUsualString(cart, "formMethod", "POST")); webStartWrapperDetailedNoArgs(cart, database, "", title->string, FALSE, FALSE, FALSE, FALSE); cartSaveSession(cart); hPrintf(""); /* do not want all the submit buttons named the same thing, this one is: */ cgiMakeButton("topSubmit", "submit"); // 3 column table hPrintf("\n"); hPrintf(""); hPrintf(""); hPrintf("
"); hTableStart(); if (ideoTrack != NULL) { hPrintf("\n"); } hPrintf("\n"); hPrintf("\n"); hPrintf("\n"); hPrintf("\n"); hPrintf("\n"); hPrintf("\n"); -#ifndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#ifdef PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); -#endif///ndef IMAGEv2_DRAG_REORDER_NOPRIORITY +#endif///def PRIORITY_CHANGES_IN_CONFIG_UI hPrintf("\n"); hTableEnd(); char *freeze = hFreezeFromDb(database); char buf[128]; if (stringIn(database, freeze)) safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s", organization, browserName, organism, freeze); else safef(buf, sizeof buf, "Configure Tracks on %s %s: %s %s (%s)", organization, browserName, organism, freeze, database); webNewSection(buf); hPrintf("Tracks: "); if(isSearchTracksSupported(database)) { cgiMakeButton(searchTracks, "find"); hPrintf(" "); } cgiMakeButton(configHideAll, "hide all"); hPrintf(" "); cgiMakeButton(configShowAll, "show all"); hPrintf(" "); cgiMakeButton(configDefaultAll, "default"); hPrintf("   Groups: "); hButtonWithOnClick("hgt.collapseGroups", "collapse all", "collapse all track groups", "return setAllTrackGroupVisibility(false)"); hPrintf(" "); hButtonWithOnClick("hgt.expandGroups", "expand all", "expand all track groups", "return setAllTrackGroupVisibility(true)"); hPrintf("

Control track and group visibility more selectively below.

"); trackConfig(trackList, groupList, groupTarget, vis); dyStringFree(&title); freez(&groupTarget); webEndSectionTables(); hPrintf(""); } void configPage() /* Put up configuration page. */ { configPageSetTrackVis(-2); } boolean advancedJavascriptFeaturesEnabled(struct cart *cart) // Returns TRUE if advanced javascript features are currently enabled { static boolean alreadyLookedForadvancedJs = FALSE; static boolean advancedJsEnabled = FALSE; if(!alreadyLookedForadvancedJs) { char *ua = cgiUserAgent(); boolean defaultVal = TRUE; // dragZooming was broken in version 530.4 of AppleWebKit browsers (used by Safari, Chrome and some other browsers). // This was explicitly fixed by the WebKit team in version 531.0.1 (see http://trac.webkit.org/changeset/45143). // The AppleWebKit version provided by the browser in user agent doesn't always include the minor version number, so to // be overly conservative we default drag-and-drop to off when AppleWebKit major version == 530 if(ua != NULL) { char *needle = "AppleWebKit/"; char *ptr = strstr(ua, needle); if(ptr != NULL) { int version = 0; sscanf(ptr + strlen(needle), "%d", &version); defaultVal = (version != 530); } } advancedJsEnabled = cartUsualBoolean(cart, "enableAdvancedJavascript", defaultVal); alreadyLookedForadvancedJs = TRUE; } //else // warn("already looked up advancedJsEnabled"); // got msg 41 times in one page! return advancedJsEnabled; }

image width:"); hPrintf(""); hIntVar("pix", tl.picWidth, 4); hPrintf("pixels
label area width:"); hPrintf(""); hIntVar("hgt.labelWidth", leftLabelWidthChars, 2); hPrintf("characters
text size:"); hPrintf(""); textSizeDropDown(); hPrintf(""); if (trackLayoutInclFontExtras()) { char *defaultStyle = cartUsualString(cart, "fontType", "medium"); cartMakeRadioButton(cart, "fontType", "medium", defaultStyle); hPrintf(" medium "); cartMakeRadioButton(cart, "fontType", "fixed", defaultStyle); hPrintf(" fixed "); cartMakeRadioButton(cart, "fontType", "bold", defaultStyle); hPrintf(" bold "); hPrintf(" "); } hPrintf("
"); hCheckBox("ideogram", cartUsualBoolean(cart, "ideogram", TRUE)); hPrintf(""); hPrintf("Display chromosome ideogram above main graphic"); hPrintf("
"); hCheckBox("guidelines", cartUsualBoolean(cart, "guidelines", TRUE)); hPrintf(""); hPrintf("Show light blue vertical guidelines"); hPrintf("
"); hCheckBox("leftLabels", cartUsualBoolean(cart, "leftLabels", TRUE)); hPrintf(""); hPrintf("Display labels to the left of items in tracks"); hPrintf("
"); hCheckBox("centerLabels", cartUsualBoolean(cart, "centerLabels", TRUE)); hPrintf(""); hPrintf("Display description above each track"); hPrintf("
"); hCheckBox("trackControlsOnMain", cartUsualBoolean(cart, "trackControlsOnMain", TRUE)); hPrintf(""); hPrintf("Show track controls under main graphic"); hPrintf("
"); hCheckBox("nextItemArrows", cartUsualBoolean(cart, "nextItemArrows", FALSE)); hPrintf(""); hPrintf("Next/previous item navigation"); hPrintf("
"); hCheckBox("nextExonArrows", cartUsualBoolean(cart, "nextExonArrows", TRUE)); hPrintf(""); hPrintf("Next/previous exon navigation"); hPrintf("
"); char *javascript="onClick=\"document.mainForm.hgTracksConfigPage.value='configure';document.mainForm.submit();\""; hCheckBoxJS(configPriorityOverride, cartUsualBoolean(cart, configPriorityOverride , FALSE), javascript); hPrintf(""); hPrintf("Enable track re-ordering"); hPrintf("
"); hCheckBox("enableAdvancedJavascript", advancedJavascriptFeaturesEnabled(cart)); hPrintf(""); hPrintf("Enable advanced javascript features"); hPrintf("