01604ed6994a215869109ecc9645f702bdf8f533
Merge parents fbe150e 1db81dc
kate
  Wed Mar 30 12:48:55 2016 -0700
Merge master, fix conflict.

diff --cc src/hg/lib/gtexUi.c
index d11b04f,f99168b..db6381b
--- src/hg/lib/gtexUi.c
+++ src/hg/lib/gtexUi.c
@@@ -279,42 -279,35 +279,41 @@@
  
  void gtexGeneUi(struct cart *cart, struct trackDb *tdb, char *track, char *title, boolean boxed)
  /* GTEx (Genotype Tissue Expression) per gene data */
  {
  if (cartVarExists(cart, "ajax"))
      isPopup = TRUE;
  
  boxed = cfgBeginBoxAndTitle(tdb, boxed, title);
  printf("\n<table id=gtexGeneControls style='font-size:%d%%' %s>\n<tr><td>", 
          isPopup ? 75 : 100, boxed ?" width='100%'":"");
  
  char cartVar[1024];
  char buf[512];
  
  /* Filter on coding genes */
- 
  printf("<div>");
  printf("<b>Limit to protein coding genes:</b>\n");
  safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_CODING_GENE_FILTER);
  boolean isCodingOnly = cartCgiUsualBoolean(cart, cartVar, GTEX_CODING_GENE_FILTER_DEFAULT);
  cgiMakeCheckBox(cartVar, isCodingOnly);
 +
 +/* Show exons in gene model */
 +printf("&nbsp;&nbsp;<b>Show GTEx gene model</b>\n");
 +safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_SHOW_EXONS);
 +boolean showExons = cartCgiUsualBoolean(cart, cartVar, GTEX_SHOW_EXONS_DEFAULT);
 +cgiMakeCheckBox(cartVar, showExons);
  printf("</div>");
  
  /* Data transform. When selected, the next control (view limits max) is disabled */
  printf("<div><b>Log10 transform:</b>\n");
  safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_LOG_TRANSFORM);
  boolean isLogTransform = cartCgiUsualBoolean(cart, cartVar, GTEX_LOG_TRANSFORM_DEFAULT);
  safef(buf, sizeof buf, "onchange='gtexTransformChanged(\"%s\")'", track);
  cgiMakeCheckBoxJS(cartVar, isLogTransform, buf);
  
  /* Viewing limits max.  This control is disabled if log transform is selected */
  // construct class so JS can toggle
  safef(buf, sizeof buf, "%sViewLimitsMaxLabel %s", track, isLogTransform ? "disabled" : "");
  printf("&nbsp;&nbsp;<span class='%s'><b>View limits maximum:</b></span>\n", buf);
  safef(cartVar, sizeof(cartVar), "%s.%s", track, GTEX_MAX_LIMIT);
  int viewMax = cartCgiUsualInt(cart, cartVar, GTEX_MAX_LIMIT_DEFAULT);