f8de331fce87ec0df45e71399f7450c0dd69d189 braney Sat May 6 17:31:44 2017 -0700 on going work on custom composites diff --git src/hg/inc/hui.h src/hg/inc/hui.h index a7a6c1e..fa880f7 100644 --- src/hg/inc/hui.h +++ src/hg/inc/hui.h @@ -584,41 +584,41 @@ }; 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" -#define WIG_AGGREGATE_SUBSTRACT "subtract" #define WIG_AGGREGATE_ADD "add" +#define WIG_AGGREGATE_SUBTRACT "subtract" /* Wiggle track aggregate option */ enum wiggleAggregateFunctionEnum { wiggleAggregateNone = 0, wiggleAggregateTransparent = 1, wiggleAggregateSolid = 2, wiggleAggregateStacked = 3, - wiggleAggregateSubtract = 4, - wiggleAggregateAdd = 5, + wiggleAggregateAdd = 4, + wiggleAggregateSubtract = 5, }; 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"