bf397954c17194c248df5bcacf1eecca545084b3
kate
Wed Aug 23 12:16:22 2017 -0700
Restore autoscale control, by request of ChrisL. refs #19872
diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c
index 921bc3f..00056f5 100644
--- src/hg/lib/barChartUi.c
+++ src/hg/lib/barChartUi.c
@@ -127,34 +127,35 @@
}
void barChartUiViewTransform(struct cart *cart, struct trackDb *tdb)
/* Checkboxes to select log-transform or autoscale RPKM values, or text input for view limits */
{
char *track = tdb->track;
char buf[512];
char cartVar[1024];
puts("Log10(x+1) transform:\n");
safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_LOG_TRANSFORM);
boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_LOG_TRANSFORM_DEFAULT);
cgiMakeCheckBoxWithId(cartVar, isLogTransform, cartVar);
jsOnEventByIdF("change", cartVar, "barChartTransformChanged(event);");
boolean isAutoScale = FALSE;
+#define AUTO_SCALE
#ifdef AUTO_SCALE
// Implemented, but leaving out for now (seems confusing)
puts(" ");
-puts("Autoscale:\n");
+puts("Auto-scale:\n");
safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_AUTOSCALE);
isAutoScale = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_AUTOSCALE_DEFAULT);
cgiMakeCheckBoxWithId(cartVar, isAutoScale, cartVar);
jsOnEventByIdF("change", cartVar, "barChartTransformChanged(event);");
#endif
boolean isViewLimits = !isAutoScale && !isLogTransform;
safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, !isViewLimits ? "disabled" : "");
puts(" ");
printf("View limits maximum:\n", buf);
safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_MAX_VIEW_LIMIT);
int viewMax = cartCgiUsualInt(cart, cartVar, BAR_CHART_MAX_VIEW_LIMIT_DEFAULT);
cgiMakeIntVarWithExtra(cartVar, viewMax, 4, !isViewLimits ? "disabled" : "");
char *unit = trackDbSettingClosestToHomeOrDefault(tdb, BAR_CHART_UNIT, "");
printf(" %s (range 0-%d)\n", buf, unit,