src/hg/hgTracks/imageV2.c 1.27
1.27 2010/05/11 01:43:27 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/imageV2.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/imageV2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -B -U 4 -r1.26 -r1.27
--- src/hg/hgTracks/imageV2.c 16 Mar 2010 00:42:23 -0000 1.26
+++ src/hg/hgTracks/imageV2.c 11 May 2010 01:43:27 -0000 1.27
@@ -30,9 +30,9 @@
struct flatTracks *flatTrack;
AllocVar(flatTrack);
flatTrack->track = track;
char var[256]; // The whole reason to do this is to reorder tracks/subtracks in the image!
-safef(var,sizeof(var),"%s_%s",track->tdb->tableName,IMG_ORDER_VAR);
+safef(var,sizeof(var),"%s_%s",track->tdb->track,IMG_ORDER_VAR);
flatTrack->order = cartUsualInt(cart, var,IMG_ANYORDER);
if(flatTrack->order >= IMG_ORDEREND)
{
cartRemove(cart,var);
@@ -790,9 +790,9 @@
if(imgFile == NULL)
imgFile = slice->parentImg->file;
//else if(differentString(imgFile,slice->parentImg->file))
// {
- // char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->tableName : imgFile);
+ // char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->track : imgFile);
// warn("imgTrackAddMapItem(%s) called, but not all slice images are the same for this track.",name);
// }
// Not a valid warning! Side image and data image may be different!!!
}
@@ -808,9 +808,9 @@
count++;
}
else
{ // FIXME: This is assuming that if there is no map then the entire slice should get the link!
- char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->tableName : imgFile);
+ char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->track : imgFile);
warn("imgTrackAddMapItem(%s,%s) mapItem(lx:%d,rx:%d) is overlapping slice:%s(lx:%d,rx:%d)",name,title,topLeftX,bottomRightX,
sliceTypeToString(slice->type),slice->offsetX,(slice->offsetX + slice->width - 1));
sliceAddLink(slice,link,title);
count++;
@@ -818,9 +818,9 @@
}
}
//if(count>=2)
// {
-// char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->tableName : imgFile);
+// char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb != NULL ? imgTrack->tdb->track : imgFile);
// warn("imgTrackAddMapItem(%s) called for map items stretching across %d slice(s).",name,count);
// }
return count;
}
@@ -831,9 +831,9 @@
if(imgTrack)
{
struct dyString *myDy = addIndent(dy,indent);
dyStringPrintf(myDy,"imgTrack: name:%s tdb:%s%s%s order:%d vis:%s",
- (imgTrack->name?imgTrack->name:""),(imgTrack->tdb && imgTrack->tdb->tableName?imgTrack->tdb->tableName:""),
+ (imgTrack->name?imgTrack->name:""),(imgTrack->tdb && imgTrack->tdb->track?imgTrack->tdb->track:""),
(imgTrack->showCenterLabel?" centerLabel":""),(imgTrack->reorderable?" reorderable":""),
imgTrack->order,hStringFromTv(imgTrack->vis));
if(dy == NULL)
warn("%s",dyStringCannibalize(&myDy));
@@ -865,9 +865,9 @@
imgTrackShow(NULL,imgTrack,0);
}
return FALSE;
}
-char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb->tableName);
+char * name = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb->track);
if (imgTrack->db == NULL)
{
if (verbose)
{
@@ -1455,9 +1455,9 @@
{
struct trackDb * tdb = imgTrack->tdb;
if(tdbIsCompositeChild(tdb))
tdb = trackDbCompositeParent(tdb);
- trackName = tdb->tableName;
+ trackName = tdb->track;
}
hPrintf(" width:9px; display:none;' class='%s btn btnN'></p>",trackName);
}
else
@@ -1590,9 +1590,9 @@
struct imgTrack *imgTrack = imgBox->imgTracks;
for(;imgTrack!=NULL;imgTrack=imgTrack->next)
{
- char *trackName = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb->tableName );
+ char *trackName = (imgTrack->name != NULL ? imgTrack->name : imgTrack->tdb->track );
//if(verbose && imgTrack->order == 3)
// imgTrackShow(NULL,imgTrack,0);
hPrintf("<TR id='tr_%s'%s>\n",trackName,
(imgTrack->reorderable?" class='trDraggable'":" class='nodrop nodrag'"));