ba31086d08e0c051ad23953fc9bb462e9135cb58 galt Wed Feb 24 13:06:05 2016 -0800 Removing DEBUG warnings from hgTracks multi-region code. diff --git src/hg/hgTracks/rmskJoinedTrack.c src/hg/hgTracks/rmskJoinedTrack.c index 7c9a231..0756849 100644 --- src/hg/hgTracks/rmskJoinedTrack.c +++ src/hg/hgTracks/rmskJoinedTrack.c @@ -304,32 +304,30 @@ AllocVar(st); st->levelCount = 0; struct rmskJoined *rm = NULL; char **row; int rowOffset; struct sqlConnection *conn = hAllocConn(database); struct sqlResult *sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset); struct rmskJoined *detailList = NULL; while ((row = sqlNextRow(sr)) != NULL) { rm = rmskJoinedLoad(row + rowOffset); slAddHead(&detailList, rm); } - //warn("rmskJoinedLoadItems tg->table=%s chromName=%s winStart=%d winEnd=%d, rowOffset=%d slCount(detailList)=%d", - //tg->table, chromName, winStart, winEnd, rowOffset, slCount(detailList)); // DEBUG REMOVE slSort(&detailList, cmpRepeatDiv); sqlFreeResult(&sr); hFreeConn(&conn); if (detailList) AllocArray( st->levels, slCount(detailList)); while (detailList) { st->levels[st->levelCount++] = detailList; struct rmskJoined *cr = detailList; detailList = detailList->next; cr->next = NULL; @@ -366,38 +364,36 @@ detailList = rm->next; rm = rm->next; cr->next = NULL; } else { // Save for a lower level prev = rm; rm = rm->next; } } // while ( rm ) } // else if ( tg->visibility == tvSquish ... } // while ( detailList ) // Create Hash Entry - //warn("rmskJoinedLoadItems tg->table=%s st->levelCount=%d", tg->table, st->levelCount); // DEBUG REMOVE hashReplace(subTracksHash, tg->table, st); slReverse(&fullRIList); tg->items = fullRIList; } // if ((tg->visibility == tvFull || ... else tg->items = classRIList; -//warn("rmskJoinedLoadItems track=%s vis=%d slCount(tg->items)=%d", tg->track, tg->visibility, slCount(tg->items)); // DEBUG REMOVE } static void rmskJoinedFreeItems(struct track *tg) /* Free up rmskJoinedMasker items. */ { slFreeList(&tg->items); } static char * rmskJoinedName(struct track *tg, void *item) /* Return name of rmskJoined item track. */ { struct repeatItem *ri = item; /* * In detail view mode the items represent different packing * levels. No need to display a label at each level. Instead @@ -431,50 +427,47 @@ // } //else if ((tg->limitedVis == tvFull || tg->limitedVis == tvPack) && winBaseCount <= DETAIL_VIEW_MAX_SCALE) if (tg->limitedVis == tvFull && winBaseCount <= DETAIL_VIEW_MAX_SCALE) { return max(tg->heightPer, MINHEIGHT); } else { return tgFixedItemHeight(tg, item); } } int rmskJoinedTotalHeight(struct track *tg, enum trackVisibility vis) { setWg(); -//warn("rmskJoinedTotalHeight track=%s vis=%d winBaseCount=%d", tg->track, vis, winBaseCount); // DEBUG REMOVE // Are we in full view mode and at the scale needed to display // the detail view? //Disabled //if ((tg->limitedVis == tvFull || tg->limitedVis == tvSquish || // tg->limitedVis == tvPack) && winBaseCount <= DETAIL_VIEW_MAX_SCALE) if (tg->limitedVis == tvFull && winBaseCount <= DETAIL_VIEW_MAX_SCALE) { // Lookup the depth of this subTrack and report it struct subTrack *st = hashFindVal(subTracksHash, tg->table); if (st) { tg->height = (st->levelCount * rmskJoinedItemHeight(tg, NULL)); - //warn("rmskJoinedTotalHeight track=%s st->levelCount=%d tg->height=%d", tg->track, st->levelCount, tg->height); // DEBUG REMOVE return tg->height; } else { tg->height = rmskJoinedItemHeight(tg, NULL); - //warn("rmskJoinedTotalHeight track=%s st is NULL tg->height=%d", tg->track, tg->height); // DEBUG REMOVE return tg->height; // Just display one line } } else { if ( vis == tvDense ) { tg->height = tgFixedTotalHeightNoOverflow(tg, tvDense ); return tgFixedTotalHeightNoOverflow(tg, tvDense ); } else { tg->height = tgFixedTotalHeightNoOverflow(tg, tvFull ); return tgFixedTotalHeightNoOverflow(tg, tvFull ); }