3b0398668f40703ec7342f657267c312a011a2bb braney Wed Oct 19 13:09:55 2022 -0700 add sum mode to the possible windowing methods for wiggles. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 6f61093..2a5bbb0 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -1802,30 +1802,31 @@ void chainColorDropDown(char *var, char *curVal) /* Make drop down of options. */ { cgiMakeDropList(var, chainColorOptions, ArraySize(chainColorOptions), curVal); } /****** Options for the wiggle track Windowing *******/ static char *wiggleWindowingOptions[] = { "mean+whiskers", "maximum", "mean", "minimum", + "sum", }; enum wiggleWindowingEnum wiggleWindowingStringToEnum(char *string) /* Convert from string to enum representation. */ { int x = stringIx(string, wiggleWindowingOptions); if (x < 0) errAbort("hui::wiggleWindowingStringToEnum() - Unknown option %s", string); return x; } char *wiggleWindowingEnumToString(enum wiggleWindowingEnum x) /* Convert from enum to string representation. */ { return wiggleWindowingOptions[x]; @@ -5858,31 +5859,31 @@ boolean option = cartOrTdbBoolean(cart, tdb, "doWiggle", FALSE); char varName[1024]; safef(varName, sizeof(varName), "%s.doWiggle", name); cgiMakeCheckBox(varName, option); printf("<BR>\n"); char *style = option ? "display:block" : "display:none"; printf("<DIV ID=\"densGraphOptions\" STYLE=\"%s\">\n", style); // we need to fool the wiggle dialog into defaulting to autoscale and maximum char *origType = tdb->type; tdb->type = "bedGraph"; if (hashFindVal(tdb->settingsHash, AUTOSCALE) == NULL) hashAdd(tdb->settingsHash, AUTOSCALE, "on"); if (hashFindVal(tdb->settingsHash, WINDOWINGFUNCTION) == NULL) - hashAdd(tdb->settingsHash, WINDOWINGFUNCTION, wiggleWindowingEnumToString( wiggleWindowingMax)); + hashAdd(tdb->settingsHash, WINDOWINGFUNCTION, wiggleWindowingEnumToString( wiggleWindowingMean)); wigCfgUi(cart,tdb,name,title,TRUE); tdb->type = origType; printf("</DIV>\n\n"); jsInlineF("$(\"input[name='%s']\").click( function() { $('#densGraphOptions').toggle();} );\n" , varName); // XSS FILTER? } void wiggleScaleDropDownJavascript(char *name) /* print some js that deactivates the min/max range if autoscaling is activated */ { struct dyString *dy = dyStringNew(1024); dyStringPrintf(dy, " $(\"[name='%s.autoScale']\").change(function()\n", name); dyStringPrintf(dy, " {\n"); dyStringPrintf(dy, " val= $(this).find(':selected').val(); \n"); dyStringPrintf(dy, " if (val!=\"use vertical viewing range setting\")\n");