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/wiggle.h src/hg/inc/wiggle.h index c76868f..c0f69de 100644 --- src/hg/inc/wiggle.h +++ src/hg/inc/wiggle.h @@ -210,57 +210,57 @@ wigFetchHorizontalGridWithCart(cart,(tdb),(tdb)->track,(optString)) /* return horizontalGrid setting */ enum wiggleScaleOptEnum wigFetchAutoScaleWithCart(struct cart *cart, struct trackDb *tdb, char *name, char **optString); #define wigFetchAutoScale(tdb,optString) \ wigFetchAutoScaleWithCart(cart,(tdb),(tdb)->track,(optString)) /* return autoScale setting */ enum wiggleGraphOptEnum wigFetchGraphTypeWithCart(struct cart *cart, struct trackDb *tdb, char *name, char **optString); #define wigFetchGraphType(tdb,optString) \ wigFetchGraphTypeWithCart(cart,(tdb),(tdb)->track,(optString)) /* return graph type, line(points) or bar graph */ +enum wiggleAggregateFunctionEnum wigFetchAggregateFunctionWithCart(struct cart *cart, struct trackDb *tdb, + char *name, char **optString); + enum wiggleWindowingEnum wigFetchWindowingFunctionWithCart(struct cart *cart, struct trackDb *tdb, char *name, char **optString); #define wigFetchWindowingFunction(tdb,optString) \ wigFetchWindowingFunctionWithCart(cart,(tdb),(tdb)->track,(optString)) /* return windowing function, Maximum, Mean, Minimum */ enum wiggleSmoothingEnum wigFetchSmoothingWindowWithCart(struct cart *cart, struct trackDb *tdb, char *name, char **optString); #define wigFetchSmoothingWindow(tdb,optString) \ wigFetchSmoothingWindowWithCart(cart,(tdb),(tdb)->track,(optString)) /* return smoothing window size N: [0:16] */ enum wiggleYLineMarkEnum wigFetchYLineMarkWithCart(struct cart *cart, struct trackDb *tdb, char *name, char **optString); #define wigFetchYLineMark(tdb,optString) \ wigFetchYLineMarkWithCart(cart,(tdb),(tdb)->track,(optString)) /* return On/Off status of y= line marker */ void wigFetchYLineMarkValueWithCart(struct cart *cart,struct trackDb *tdb, char *name, double *tDbYMark ); #define wigFetchYLineMarkValue(tdb,tDbYMark) \ wigFetchYLineMarkValueWithCart(cart,(tdb),(tdb)->track,(tDbYMark)) /* return value for the y line marker to be drawn */ -char *wigFetchAggregateValWithCart(struct cart *cart, struct trackDb *tdb); -/* Return aggregate value for track. */ - boolean wigIsOverlayTypeAggregate(char *aggregate); /* Return TRUE if aggregater type is one of the overlay ones. */ int *wiggleSpanList(struct sqlConnection *conn, struct trackDb *tdb); /****** spanList - fetch list of spans from trackDb *********************/ /* cart and trackDb strings */ #define VIEWLIMITS "viewLimits" #define DEFAULTVIEWLIMITS "defaultViewLimits" #define VIEWLIMITSMAX "viewLimitsMax" #define MIN_Y "minY" #define MAX_Y "maxY" #define MIN_LIMIT "minLimit" #define MAX_LIMIT "maxLimit" #define MAXHEIGHTPIXELS "maxHeightPixels"