0b6ca6827857d15705fb41028e8938c82aae9d3e
kate
  Mon Jan 8 16:01:06 2018 -0800
Add standard box config. refs #17512

diff --git src/hg/lib/longRange.c src/hg/lib/longRange.c
index 2637527..c2d95ce 100644
--- src/hg/lib/longRange.c
+++ src/hg/lib/longRange.c
@@ -1,129 +1,136 @@
 /*    longRange --- functions to provide UI for long range interaction
  *         graph.   Functions to retrieve long range information from
  *         bedTabix format.
  */
 
 /* Copyright (C) 2016 The Regents of the University of California 
  *  * See README in this or parent directory for licensing information. */
 
+#include "hui.h"
 #include "longRange.h"
 
 void longRangeCfgUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed)
 /* Complete track controls for long range interaction. */
 {
+boxed = cfgBeginBoxAndTitle(tdb, boxed, title);
+
+// track height control
 char buffer[1024];
 int min, max, deflt, current;
 cartTdbFetchMinMaxPixels(cart, tdb, LONG_MINHEIGHT, LONG_MAXHEIGHT, atoi(LONG_DEFHEIGHT),
                                 &min, &max, &deflt, &current);
 safef(buffer, sizeof buffer, "%s.%s", tdb->track, LONG_HEIGHT);
 printf("<br><b>Track height:&nbsp;</b>");
 cgiMakeIntVar(buffer, current, 3);
 printf("&nbsp;<span>pixels&nbsp;(range: %d to %d, default: %d)<span>", 
         min, max, deflt);
 
+// score control
 safef(buffer, sizeof buffer, "%s.%s", tdb->track, LONG_MINSCORE);
 double minScore = sqlDouble(cartUsualString(cart, buffer, LONG_DEFMINSCORE));
 printf("<BR><BR><b>Minimum score:&nbsp;</b>");
 cgiMakeDoubleVar(buffer, minScore, 0);
+
+cfgEndBox(boxed);
 }
 
 static char *getOther(struct bed *bed, unsigned *s, unsigned *e, 
                         boolean *hasColor, double *score, unsigned *rgb)
 /* parse the name field of longTabix to get the other location */
 {
 char *otherChrom = cloneString(bed->name);
 char *ptr = strchr(otherChrom, ':');
 if (ptr == NULL)
     errAbort("bad longTabix bed name %s\n", bed->name);
 *ptr++ = 0;
 *s = atoi(ptr);
 ptr = strchr(ptr, '-');
 if (ptr == NULL)
     errAbort("bad longTabix bed name %s\n", bed->name);
 ptr++;
 *e = atoi(ptr);
 ptr = strchr(ptr, ',');
 if (ptr == NULL)
     errAbort("bad longTabix bed name %s\n", bed->name);
 ptr++;
 
 // parse value or RGB (value after comma in name field)
 *score = 0;
 *hasColor = FALSE;
 int rgbRet = -1;
 if (strchr(ptr, ','))
     rgbRet = bedParseRgb(ptr);
 if (rgbRet != -1)
     {
     *rgb = rgbRet;
     *hasColor = TRUE;
     }
 else
     *score = sqlDouble(ptr);
 return otherChrom;
 }
 
 struct longRange *parseLongTabix(struct bed *beds, unsigned *maxWidth, double minScore)
 /* Parse longTabix format into longRange structures */
 {
 struct longRange *longRangeList = NULL;
 *maxWidth = 1;
 for(; beds; beds=beds->next)
     {
     double score;
     unsigned otherS, otherE;
     unsigned rgb = 0;
     boolean hasColor;
     char *otherChrom = getOther(beds, &otherS, &otherE, &hasColor, &score, &rgb);
     if (score < minScore)
         continue;
     struct longRange *longRange;
     AllocVar(longRange);
     slAddHead(&longRangeList, longRange);
 
     // don't have oriented feet at the moment
     longRange->sOrient = longRange->eOrient = 0;
     longRange->id = beds->score;        // Id is field 5 in this format
     longRange->score = score;
     longRange->hasColor = hasColor;
     longRange->rgb = rgb;
     longRange->name = beds->name;
 
     unsigned otherCenter = (otherS + otherE)/2;
     unsigned otherWidth = otherE - otherS;
     unsigned thisWidth = beds->chromEnd - beds->chromStart;
     unsigned center = (beds->chromEnd + beds->chromStart) / 2;
     
     if (sameString(beds->chrom, otherChrom) && (otherCenter < center))
         {
         longRange->s = otherCenter;
         longRange->sw = otherWidth;
         longRange->sChrom = otherChrom;
         longRange->e = center;
         longRange->ew = thisWidth;
         longRange->eChrom = beds->chrom;
         }
     else
         {
         longRange->s = center;
         longRange->sw = thisWidth;
         longRange->sChrom = beds->chrom;
         longRange->e = otherCenter;
         longRange->ew = otherWidth;
         longRange->eChrom = otherChrom;
         }
     unsigned longRangeWidth = longRange->e - longRange->s;
     if (sameString(longRange->eChrom,longRange->sChrom) && ( longRangeWidth > *maxWidth))
         *maxWidth = longRangeWidth;
     }
 return longRangeList;
 }
 
 int longRangeCmp(const void *va, const void *vb)
 /* Compare based on coord position of s field */
 {
 const struct longRange *a = *((struct longRange **)va);
 const struct longRange *b = *((struct longRange **)vb);
 return (a->s - b->s);
 }