7f39a66dca865c28f279e2b43211772e53bfa722
tdreszer
Fri Sep 23 23:23:32 2011 -0700
Tightened a few more screws on subCfg
diff --git src/hg/lib/hui.c src/hg/lib/hui.c
index 005d72d..53cf148 100644
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@ -4025,31 +4025,31 @@
#endif///ndef SUBTRACK_CFG
cType = cfgNone;
}
membership_t *membership = subgroupMembershipGet(subtrack);
if (sortOrder == NULL && !useDragAndDrop)
{
if ( divisionIfNeeded(lastDivide,dividers,membership) )
colorIx = (colorIx == COLOR_BG_DEFAULT_IX ? COLOR_BG_ALTDEFAULT_IX : COLOR_BG_DEFAULT_IX);
}
// Start the TR which must have an id that is directly related to the checkBox id
char *id = checkBoxIdMakeForTrack(subtrack,membersForAll->members,membersForAll->dimMax,membership); // view is known tag
printf("
\n",id,(!visibleCB && !displayAll?" style='display:none'":""));
+ printf(" id=tr_%s%s>\n",id,(!visibleCB && !displayAll?" style='display:none'":""));
// Now the TD that holds the checkbox
printf("",
(enabledCB?"":" title='view is hidden'"),
(useDragAndDrop?" class='dragHandle' title='Drag to reorder'":""));
// The checkbox has identifying classes including subCB and the tag for each dimension (e.g. class='subCB GM12878 CTCF Peak')
dyStringClear(dyHtml);
dyStringAppend(dyHtml, "subCB"); // always first
for(di=dimX;didimMax;di++)
{
if (membersForAll->members[di] && -1 != (ix = stringArrayIx(membersForAll->members[di]->groupTag, membership->subgroups, membership->count)))
dyStringPrintf(dyHtml," %s",membership->membership[ix]);
}
if (membersForAll->members[dimV] && -1 != (ix = stringArrayIx(membersForAll->members[dimV]->groupTag, membership->subgroups, membership->count)))
@@ -4209,32 +4209,30 @@
// Count of subtracks is filled in by javascript.
if (slCount(subtrackRefList) > 5)
printf("\n");
// Restruction policy needs a link
if (restrictions && sortOrder != NULL)
printf(" | Restriction Policy", ENCODE_DATA_RELEASE_POLICY);
printf(" |
\n");
}
puts("");
if (sortOrder == NULL)
printf("");
-// Tying subtracks with matrix and subtrack cfgs with views requires javascript help
-puts("");
#ifndef SUBTRACK_CFG
if (dependentCfgsNeedBinding)
cfgLinkToDependentCfgs(cart,parentTdb,parentTdb->track);
#endif//ndef SUBTRACK_CFG
// Finally we are free of all this
membersForAllSubGroupsFree(parentTdb,&membersForAll);
dyStringFree(&dyHtml)
sortOrderFree(&sortOrder);
dividersFree(÷rs);
hierarchyFree(&hierarchy);
}
static void compositeUiSubtracksMatchingPrimary(char *db, struct cart *cart, struct trackDb *parentTdb,char *primarySubtrack)
/* Display list of subtracks associated with a primary subtrack for the hgTables merge function */