c4e9f290b9b56e7f9e1ecda55cd7a84e2b5a851a tdreszer Wed Sep 14 16:51:27 2011 -0700 Cricket noticed there was no easy way to set the default choice of a filterComp to all. Now defaults to all or, you can enter 'dimensionAchecked All'. diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 3c585f4..43c4e04 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -2555,34 +2555,36 @@ options = slNameListFromStringArray(members->tags, members->count); assert(options != NULL); } struct slName *option; for(option=options;option!=NULL;option=option->next) { mIx = membersSubGroupIx(members, option->name); if(mIx >= 0) members->selected[mIx] = TRUE; } return slNameListToString(options,','); } struct dyString *currentlyCheckedTags = NULL; // Need a string of subGroup tags which are currently checked safef(settingName,sizeof(settingName),"dimension%cchecked",letter); -char *dimCheckedDefaults = trackDbSettingOrDefault(parentTdb,settingName,""); +char *dimCheckedDefaults = trackDbSettingOrDefault(parentTdb,settingName,"All"); for(mIx=0;mIxcount;mIx++) { safef(settingName, sizeof(settingName), "%s.mat_%s_dim%c_cb",parentTdb->track,members->tags[mIx],letter); + members->selected[mIx] = TRUE; + if (differentWord(dimCheckedDefaults,"All") && differentWord(dimCheckedDefaults,"Any")) members->selected[mIx] = (NULL!=findWordByDelimiter(members->tags[mIx],',',dimCheckedDefaults)); members->selected[mIx] = cartUsualBoolean(cart,settingName,members->selected[mIx]); if(members->selected[mIx]) { if(currentlyCheckedTags == NULL) currentlyCheckedTags = dyStringCreate(members->tags[mIx]); else dyStringPrintf(currentlyCheckedTags,",%s",members->tags[mIx]); } } if(currentlyCheckedTags) return dyStringCannibalize(¤tlyCheckedTags); return NULL; }