src/hg/hgTracks/bamTrack.c 1.6
1.6 2009/08/18 23:41:23 angie
Removed the hardcoded BAM_MAX_ZOOM -- using trackDb setting maxWindowToDraw now.
Index: src/hg/hgTracks/bamTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/bamTrack.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/hg/hgTracks/bamTrack.c 3 Aug 2009 22:00:24 -0000 1.5
+++ src/hg/hgTracks/bamTrack.c 18 Aug 2009 23:41:23 -0000 1.6
@@ -13,10 +13,8 @@
#include "bamFile.h"
static char const rcsid[] = "$Id$";
-#define BAM_MAX_ZOOM 200000
-
struct bamTrackData
{
struct track *tg;
struct hash *pairHash;
@@ -190,10 +188,8 @@
void bamLoadItemsCore(struct track *tg, boolean isPaired)
/* Load BAM data into tg->items item list, unless zoomed out so far
* that the data would just end up in dense mode and be super-slow. */
{
-if (winEnd-winStart > BAM_MAX_ZOOM)
- return;
char *seqNameForBam = chromName;
char *stripPrefix = trackDbSetting(tg->tdb, "stripPrefix");
if (stripPrefix && startsWith(stripPrefix, chromName))
seqNameForBam = chromName + strlen(stripPrefix);
@@ -237,28 +233,8 @@
{
bamLoadItemsCore(tg, TRUE);
}
-void bamDrawItems(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg,
- int xOff, int yOff, int width, MgFont *font, Color color,
- enum trackVisibility vis)
-/* Draw BAM alignments unless zoomed out too far. */
-{
-if (winEnd-winStart > BAM_MAX_ZOOM)
- return;
-linkedFeaturesDraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis);
-}
-
-void bamPairedDrawItems(struct track *tg, int seqStart, int seqEnd, struct hvGfx *hvg,
- int xOff, int yOff, int width, MgFont *font, Color color,
- enum trackVisibility vis)
-/* Draw paired-end BAM alignments unless zoomed out too far. */
-{
-if (winEnd-winStart > BAM_MAX_ZOOM)
- return;
-linkedFeaturesSeriesDraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis);
-}
-
void bamMethods(struct track *track)
/* Methods for BAM alignment files. */
{
track->canPack = TRUE;
@@ -269,15 +245,13 @@
if (isPaired)
{
linkedFeaturesSeriesMethods(track);
track->loadItems = bamPairedLoadItems;
- track->drawItems = bamPairedDrawItems;
}
else
{
linkedFeaturesMethods(track);
track->loadItems = bamLoadItems;
- track->drawItems = bamDrawItems;
}
track->labelNextItemButtonable = track->nextItemButtonable = FALSE;
track->labelNextPrevItem = NULL;
track->nextPrevItem = NULL;