src/hg/inc/wiggle.h 1.90
1.90 2010/05/11 01:43:29 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/inc/wiggle.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/inc/wiggle.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -b -B -U 4 -r1.89 -r1.90
--- src/hg/inc/wiggle.h 25 Nov 2009 18:44:40 -0000 1.89
+++ src/hg/inc/wiggle.h 11 May 2010 01:43:29 -0000 1.90
@@ -174,75 +174,75 @@
extern void wigFetchMinMaxYWithCart(struct cart *cart, struct trackDb *tdb, char *name,
double *min, double *max, double *tDbMin, double *tDbMax, int wordCount, char **words);
#define wigFetchMinMaxY(tdb,min,max,tDbMin,tDbMax,wordCount,words) \
- wigFetchMinMaxYWithCart(cart,(tdb),(tdb)->tableName,(min),(max),(tDbMin),(tDbMax),(wordCount),(words))
+ wigFetchMinMaxYWithCart(cart,(tdb),(tdb)->track,(min),(max),(tDbMin),(tDbMax),(wordCount),(words))
/* return min,max Y ranges from trackDb or cart */
extern void wigFetchMinMaxLimitsWithCart(struct cart *cart, struct trackDb *tdb, char *name,
double *min, double *max,double *tDbMin, double *tDbMax);
#define wigFetchMinMaxLimits(tdb,min,max,tDbMin,tDbMax) \
- wigFetchMinMaxLimitsWithCart(cart,(tdb),(tdb)->tableName,(min),(max),(tDbMin),(tDbMax))
+ wigFetchMinMaxLimitsWithCart(cart,(tdb),(tdb)->track,(min),(max),(tDbMin),(tDbMax))
/* for bedGraph types, return min,max Y ranges from trackDb or cart */
extern void wigFetchMinMaxPixelsWithCart(struct cart *cart, struct trackDb *tdb, char *name,
int *Min, int *Max, int *Default);
#define wigFetchMinMaxPixels(tdb,Min,Max,Default) \
- wigFetchMinMaxPixelsWithCart(cart,(tdb),(tdb)->tableName,(Min),(Max),(Default))
+ wigFetchMinMaxPixelsWithCart(cart,(tdb),(tdb)->track,(Min),(Max),(Default))
/* return pixels heights allowable from trackDb or cart */
extern enum wiggleGridOptEnum wigFetchTransformFuncWithCart(struct cart *cart,
struct trackDb *tdb, char *name,char **optString);
#define wigFetchTransformFunc(tdb,optString) \
- wigFetchTransformFuncWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchTransformFuncWithCart(cart,(tdb),(tdb)->track,(optString))
/* return transformFunc setting */
extern enum wiggleGridOptEnum wigFetchAlwaysZeroWithCart(struct cart *cart,
struct trackDb *tdb, char *name,char **optString);
#define wigFetchAlwaysZero(tdb,optString) \
- wigFetchAlwaysZeroWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchAlwaysZeroWithCart(cart,(tdb),(tdb)->track,(optString))
/* return alwaysZero setting */
extern enum wiggleGridOptEnum wigFetchHorizontalGridWithCart(struct cart *cart,
struct trackDb *tdb, char *name,char **optString);
#define wigFetchHorizontalGrid(tdb,optString) \
- wigFetchHorizontalGridWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchHorizontalGridWithCart(cart,(tdb),(tdb)->track,(optString))
/* return horizontalGrid setting */
extern enum wiggleScaleOptEnum wigFetchAutoScaleWithCart(struct cart *cart,
struct trackDb *tdb, char *name, char **optString);
#define wigFetchAutoScale(tdb,optString) \
- wigFetchAutoScaleWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchAutoScaleWithCart(cart,(tdb),(tdb)->track,(optString))
/* return autoScale setting */
extern enum wiggleGraphOptEnum wigFetchGraphTypeWithCart(struct cart *cart,
struct trackDb *tdb, char *name, char **optString);
#define wigFetchGraphType(tdb,optString) \
- wigFetchGraphTypeWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchGraphTypeWithCart(cart,(tdb),(tdb)->track,(optString))
/* return graph type, line(points) or bar graph */
extern enum wiggleWindowingEnum wigFetchWindowingFunctionWithCart(struct cart *cart,
struct trackDb *tdb, char *name, char **optString);
#define wigFetchWindowingFunction(tdb,optString) \
- wigFetchWindowingFunctionWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchWindowingFunctionWithCart(cart,(tdb),(tdb)->track,(optString))
/* return windowing function, Maximum, Mean, Minimum */
extern enum wiggleSmoothingEnum wigFetchSmoothingWindowWithCart(struct cart *cart,
struct trackDb *tdb, char *name, char **optString);
#define wigFetchSmoothingWindow(tdb,optString) \
- wigFetchSmoothingWindowWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchSmoothingWindowWithCart(cart,(tdb),(tdb)->track,(optString))
/* return smoothing window size N: [0:16] */
extern enum wiggleYLineMarkEnum wigFetchYLineMarkWithCart(struct cart *cart,
struct trackDb *tdb, char *name, char **optString);
#define wigFetchYLineMark(tdb,optString) \
- wigFetchYLineMarkWithCart(cart,(tdb),(tdb)->tableName,(optString))
+ wigFetchYLineMarkWithCart(cart,(tdb),(tdb)->track,(optString))
/* return On/Off status of y= line marker */
extern void wigFetchYLineMarkValueWithCart(struct cart *cart,struct trackDb *tdb,
char *name, double *tDbYMark );
#define wigFetchYLineMarkValue(tdb,tDbYMark) \
- wigFetchYLineMarkValueWithCart(cart,(tdb),(tdb)->tableName,(tDbYMark))
+ wigFetchYLineMarkValueWithCart(cart,(tdb),(tdb)->track,(tDbYMark))
/* return value for the y line marker to be drawn */
int *wiggleSpanList(struct sqlConnection *conn, struct trackDb *tdb);
/****** spanList - fetch list of spans from trackDb *********************/