21bf4f713e944af4e8810544d68c441510ea85a3 kate Wed Jul 26 16:31:01 2017 -0700 Add support for maxHeightPixels in trackDb and UI of barChart type tracks. refs #19872 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 10ebde5..bcd92fc 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -5081,42 +5081,42 @@ jsInline(dy->string); dyStringFree(&dy); } void wigCfgUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed) /* UI for the wiggle track */ { char *typeLine = NULL; /* to parse the trackDb type line */ char *words[8]; /* to parse the trackDb type line */ int wordCount = 0; /* to parse the trackDb type line */ char option[256]; double minY; /* from trackDb or cart */ double maxY; /* from trackDb or cart */ double tDbMinY; /* data range limits from trackDb type line */ double tDbMaxY; /* data range limits from trackDb type line */ -int defaultHeight; /* pixels per item */ char *horizontalGrid = NULL; /* Grid lines, off by default */ char *transformFunc = NULL; /* function to transform data points */ char *alwaysZero = NULL; /* Always include 0 in range */ char *lineBar; /* Line or Bar graph */ char *autoScale; /* Auto scaling on or off */ char *windowingFunction; /* Maximum, Mean, or Minimum */ char *smoothingWindow; /* OFF or [2:16] */ char *yLineMarkOnOff; /* user defined Y marker line to draw */ double yLineMark; /* from trackDb or cart */ int maxHeightPixels = atoi(DEFAULT_HEIGHT_PER); int minHeightPixels = MIN_HEIGHT_PER; +int defaultHeight = maxHeightPixels; /* pixels per item */ boxed = cfgBeginBoxAndTitle(tdb, boxed, title); wigFetchMinMaxPixelsWithCart(cart,tdb,name,&minHeightPixels, &maxHeightPixels, &defaultHeight); typeLine = cloneString(tdb->type); wordCount = chopLine(typeLine,words); wigFetchMinMaxYWithCart(cart, tdb, name, &minY, &maxY, &tDbMinY, &tDbMaxY, wordCount, words); freeMem(typeLine); wigFetchTransformFuncWithCart(cart,tdb,name, &transformFunc); wigFetchAlwaysZeroWithCart(cart,tdb,name, &alwaysZero); wigFetchHorizontalGridWithCart(cart,tdb,name, &horizontalGrid); wigFetchAutoScaleWithCart(cart,tdb,name, &autoScale); wigFetchGraphTypeWithCart(cart,tdb,name, &lineBar);