5ea40f8b2a94c54e3a76e6b9a813f0db928eba90
kate
  Wed Feb 1 15:52:04 2017 -0800
Further work on details page for barchart. refs #18736

diff --git src/hg/lib/barChartUi.c src/hg/lib/barChartUi.c
index e0d8821..3c4190c 100644
--- src/hg/lib/barChartUi.c
+++ src/hg/lib/barChartUi.c
@@ -1,67 +1,70 @@
 /* Bar chart track controls */
 
 /* Copyright (C) 2015 The Regents of the University of California 
  * See README in this or parent directory for licensing information. */
 
 #include "cheapcgi.h"
 #include "cart.h"
 #include "hui.h"
 #include "trackDb.h"
 #include "jsHelper.h"
 #include "hCommon.h"
+#include "rainbow.h"
 #include "barChartCategory.h"
 #include "barChartUi.h"
 
 /* Restrict features on right-click (popup) version */
 static boolean isPopup = FALSE;
 
 /* Convenience functions for category filter controls */
 
 
-static char *makeCategoryLabel(struct barChartCategory *categ)
-{
+char *makeCategoryLabel(struct barChartCategory *categ)
 /* Display category color and label */
+{
 char buf[256];
 safef(buf, sizeof(buf), "<td class='bcColorPatch' bgcolor=%X></td>"
                         "<td>&nbsp;%s</td>", 
                                 categ->color, categ->label);
 return(cloneString(buf));
 }
 
 struct categorySelect
     {
     struct categorySelect *next;
     char *name;
     char *label;
     boolean checked;
     };
 
 static void makeGroupCheckboxes(char *name, char *title, struct categorySelect *selects)
 {
+//TODO: select this based on #categories
+#define TABLE_COLUMNS 1
 if (title != NULL)
     printf("<tr><td colspan=10><i><b>%s</b></i></td></tr><tr>\n", title);
 int count = slCount(selects);
 struct categorySelect **categArray;
 AllocArray(categArray, count);
 int i=0;
 struct categorySelect *sel;
 for (i=0, sel = selects; sel != NULL; sel = sel->next, i++)
     categArray[i] = sel;
 int col=0;
 int row=0;
-int tableColumns=3;
+int tableColumns=1;
 for (i=0; i<count; i++)
     {
     int j = row + col*(count/tableColumns+1);
     if (j>=count)
         {
         printf("</tr><tr>");
         row++;
         col = 0;
         }
     j = row + col*(count/tableColumns+1);
     if (!isPopup)
         {
         printf("<td><input type=checkbox name=\"%s\" value=\"%s\" %s></td>" "<td>%s</td>\n",
                name, categArray[j]->name, categArray[j]->checked ? "checked" : "", categArray[j]->label);
         }
@@ -73,31 +76,31 @@
 printf("</tr><tr><td></td></tr>\n");
 }
 
 static void makeCategoryCheckboxes(char *name, struct barChartCategory *categs, 
                                         struct slName *checked)
 {
 // TODO: use style sheet!
 puts("<style>\n");
 puts(".bcColorPatch { padding: 0 10px; }\n");
 puts("</style>\n");
 
 struct hash *checkHash = hashNew(0);
 struct slName *sel;
 for (sel = checked; sel != NULL; sel = sel->next)
     hashAdd(checkHash, sel->name, sel->name);
-puts("<table borderwidth=0 cellspacing=4><tr>");
+puts("<table borderwidth=0 cellpadding=1 cellspacing=4><tr>");
 struct categorySelect *catSel;
 struct barChartCategory *categ;
 struct categorySelect *all = NULL;
 for (categ = categs; categ != NULL; categ = categ->next)
     {
     AllocVar(catSel);
     catSel->name = categ->name;
     catSel->label = makeCategoryLabel(categ);
     if (hashNumEntries(checkHash) == 0)
         catSel->checked = TRUE;
     else
         catSel->checked = (hashLookup(checkHash, categ->name) != NULL);
     slAddHead(&all, catSel);
     }
 slReverse(&all);
@@ -131,30 +134,99 @@
 
 void barChartUiViewLimits(struct cart *cart, char *track, struct trackDb *tdb)
 /* Set viewing limits if log transform not checked */
 {
 char cartVar[1024];
 char buf[512];
 boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, BAR_CHART_LOG_TRANSFORM_DEFAULT);
 safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, isLogTransform ? "disabled" : "");
 printf("<span class='%s'><b>View limits maximum:</b></span>\n", buf);
 safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_MAX_LIMIT);
 int viewMax = cartCgiUsualInt(cart, cartVar, BAR_CHART_MAX_LIMIT_DEFAULT);
 cgiMakeIntVarWithExtra(cartVar, viewMax, 4, isLogTransform ? "disabled" : "");
 printf("<span class='%s'> (range 0-%d)</span>\n", buf, round(barChartUiMaxMedianScore()));
 }
 
+char *barChartUiGetLabel(char *database, struct trackDb *tdb)
+/* Get label for category list */
+{
+return trackDbSettingClosestToHomeOrDefault(tdb, BAR_CHART_CATEGORY_LABEL, 
+                                        BAR_CHART_CATEGORY_LABEL_DEFAULT);
+}
+
+struct barChartCategory *barChartUiGetCategories(char *database, struct trackDb *tdb)
+/* Get category colors and descriptions.  If barChartLabel setting contains label list, assign rainbow colors.
+ * O/w look for a table naed track+Category, and use labels and colors there */
+{
+static struct barChartCategory *categs;
+
+if (categs != NULL)
+    return categs;
+
+char *words[BAR_CHART_MAX_CATEGORIES];
+char *labels = trackDbSettingClosestToHome(tdb, BAR_CHART_CATEGORY_LABELS);
+struct barChartCategory *categ = NULL;
+
+if (!labels)
+    {
+    categs = barChartGetCategories(database, tdb->table);
+    }
+else
+    {
+    int count = chopLine(cloneString(labels), words);
+    struct rgbColor *rainbow = getRainbow(&saturatedRainbowAtPos, count);
+    int i;
+    char buf[6];
+    for (i=0; i<count; i++)
+        {
+        AllocVar(categ);
+        categ->id = i;
+        safef(buf, sizeof buf, "%d", i);
+        categ->name = cloneString(buf);
+        categ->label = words[i];
+        categ->color = ((rainbow[i].r & 0xff)<<16) + 
+                        ((rainbow[i].g & 0xff)<<8) + 
+                        ((rainbow[i].b & 0xff));
+        slAddHead(&categs, categ);
+        }
+    slReverse(&categs);
+    }
+return categs;
+}
+
+struct barChartCategory *barChartUiGetCategoryById(int id, char *database, 
+                                                        struct trackDb *tdb)
+/* Get category info by id */
+{
+struct barChartCategory *categ;
+struct barChartCategory *categs = barChartUiGetCategories(database, tdb);
+// TODO: consider making this more efficient
+for (categ = categs; categ != NULL; categ = categ->next)
+    if (categ->id == id)
+        return categ;
+return NULL;
+}
+
+char *barChartUiGetCategoryLabelById(int id, char *database, struct trackDb *tdb)
+/* Get label for a category id */
+{
+struct barChartCategory *categ = barChartUiGetCategoryById(id, database, tdb);
+if (categ == NULL)
+    return "Unknown";
+return categ->label;
+}
+
 void barChartCfgUi(char *database, struct cart *cart, struct trackDb *tdb, char *track, 
                         char *title, boolean boxed)
 /* Bar chart track type */
 {
 
 jsIncludeFile("barChart.js", NULL);
 if (cartVarExists(cart, "ajax"))
     isPopup = TRUE;
 boxed = cfgBeginBoxAndTitle(tdb, boxed, title);
 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 */
@@ -171,44 +243,41 @@
 /* Color scheme */
 #ifdef COLOR_SCHEME
 printf("<p><b>Category colors:</b>\n");
 safef(cartVar, sizeof(cartVar), "%s.%s", track, BAR_CHART_COLORS);
 selected = cartCgiUsualString(cart, cartVar, BAR_CHART_COLORS_DEFAULT); 
 boolean isUserColors = sameString(selected, BAR_CHART_COLORS_USER);
 cgiMakeRadioButton(cartVar, BAR_CHART_COLORS_USER, isUserColors);
 printf("Defined\n");
 cgiMakeRadioButton(cartVar, BAR_CHART_COLORS_RAINBOW, !isUserColors);
 printf("Rainbow\n");
 printf("</p>");
 #endif
 
 /* Category filter */
 printf("<br>");
-// TODO: 
-#define BAR_CHART_CATEGORY_LABEL        "categoryLabel"
-#define BAR_CHART_CATEGORY_LABEL_DEFAULT        "Categories"
 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);
     }
 else
     {
     jsMakeCheckboxGroupSetClearButton(cartVar, TRUE);
     puts("&nbsp;");
     jsMakeCheckboxGroupSetClearButton(cartVar, FALSE);
     }
 printf("</div>");
-char *db = cartString(cart, "db");
-struct barChartCategory *categs = barChartGetCategories(db, track);
 struct slName *selectedValues = NULL;
 if (cartListVarExistsAnyLevel(cart, tdb, FALSE, BAR_CHART_CATEGORY_SELECT))
     selectedValues = cartOptionalSlNameListClosestToHome(cart, tdb, FALSE, BAR_CHART_CATEGORY_SELECT);
 makeCategoryCheckboxes(cartVar, categs, selectedValues);
 
 puts("\n</table>\n");
 cfgEndBox(boxed);
 }