5fe6a3b2ce5a7099de38022ab8875d5651797780 tdreszer Fri Dec 16 11:41:01 2011 -0800 Just a changed name tree wide. The 'compositeLevel' paramter to closestToHome cart functions was confusing. What it means is the request is for a setting one step above the tdb passed in. It is used for view level controls where the model tdb is a subtrack. This checkin has NO functional affect. diff --git src/hg/lib/chainCart.c src/hg/lib/chainCart.c index c38feb6..c01e374 100644 --- src/hg/lib/chainCart.c +++ src/hg/lib/chainCart.c @@ -1,28 +1,28 @@ /* chainCart.c - take care of parsing and combining values from the * chain trackDb optional settings and the same values that may be * in the cart. */ #include "common.h" #include "jksql.h" #include "trackDb.h" #include "cart.h" #include "dystring.h" #include "hui.h" #include "chainCart.h" enum chainColorEnum chainFetchColorOption(struct cart *cart, - struct trackDb *tdb, boolean compositeLevel) + struct trackDb *tdb, boolean parentLevel) /****** ColorOption - Chrom colors by default **************************/ { char *chainColor = NULL; enum chainColorEnum ret; chainColor = trackDbSettingClosestToHomeOrDefault(tdb, OPT_CHROM_COLORS, CHROM_COLORS); /* allow cart to override trackDb setting */ ret = chainColorStringToEnum( - cartUsualStringClosestToHome(cart, tdb, compositeLevel, + cartUsualStringClosestToHome(cart, tdb, parentLevel, OPT_CHROM_COLORS, chainColor)); return(ret); } /* enum chainColorEnum chainFetchColorOption() */