src/hg/hgTracks/cds.c 1.106

1.106 2010/05/11 01:43:26 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/cds.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/cds.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -b -B -U 4 -r1.105 -r1.106
--- src/hg/hgTracks/cds.c	3 Mar 2010 23:25:07 -0000	1.105
+++ src/hg/hgTracks/cds.c	11 May 2010 01:43:26 -0000	1.106
@@ -1672,17 +1672,17 @@
  * in tg->drawItemAt.  Uses tg->drawItems method to determine whether
  * tg is linkedFeatures or linkedFeaturesSeries (currently the only
  * two supported track types -- bed, psl etc. are subclasses of these). */
 {
-if (initedTrack == NULL || differentString(tg->mapName, initedTrack))
+if (initedTrack == NULL || differentString(tg->track, initedTrack))
     {
     int overallStart, overallEnd;
     boolean isSeries = FALSE;
     if (tg->drawItems == linkedFeaturesSeriesDraw)
 	isSeries = TRUE;
     else if (!baseColorCanDraw(tg))
 	errAbort("baseColorInitTrack: track %s has a type not recognized by baseColorCanDraw.",
-		 tg->mapName);
+		 tg->track);
     getLinkedFeaturesSpan((struct linkedFeatures *)tg->items, &overallStart, &overallEnd,
 			  isSeries);
     if (overallStart < cachedGenoStart || overallEnd > cachedGenoEnd)
 	{
@@ -1690,9 +1690,9 @@
 	cachedGenoStart = overallStart;
 	cachedGenoEnd = overallEnd;
 	cachedGenoDna = hDnaFromSeq(database, chromName, cachedGenoStart, cachedGenoEnd, dnaUpper);
 	}
-    initedTrack = cloneString(tg->mapName);
+    initedTrack = cloneString(tg->track);
     }
 
 /* allocate colors for coding coloring */
 if (!cdsColorsMade)
@@ -1704,12 +1704,12 @@
 
 static void checkTrackInited(struct track *tg, char *what)
 /* Die if baseColorInitTrack has not been called (most recently) for this track. */
 {
-if (initedTrack == NULL || differentString(tg->mapName, initedTrack))
+if (initedTrack == NULL || differentString(tg->track, initedTrack))
     errAbort("Error: Track %s should have been baseColorInitTrack'd before %s.  "
 	     "(tg->drawItems may be unrecognized by baseColorCanDraw)",
-	     tg->mapName, what);
+	     tg->track, what);
 }
 
 enum baseColorDrawOpt baseColorDrawSetup(struct hvGfx *hvg, struct track *tg,
 			struct linkedFeatures *lf,
@@ -1744,9 +1744,9 @@
     drawOpt == baseColorDrawItemCodons ||
     drawOpt == baseColorDrawDiffCodons ||
     indelShowPolyA)
     {
-    *retMrnaSeq = maybeGetSeqUpper(lf, tg->mapName, tg);
+    *retMrnaSeq = maybeGetSeqUpper(lf, tg->track, tg);
     if (*retMrnaSeq != NULL && *retPsl != NULL) // we have both sequence and PSL
 	{
         if ((*retMrnaSeq)->size != (*retPsl)->qSize)
             errAbort("baseColorDrawSetup: %s: mRNA size (%d) != psl qSize (%d)",