src/hg/hgTracks/wigMafTrack.c 1.146
1.146 2010/05/11 01:43:28 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/hgTracks/wigMafTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/wigMafTrack.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -b -B -U 4 -r1.145 -r1.146
--- src/hg/hgTracks/wigMafTrack.c 7 May 2010 18:29:15 -0000 1.145
+++ src/hg/hgTracks/wigMafTrack.c 11 May 2010 01:43:28 -0000 1.146
@@ -187,9 +187,9 @@
if (sameWord(firstCase, "noChange")) lowerFirstChar = FALSE;
}
char *cfgPrefix = compositeViewControlNameFromTdb(track->tdb);
-safef(buffer, sizeof(buffer), "%s.vis",/*cfgPrefix*/track->mapName);
+safef(buffer, sizeof(buffer), "%s.vis",/*cfgPrefix*/track->track);
if (!cartVarExists(cart, buffer) && (speciesTarget != NULL))
useTarg = TRUE;
else
{
@@ -280,9 +280,9 @@
speciesOrder = ptr;
}
- safef(option, sizeof(option), "%s.speciesOrder", /*cfgPrefix*/track->mapName);
+ safef(option, sizeof(option), "%s.speciesOrder", /*cfgPrefix*/track->track);
speciesCt = chopLine(cloneString(speciesOrder), species);
for (i = 0; i < speciesCt; i++)
{
@@ -306,9 +306,9 @@
{
mi->height = height;
dyStringPrintf(order, "%s ",mi->db);
}
-safef(option, sizeof(option), "%s.speciesOrder", /*cfgPrefix*/track->mapName);
+safef(option, sizeof(option), "%s.speciesOrder", /*cfgPrefix*/track->track);
cartSetString(cart, option, order->string);
compositeViewControlNameFree(&cfgPrefix);
slReverse(&miList);
@@ -387,9 +387,9 @@
{
char *fileName = getTrackMafFile(track); // optional
conn = hAllocConn(database);
conn2 = hAllocConn(database);
- mp->list = wigMafLoadInRegion(conn, conn2, track->mapName,
+ mp->list = wigMafLoadInRegion(conn, conn2, track->table,
chromName, winStart - 2 , winEnd + 2, fileName);
hFreeConn(&conn);
hFreeConn(&conn2);
}
@@ -525,9 +525,9 @@
static boolean displayPairwise(struct track *track)
/* determine if tables are present for pairwise display */
{
-return winBaseCount < MAF_SUMMARY_VIEW || isCustomTrack(track->mapName) ||
+return winBaseCount < MAF_SUMMARY_VIEW || isCustomTrack(track->table) ||
pairwiseSuffix(track) || summarySetting(track);
}
static boolean displayZoomedIn(struct track *track)
@@ -579,9 +579,9 @@
{
char *fileName = getTrackMafFile(track); // optional
conn = hAllocConn(database);
conn2 = hAllocConn(database);
- mp->list = wigMafLoadInRegion(conn, conn2, track->mapName,
+ mp->list = wigMafLoadInRegion(conn, conn2, track->table,
chromName, winStart, winEnd, fileName);
hFreeConn(&conn);
hFreeConn(&conn2);
}
@@ -626,9 +626,9 @@
/* if we're out in summary view and rendering a custom
* track we force dense mode since we don't have
* a summary table (yet). */
-if ((winBaseCount >= MAF_SUMMARY_VIEW) && isCustomTrack(track->mapName))
+if ((winBaseCount >= MAF_SUMMARY_VIEW) && isCustomTrack(track->table))
track->limitedVis = tvDense;
/* Load up mafs and store in track so drawer doesn't have
* to do it again. */
@@ -1196,9 +1196,9 @@
/* get pairwise table suffix from trackDb */
suffix = pairwiseSuffix(track);
-if (vis == tvFull && !isCustomTrack(track->mapName))
+if (vis == tvFull && !isCustomTrack(track->table))
{
double minY = 50.0;
double maxY = 100.0;
@@ -1218,9 +1218,9 @@
{
if (mi->ix < 0)
/* ignore item for the score */
continue;
- if (isCustomTrack(track->mapName))
+ if (isCustomTrack(track->table))
{
struct mafPriv *mp = getMafPriv(track);
drawScoreOverviewCT(mp->ct->dbTableName, mi->height,
seqStart, seqEnd,
@@ -1236,9 +1236,10 @@
tableName = getWigTablename(mi->db, suffix);
if (hTableExists(database, tableName))
{
/* reuse the wigTrack for pairwise tables */
- wigTrack->mapName = tableName;
+ wigTrack->track = tableName;
+ wigTrack->table = tableName;
wigTrack->loadItems(wigTrack);
wigTrack->height = wigTrack->lineHeight = wigTrack->heightPer =
pairwiseHeight - 1;
/* clip, but leave 1 pixel border */
@@ -1399,9 +1400,9 @@
{
if (displayZoomedIn(track))
return drawPairsFromMultipleMaf(track, seqStart, seqEnd, hvg,
xOff, yOff, width, font, color, vis);
- if (isCustomTrack(track->mapName) || pairwiseSuffix(track))
+ if (isCustomTrack(track->table) || pairwiseSuffix(track))
return drawPairsFromPairwiseMafScores(track, seqStart, seqEnd, hvg,
xOff, yOff, width, font, color, vis);
if (summarySetting(track))
return drawPairsFromSummary(track, seqStart, seqEnd, hvg,
@@ -1795,17 +1796,17 @@
else
{
conn2 = hAllocConn(database);
conn3 = hAllocConn(database);
- tableName = track->mapName;
+ tableName = track->table;
mafFile = getTrackMafFile(track); // optional
}
if (hIsGsidServer())
{
/* decide the value of mafOrigOffset to be used to display xxAaMaf tracks. */
struct sqlConnection *conn = hAllocConn(database);
- safef(query, sizeof(query), "select chromStart from %s", track->mapName);
+ safef(query, sizeof(query), "select chromStart from %s", track->table);
mafOrig = atoi(sqlNeedQuickString(conn, query));
mafOrigOffset = (mafOrig % 3) - 1;
/* offset has to be non-negative */
if (mafOrigOffset < 0) mafOrigOffset = mafOrigOffset +3;
@@ -1844,9 +1845,9 @@
cartSetBoolean(cart, option, TRUE);
}
}
-safef(buf, sizeof(buf), "%s.frames",/*cfgPrefix*/track->mapName);
+safef(buf, sizeof(buf), "%s.frames",/*cfgPrefix*/track->track);
if (cartVarExists(cart, buf))
framesTable = cartUsualString(cart, buf, NULL);
else
framesTable = trackDbSetting(track->tdb, "frames");
@@ -2390,9 +2391,9 @@
}
else
{
/* use or scored refs from maf table*/
- drawScoreOverview(track->mapName, height, seqStart, seqEnd, hvg,
+ drawScoreOverview(track->table, height, seqStart, seqEnd, hvg,
xOff, yOff, width, font, color, color, scoreVis);
yOff++;
}
yOff += height;
@@ -2448,10 +2449,10 @@
else
wigMafDrawPairwise(track, seqStart, seqEnd, hvg, xOff, y,
width, font, color, vis);
}
-mapBoxHc(hvg, seqStart, seqEnd, xOff, yOff, width, track->height, track->mapName,
- track->mapName, NULL);
+mapBoxHc(hvg, seqStart, seqEnd, xOff, yOff, width, track->height, track->track,
+ track->track, NULL);
}
void wigMafMethods(struct track *track, struct trackDb *tdb,
int wordCount, char *words[])
@@ -2499,9 +2500,10 @@
dyStringPrintf(wigType, "type wig ");
for (i = 1; i < wordCount; i++)
dyStringPrintf(wigType, "%s ", words[i]);
wigTdb->type = cloneString(wigType->string);
- wigTdb->tableName = consWig->table;
+ wigTdb->track = consWig->table;
+ wigTdb->table= consWig->table;
/* Tweak wiggle left labels: replace underscore with space and
* append 'Cons' */
struct dyString *ds = dyStringNew(0);