353c944fde8bc6cb69b56eb6caa80a20a5c60921 kate Wed Aug 9 12:51:33 2017 -0700 Disable autoScale feature for now. MaxHeightPixels seems enough for now to address user scaling issues, and autoScale is confusing. refs #19867 diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c index c9a2679..fe24a1f 100644 --- src/hg/lib/barChartUi.c +++ src/hg/lib/barChartUi.c @@ -126,36 +126,40 @@ return BAR_CHART_MAX_LIMIT_DEFAULT; } 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; +#ifdef AUTO_SCALE +// Implemented, but leaving out for now (seems confusing) puts("  "); puts("Autoscale:\n"); safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_AUTOSCALE); -boolean isAutoScale = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_AUTOSCALE_DEFAULT); +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, round(barChartUiMaxMedianScore(tdb))); } void barChartUiFetchMinMaxPixels(struct cart *cart, struct trackDb *tdb, int *retMin, int *retMax, int *retDefault, int *retCurrent)