src/hg/hgTracks/sampleTracks.c 1.10
1.10 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/sampleTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/sampleTracks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -B -U 4 -r1.9 -r1.10
--- src/hg/hgTracks/sampleTracks.c 21 Dec 2009 22:43:34 -0000 1.9
+++ src/hg/hgTracks/sampleTracks.c 11 May 2010 01:43:28 -0000 1.10
@@ -64,9 +64,9 @@
int heightFromCart;
char o1[128];
-safef( o1, 128, "%s.heightPer", tg->mapName);
+safef( o1, 128, "%s.heightPer", tg->track);
heightFromCart = atoi(cartUsualString(cart, o1, "50"));
tg->lineHeight = max(tl.fontHeight+1, heightFromCart);
@@ -84,9 +84,9 @@
tg->height = lines * tg->lineHeight;
break;
case tvPack:
case tvSquish:
- errAbort("Sorry can't handle pack in sampleTotalHeight (%s)", tg->mapName);
+ errAbort("Sorry can't handle pack in sampleTotalHeight (%s)", tg->track);
break;
case tvDense:
tg->height = tg->lineHeight;
break;
@@ -266,22 +266,22 @@
lf=tg->items;
if(lf==NULL) return;
//take care of cart options
-safef( o1, 128,"%s.linear.interp", tg->mapName);
-safef( o2, 128, "%s.anti.alias", tg->mapName);
-safef( o3, 128,"%s.fill", tg->mapName);
-safef( o4, 128,"%s.min.cutoff", tg->mapName);
-safef( o5, 128,"%s.max.cutoff", tg->mapName);
-safef( o6, 128,"%s.interp.gap", tg->mapName);
+safef( o1, 128,"%s.linear.interp", tg->track);
+safef( o2, 128, "%s.anti.alias", tg->track);
+safef( o3, 128,"%s.fill", tg->track);
+safef( o4, 128,"%s.min.cutoff", tg->track);
+safef( o5, 128,"%s.max.cutoff", tg->track);
+safef( o6, 128,"%s.interp.gap", tg->track);
interpolate = cartUsualString(cart, o1, "Linear Interpolation");
wiggleType = wiggleStringToEnum(interpolate);
aa = cartUsualString(cart, o2, "on");
antiAlias = sameString(aa, "on");
//don't fill gcPercent track by default (but fill others)
-if(sameString( tg->mapName, "pGC") && sameString(database,"zooHuman3"))
+if(sameString( tg->table, "pGC") && sameString(database,"zooHuman3"))
{
fillStr = cartUsualString(cart, o3, "0");
}
else
@@ -310,18 +310,18 @@
//errAbort( "min=%g, max=%g\n", minRangeCutoff, maxRangeCutoff );
-if( sameString( tg->mapName, "zoo" ) || sameString( tg->mapName, "zooNew" ) )
+if( sameString( tg->table, "zoo" ) || sameString( tg->table, "zooNew" ) )
binCount = binCount - 100; //save some space at top, between each zoo species
minRange = whichSampleBin( minRangeCutoff, tg->minRange, tg->maxRange, binCount );
maxRange = whichSampleBin( maxRangeCutoff, tg->minRange, tg->maxRange, binCount );
//errAbort( "(%g,%g) cutoff=(%g,%g)\n", tg->minRange, tg->maxRange, minRangeCutoff, maxRangeCutoff );
-if( sameString( tg->mapName, "zoo" ) || sameString( tg->mapName, "zooNew" ) )
+if( sameString( tg->table, "zoo" ) || sameString( tg->table, "zooNew" ) )
{
/*Always interpolate zoo track (since gaps are explicitly defined*/
lineGapSize = -1;
}
@@ -424,9 +424,9 @@
if( noZoom && isFull )
{
mapBoxHc(hvg, lf->start, lf->end, currentX ,y, currentWidth,
- heightPer, tg->mapName, tg->mapItemName(tg, lf), tg->itemName(tg, lf));
+ heightPer, tg->track, tg->mapItemName(tg, lf), tg->itemName(tg, lf));
if( lf->next != NULL )
y += sampleUpdateY( lf->name, lf->next->name, lineHeight );
else
@@ -478,9 +478,9 @@
/*see if we have a summary table*/
safef(query, sizeof(query),
"select name from %s where name = '%s' limit 1",
- tg->mapName, tg->shortLabel);
+ tg->table, tg->shortLabel);
//errAbort( "%s", query );
hasDense = sqlQuickQuery(conn, query, query, sizeof(query));
/* If we're in dense mode and have a summary table load it. */
@@ -492,9 +492,9 @@
where = cloneString(query);
}
}
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, where, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, where, &rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
sample = sampleLoad(row + rowOffset);
lf = lfFromSample(sample);
@@ -582,24 +582,24 @@
pixPerBase = (winEnd - winStart)/ tl.picWidth;
/* Determine zoom level. */
- if (!strstr(tg->mapName,"HMRConservation"))
+ if (!strstr(tg->table,"HMRConservation"))
z = humMusZoomLevel();
else z=0;
if(z == 1 )
safef(tableName, sizeof(tableName), "%s_%s", "zoom1",
- tg->mapName);
+ tg->table);
else if( z == 2)
safef(tableName, sizeof(tableName), "%s_%s", "zoom50",
- tg->mapName);
+ tg->table);
else if(z == 3)
safef(tableName, sizeof(tableName), "%s_%s",
- "zoom2500", tg->mapName);
+ "zoom2500", tg->table);
else
- safef(tableName, sizeof(tableName), "%s", tg->mapName);
+ safef(tableName, sizeof(tableName), "%s", tg->table);
//printf("(%s)", tableName );
sr = hRangeQuery(conn, tableName, chromName, winStart, winEnd,
@@ -783,9 +783,9 @@
zooSpeciesHashInit();
/*see if we have a summary table*/
-safef(query, sizeof(query), "select name from %s where name = '%s' limit 1", tg->mapName, tg->shortLabel);
+safef(query, sizeof(query), "select name from %s where name = '%s' limit 1", tg->table, tg->shortLabel);
//errAbort( "%s", query );
hasDense = sqlQuickQuery(conn, query, query, sizeof(query));
/* If we're in dense mode and have a summary table load it. */
@@ -797,9 +797,9 @@
where = cloneString(query);
}
}
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, where, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, where, &rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
sample = sampleLoad(row + rowOffset);
lf = lfFromSample(sample);
@@ -872,22 +872,22 @@
/* Determine zoom level. */
if(pixPerBase >= zoom1)
- safef(tableName, sizeof(tableName), "%s_%s", "zoom1", tg->mapName);
+ safef(tableName, sizeof(tableName), "%s_%s", "zoom1", tg->table);
else if(pixPerBase >= zoom2)
- safef(tableName, sizeof(tableName), "%s_%s", "zoom2", tg->mapName);
+ safef(tableName, sizeof(tableName), "%s_%s", "zoom2", tg->table);
else
- safef(tableName, sizeof(tableName), "%s", tg->mapName);
+ safef(tableName, sizeof(tableName), "%s", tg->table);
/*see if we have a summary table*/
if(hTableExists(database, tableName))
safef(query, sizeof(query), "select name from %s where name = '%s' limit 1", tableName, tg->shortLabel);
else
{
warn("<p>Couldn't find table %s<br><br>", tableName);
- safef(query, sizeof(query), "select name from %s where name = '%s' limit 1", tg->mapName, tg->shortLabel);
- safef(tableName, sizeof(tableName), "%s", tg->mapName);
+ safef(query, sizeof(query), "select name from %s where name = '%s' limit 1", tg->table, tg->shortLabel);
+ safef(tableName, sizeof(tableName), "%s", tg->table);
}
hasDense = sqlQuickQuery(conn, query, query, sizeof(query));