a47364d48ccd5b8ee8cdf7b47b7ba9edcfd66f1f braney Wed Apr 16 10:58:32 2014 -0700 fix a crashing bug in hgCustom if the description field is empty on anassembly hub diff --git src/hg/inc/hui.h src/hg/inc/hui.h index 9cf4727..fc8245c 100644 --- src/hg/inc/hui.h +++ src/hg/inc/hui.h @@ -570,30 +570,44 @@ wiggleHorizontalGridOff = 1, }; enum wiggleGridOptEnum wiggleGridStringToEnum(char *string); /* Convert from string to enum representation. */ char *wiggleGridEnumToString(enum wiggleGridOptEnum x); /* Convert from enum to string representation. */ void wiggleGridDropDown(char *var, char *curVal); /* Make drop down of options. */ #define WIG_AGGREGATE_NONE "none" #define WIG_AGGREGATE_TRANSPARENT "transparentOverlay" #define WIG_AGGREGATE_SOLID "solidOverlay" +#define WIG_AGGREGATE_STACKED "stacked" + +/* Wiggle track aggregate option */ +enum wiggleAggregateFunctionEnum { + wiggleAggregateNone = 0, + wiggleAggregateTransparent = 1, + wiggleAggregateSolid = 2, + wiggleAggregateStacked = 3, +}; + +char *wiggleAggregateFunctionEnumToString(enum wiggleAggregateFunctionEnum x); +/* Convert from enum to string representation. */ + +enum wiggleAggregateFunctionEnum wiggleAggregateFunctionStringToEnum(char *string); /*** BAM alignment track coloring code: ***/ // tdbSettings / cart var suffixes and default values: #define BAM_PAIR_ENDS_BY_NAME "pairEndsByName" #define BAM_SHOW_NAMES "showNames" #define BAM_MIN_ALI_QUAL "minAliQual" #define BAM_MIN_ALI_QUAL_DEFAULT "0" #define BAM_COLOR_MODE "bamColorMode" #define BAM_COLOR_MODE_GRAY "gray" #define BAM_COLOR_MODE_STRAND "strand" #define BAM_COLOR_MODE_TAG "tag" #define BAM_COLOR_MODE_OFF "off" #define BAM_COLOR_MODE_DEFAULT BAM_COLOR_MODE_STRAND