18114c799ed1df9bc555b832ca21008c5bb63b45
kate
  Wed Jul 26 11:02:54 2017 -0700
Add autoscale feature. refs #19867

diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c
index f424dc2..b5cfcbe 100644
--- src/hg/lib/barChartUi.c
+++ src/hg/lib/barChartUi.c
@@ -101,68 +101,68 @@
         catSel->checked = TRUE;
     else
         catSel->checked = (hashLookup(checkHash, categ->name) != NULL);
     slAddHead(&all, catSel);
     }
 slReverse(&all);
 makeGroupCheckboxes(name, NULL, all);
 puts("</tr></table>");
 char buf[512];
 safef(buf, sizeof(buf), "%s%s", cgiMultListShadowPrefix(), name);
 cgiMakeHiddenVar(buf, "0");
 }
 
 /* Convenience functions for hgTrackUi */
 
-void barChartUiLogTransform(struct cart *cart, char *track, struct trackDb *tdb)
-/* Checkbox to select log-transformed RPKM values */
-/* NOTE: this code from gtexUi.c.  Consider sharing. */
-{
-char cartVar[1024];
-puts("<b>Log10(x+1) transform:</b>\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, "barChartUiTransformChanged('%s');", track);
-}
-
 double barChartUiMaxMedianScore(struct trackDb *tdb)
 /* Max median score, for scaling */
 {
 char *setting = trackDbSettingClosestToHome(tdb, BAR_CHART_MAX_LIMIT);
 if (setting != NULL)
     {
     double max = sqlDouble(setting);
     if (max > 0.0)
         return max;
     }
 return BAR_CHART_MAX_LIMIT_DEFAULT;
 }
 
-void barChartUiViewLimits(struct cart *cart, char *track, struct trackDb *tdb)
-/* Set viewing limits if log transform not checked */
-/* NOTE: this code from gtexUi.c.  Consider sharing. */
+void barChartUiViewTransform(struct cart *cart, char *track, struct trackDb *tdb)
+/* Checkboxes to select log-transform or autoscale RPKM values, or text input for view limits */
 {
-char cartVar[1024];
 char buf[512];
+char cartVar[1024];
+puts("<b>Log10(x+1) transform:</b>\n");
 safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_LOG_TRANSFORM);
 boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_LOG_TRANSFORM_DEFAULT);
-safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, isLogTransform ? "disabled" : "");
+cgiMakeCheckBoxWithId(cartVar, isLogTransform, cartVar);
+jsOnEventByIdF("change", cartVar, "barChartTransformChanged(event);");
+
+puts("&nbsp;&nbsp;");
+puts("<b>Autoscale:</b>\n");
+safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_AUTOSCALE);
+boolean isAutoScale = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_AUTOSCALE_DEFAULT);
+cgiMakeCheckBoxWithId(cartVar, isAutoScale, cartVar);
+jsOnEventByIdF("change", cartVar, "barChartTransformChanged(event);");
+
+boolean isViewLimits = !isAutoScale && !isLogTransform;
+safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, !isViewLimits ? "disabled" : "");
+puts("&nbsp;&nbsp;");
 printf("<span class='%s'><b>View limits maximum:</b></span>\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, isLogTransform ? "disabled" : "");
+cgiMakeIntVarWithExtra(cartVar, viewMax, 4, !isViewLimits ? "disabled" : "");
 char *unit = trackDbSettingClosestToHomeOrDefault(tdb, BAR_CHART_UNIT, "");
 printf("<span class='%s'> %s (range 0-%d)</span>\n", buf, unit, 
                                 round(barChartUiMaxMedianScore(tdb)));
 }
 
 struct barChartCategory *barChartUiGetCategories(char *database, struct trackDb *tdb)
 /* Get category colors and descriptions.  Use barChartColors setting if present.
    If not, if there is a barChartBars setting, assign rainbow colors.
  * O/w look for a table naed track+Category, and use labels and colors there 
  */
 {
 struct barChartCategory *categs = NULL;
 char *words[BAR_CHART_MAX_CATEGORIES];
 char *colorWords[BAR_CHART_MAX_CATEGORIES];
 char *labels = trackDbSettingClosestToHome(tdb, BAR_CHART_CATEGORY_LABELS);
@@ -245,39 +245,33 @@
 
 void barChartCfgUi(char *database, struct cart *cart, struct trackDb *tdb, char *track, 
                         char *title, boolean boxed)
 /* Bar chart track type */
 {
 if (cartVarExists(cart, "ajax"))
     isPopup = TRUE;
 boxed = cfgBeginBoxAndTitle(tdb, boxed, title);
 if (startsWith("big", tdb->type))
     labelCfgUi(database, cart, tdb);
 printf("\n<table id=barChartControls style='font-size:%d%%' %s>\n<tr><td>", 
         isPopup ? 75 : 100, boxed ?" width='100%'":"");
 
 char cartVar[1024];
 
-/* Data transform. When selected, the next control (view limits max) is disabled */
-
+/* Data transform (log, autoscale or viewlimits) */
 puts("<div>");
-barChartUiLogTransform(cart, track, tdb);
-
-/* Viewing limits max.  This control is disabled if log transform is selected */
-// construct class so JS can toggle
-puts("&nbsp;&nbsp;");
-barChartUiViewLimits(cart, track, tdb);
+barChartUiViewTransform(cart, track, tdb);
 puts("</div>");
 
 /* Category filter */
 printf("<br>");
 char *categoryLabel =  trackDbSettingClosestToHomeOrDefault(tdb, 
                     BAR_CHART_CATEGORY_LABEL, BAR_CHART_CATEGORY_LABEL_DEFAULT);
 char *db = cartString(cart, "db");
 struct barChartCategory *categs = barChartUiGetCategories(db, tdb);
 printf("<div><b>%s:</b>\n", categoryLabel);
 safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_CATEGORY_SELECT);
 if (isPopup)
     {
     printf("<a href='%s?g=%s'><button type='button'>Change</button><a>", 
                 hTrackUiForTrack(track), track);
     }