9723799cf6f1a8fb714ae1493b224b8e91aebf09 tdreszer Mon Jul 30 12:17:38 2012 -0700 Making final pass through tree of checkins as dictated by Jim. None of these changes should affect executables in any way. This pass is due to expanding fingerprint caused by kompare. diff --git src/hg/inc/hui.h src/hg/inc/hui.h index 53fdef6..d8e3283 100644 --- src/hg/inc/hui.h +++ src/hg/inc/hui.h @@ -180,43 +180,45 @@ * equivalent enum. */ char *hStringFromTv(enum trackVisibility vis); /* Given enum representation convert to string. */ /* Standard width for visibility dropdowns */ #define TV_DROPDOWN_STYLE "width: 70px" void hTvDropDownClassVisOnlyAndExtra(char *varName, enum trackVisibility vis, boolean canPack, char *class, char *visOnly, char *extra); /* Make track visibility drop down for varName with style class, and potentially limited to visOnly */ #define hTvDropDownClassVisOnly(varName,vis,canPack,class,visOnly) \ hTvDropDownClassVisOnlyAndExtra(varName,vis,canPack,class,visOnly,NULL) -void hTvDropDownClassWithJavascript(char *varName, enum trackVisibility vis, boolean canPack, char *class,char *javascript); +void hTvDropDownClassWithJavascript(char *varName, enum trackVisibility vis, boolean canPack, + char *class,char *javascript); /* Make track visibility drop down for varName with style class and javascript */ #define hTvDropDownClass(varName,vis,canPack,class) \ hTvDropDownClassWithJavascript((varName),(vis),(canPack),(class),"") #define hTvDropDownWithJavascript(varName,vis,canPack,javascript) \ hTvDropDownClassWithJavascript((varName),(vis),(canPack),"normalText",(javascript)) #define hTvDropDown(varName,vis,canPack) \ hTvDropDownClassWithJavascript((varName),(vis),(canPack),"normalText","") #define SUPERTRACK_DEFAULT_VIS "hide" void hideShowDropDownWithClassAndExtra(char *varName, boolean show, char *class, char *extra); -#define hideShowDropDown(varName,show,class) hideShowDropDownWithClassAndExtra(varName,show,class,NULL) +#define hideShowDropDown(varName,show,class) \ + hideShowDropDownWithClassAndExtra(varName,show,class,NULL) /* Make hide/show dropdown for varName */ /****** Some stuff for stsMap related controls *******/ enum stsMapOptEnum { smoeGenetic = 0, smoeGenethon = 1, smoeMarshfield = 2, smoeDecode = 3, smoeGm99 = 4, smoeWiYac = 5, smoeWiRh = 6, smoeTng = 7, }; enum stsMapOptEnum smoeStringToEnum(char *string); @@ -1034,44 +1036,46 @@ void pslCfgUi(char *db, struct cart *cart, struct trackDb *parentTdb, char *prefix ,char *title, boolean boxed); /* Put up UI for psl tracks */ void netAlignCfgUi(char *db, struct cart *cart, struct trackDb *parentTdb, char *prefix ,char *title, boolean boxed); /* Put up UI for net tracks */ void chainCfgUi(char *db, struct cart *cart, struct trackDb *parentTdb, char *prefix ,char *title, boolean boxed, char *chromosome); /* Put up UI for chain tracks */ void scoreGrayLevelCfgUi(struct cart *cart, struct trackDb *tdb, char *prefix, int scoreMax); /* If scoreMin has been set, let user select the shade of gray for that score, in case * the default is too light to see or darker than necessary. */ struct dyString *dyAddFilterAsInt(struct cart *cart, struct trackDb *tdb, - struct dyString *extraWhere,char *filter,char *defaultVal, char*field, boolean *and); + struct dyString *extraWhere,char *filter, + char *defaultVal, char*field, boolean *and); // creates the where clause condition to support numeric int filter range. // Filters are expected to follow // {fiterName}: trackDb min or min:max - default value(s); // {filterName}Min or {filterName}: min (user supplied) cart variable; // {filterName}Max: max (user supplied) cart variable; // {filterName}Limits: trackDb allowed range "0:1000" Optional // uses:{filterName}Min: old trackDb value if {filterName}Limits not found // {filterName}Max: old trackDb value if {filterName}Limits not found // defaultLimits: function param if no tdb limits settings found) // The 'and' param and dyString in/out allows stringing multiple where clauses together struct dyString *dyAddFilterAsDouble(struct cart *cart, struct trackDb *tdb, - struct dyString *extraWhere,char *filter,char *defaultLimits, char*field, boolean *and); + struct dyString *extraWhere,char *filter, + char *defaultLimits, char*field, boolean *and); // creates the where clause condition to support numeric double filters. // Filters are expected to follow // {fiterName}: trackDb min or min:max - default value(s); // {filterName}Min or {filterName}: min (user supplied) cart variable; // {filterName}Max: max (user supplied) cart variable; // {filterName}Limits: trackDb allowed range "0.0:10.0" Optional // uses: defaultLimits: function param if no tdb limits settings found) // The 'and' param allows stringing multiple where clauses together struct dyString *dyAddAllScoreFilters(struct cart *cart, struct trackDb *tdb, struct dyString *extraWhere,boolean *and); // creates the where clause condition to gather together all random double filters // Filters are expected to follow // {fiterName}: trackDb min or min:max - default value(s); // {filterName}Min or {filterName}: min (user supplied) cart variable; @@ -1103,31 +1107,32 @@ 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 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) +// 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; sortOrder_t *sortOrderGet(struct cart *cart,struct trackDb *parentTdb); // Parses any list sort order instructions for parent of subtracks (from cart or trackDb) // Some trickiness here. sortOrder->sortOrder is from cart (changed by user action), // as is sortOrder->order, but columns are in original tdb order (unchanging)!