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/inc/hui.h src/hg/inc/hui.h index 2de4a62..21b87e0 100644 --- src/hg/inc/hui.h +++ src/hg/inc/hui.h @@ -1088,33 +1088,33 @@ void bamCfgUi(struct cart *cart, struct trackDb *tdb, char *name, char *title, boolean boxed); /* BAM: short-read-oriented alignment file format. */ boolean tdbSortPrioritiesFromCart(struct cart *cart, struct trackDb **tdbList); /* Updates the tdb->priority from cart then sorts the list anew. Returns TRUE if priorities obtained from cart */ boolean tdbRefSortPrioritiesFromCart(struct cart *cart, struct slRef **tdbRefList); /* Updates the tdb->priority from cart then sorts the list anew. Returns TRUE if priorities obtained from cart */ enum trackVisibility visCompositeViewDefault(struct trackDb *parentTdb,char *view); /* returns the default track visibility of particular view within a composite track */ -boolean isNameAtCompositeLevel(struct trackDb *tdb,char *name); -/* cfgUi controls are passed a prefix name that may be at the composite or at the subtrack level - returns TRUE for composite level name */ +boolean isNameAtParentLevel(struct trackDb *tdb,char *name); +// cfgUi controls are passed a prefix name that may be at the composite, view or subtrack level +// returns TRUE if name at view or composite level boolean hSameTrackDbType(char *type1, char *type2); /* Compare type strings: require same string unless both are wig tracks. */ typedef struct _sortOrder { // Sort order is used for sorting trackDb entries (hgTrackDb) and setting up javascript sorting (hui.c) int count; char*sortOrder; // from cart (eg: CEL=+ FAC=- view=-) char*htmlId; // {tableName}.sortOrder char**column; // Always order in trackDb.ra (eg: FAC,CEL,view) TAG char**title; // Always order in trackDb.ra (eg: Factor,Cell Line,View) boolean* forward; // Always order in trackDb.ra but value of cart! (eg: -,+,-) int* order; // 1 based char *setting; } sortOrder_t;