0451226a890984e2b9dc9a7902d41014c3e24c66 aamp Mon May 23 17:13:43 2011 -0700 some lines I needed to NOT break the build. hgTrackUi and hgTracks were updated but not hgc diff --git src/hg/hgc/expClick.c src/hg/hgc/expClick.c index 191d0e0..be9bc54 100644 --- src/hg/hgc/expClick.c +++ src/hg/hgc/expClick.c @@ -444,40 +444,44 @@ { genericHeader(tdb, itemName); printCustomUrl(tdb, itemName, TRUE); bedList = ctLoadMultScoresBedDb(ct, seqName, winStart, winEnd); } else bedList = bedFilterListInRange(ct->bedList, NULL, seqName, winStart, winEnd); if (bedList == NULL) printf("<b>No Expression Data in this Range.</b>\n"); else if (expName && sameString(expName, "zoomInMore")) printf("<b>Too much data to display in detail in this range.</b>\n"); else { struct microarrayGroups *groupings = NULL; struct maGrouping *combineGroup; + struct maGrouping *subset = NULL; + int subsetOffset = -1; struct hash *erHash = newHash(6); int i; if (!ct) { groupings = maGetTrackGroupings(database, tdb); combineGroup = maCombineGroupingFromCart(groupings, cart, tdb->track); + subset = maSubsetGroupingFromCart(groupings, cart, tdb->track); + subsetOffset = maSubsetOffsetFromCart(subset, cart, tdb->track); } else combineGroup = maGetGroupingFromCt(ct); - maBedClumpGivenGrouping(bedList, combineGroup); + maBedClumpGivenGrouping(bedList, combineGroup, subset, subsetOffset); for (i = 0; i < combineGroup->numGroups; i++) { /* make stupid exprecord hash.perhaps eventually this won't be needed */ char id[16]; struct expRecord *er = basicExpRecord(combineGroup->names[i], i, 2); safef(id, sizeof(id), "%d", i); hashAdd(erHash, id, er); } puts("<h2></h2><p>\n"); msBedPrintTable(bedList, erHash, itemName, expName, -1*maxScore, maxScore, stepSize, 2, msBedDefaultPrintHeader, msBedExpressionPrintRow, printExprssnColorKey, getColorForExprBed, colorScheme); hashTraverseEls(erHash, erHashElFree); hashFree(&erHash); microarrayGroupsFree(&groupings);