141deaec9ba7a2912faedaf2a62fa189108b4c43 braney Thu Apr 13 12:15:01 2023 -0700 some final clean-up on logoMaf: allow the user to turn it off, and scale by the amount of the data within the clipping rectangle diff --git src/hg/inc/wiggle.h src/hg/inc/wiggle.h index fa90a18..d90ceb7 100644 --- src/hg/inc/wiggle.h +++ src/hg/inc/wiggle.h @@ -188,30 +188,36 @@ #define wigFetchMinMaxLimits(tdb,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 */ 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)->track,(Min),(Max),(Default)) /* return pixels heights allowable from trackDb or cart */ boolean wigFetchDoNegativeWithCart(struct cart *cart, struct trackDb *tdb, char *name,char **optString); #define wigFetchDoNegative(tdb,optString) \ wigFetchDoNegativeWithCart(cart,(tdb),(tdb)->track,(optString)) +boolean wigFetchDoSequenceLogoWithCart(struct cart *cart, struct trackDb *tdb, + char *name,char **optString); +#define wigFetchDoSequenceLogo(tdb,optString) \ + wigFetchDoSequenceLogoWithCart(cart,(tdb),(tdb)->track,(optString)) + + enum wiggleGridOptEnum wigFetchTransformFuncWithCart(struct cart *cart, struct trackDb *tdb, char *name,char **optString); #define wigFetchTransformFunc(tdb,optString) \ wigFetchTransformFuncWithCart(cart,(tdb),(tdb)->track,(optString)) /* return transformFunc setting */ enum wiggleGridOptEnum wigFetchAlwaysZeroWithCart(struct cart *cart, struct trackDb *tdb, char *name,char **optString); #define wigFetchAlwaysZero(tdb,optString) \ wigFetchAlwaysZeroWithCart(cart,(tdb),(tdb)->track,(optString)) /* return alwaysZero setting */ enum wiggleGridOptEnum wigFetchHorizontalGridWithCart(struct cart *cart, struct trackDb *tdb, char *name,char **optString); #define wigFetchHorizontalGrid(tdb,optString) \ @@ -265,30 +271,31 @@ /* 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" #define HEIGHTPER "heightPer" #define HORIZGRID "horizGrid" #define GRIDDEFAULT "gridDefault" #define TRANSFORMFUNC "transformFunc" #define DONEGATIVEMODE "negateValues" +#define DOSEQUENCELOGOMODE "sequenceLogo" #define ALWAYSZERO "alwaysZero" #define AUTOSCALE "autoScale" #define AUTOSCALEDEFAULT "autoScaleDefault" #define LINEBAR "lineBar" #define AGGREGATE "aggregate" #define VIEWFUNC "viewFunc" #define GRAPHTYPE "graphType" #define GRAPHTYPEDEFAULT "graphTypeDefault" #define WINDOWINGFUNCTION "windowingFunction" #define SMOOTHINGWINDOW "smoothingWindow" #define YLINEONOFF "yLineOnOff" #define YLINEMARK "yLineMark" #define SPANLIST "spanList" #define MAX_SPAN_COUNT 128 #define MAX_SMOOTHING 16