src/hg/hgTracks/simpleTracks.c 1.108

Index: src/hg/hgTracks/simpleTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/simpleTracks.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -b -B -U 4 -r1.107 -r1.108
--- src/hg/hgTracks/simpleTracks.c	24 Sep 2009 22:14:37 -0000	1.107
+++ src/hg/hgTracks/simpleTracks.c	1 Nov 2009 19:46:04 -0000	1.108
@@ -2701,9 +2701,9 @@
 
 boolean nextItemCompatible(struct track *tg)
 /* Check to see if we draw nextPrev item buttons on a track. */
 {
-return (withNextExonArrows && tg->nextItemButtonable && tg->nextPrevItem);
+return (withNextExonArrows && tg->nextExonButtonable && tg->nextPrevExon);
 }
 
 void genericMapItem(struct track *tg, struct hvGfx *hvg, void *item,
 		    char *itemName, char *mapItemName, int start, int end,
@@ -2749,14 +2749,14 @@
     if (lButton)
         {
         tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, textX, y, insideX-textX, heightPer);
-        tg->nextPrevItem(tg, hvg, item, insideX, y, buttonW, heightPer, FALSE);
+        tg->nextPrevExon(tg, hvg, item, insideX, y, buttonW, heightPer, FALSE);
         if (rButton)
             {
             tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, insideX + buttonW, y, x2 - (insideX + 2*buttonW), heightPer);
-            tg->nextPrevItem(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
+            tg->nextPrevExon(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
             }
         else
             tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, insideX + buttonW, y, x2 - (insideX + buttonW), heightPer);
@@ -2766,15 +2766,15 @@
         /* prev-item button, AND the gene name is drawn left of the browser window. */
         {
         tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, textX, y, x2 - buttonW - textX, heightPer);
-        tg->nextPrevItem(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
+        tg->nextPrevExon(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
         }
     else if (rButton)
         {
         tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, textX, y, w - buttonW, heightPer);
-        tg->nextPrevItem(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
+        tg->nextPrevExon(tg, hvg, item, x2-buttonW, y, buttonW, heightPer, TRUE);
         }
     else
         tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
                 s, e, textX, y, w, heightPer);
@@ -2788,11 +2788,11 @@
     tg->mapItem(tg, hvg, item, tg->itemName(tg, item), tg->mapItemName(tg, item),
         s, e, trackPastTabX, y, insideX - trackPastTabX, heightPer);
     /* Make the button mapboxes. */
     if (lButton)
-        tg->nextPrevItem(tg, hvg, item, insideX, y, buttonW, heightPer, FALSE);
+        tg->nextPrevExon(tg, hvg, item, insideX, y, buttonW, heightPer, FALSE);
     if (rButton)
-        tg->nextPrevItem(tg, hvg, item, insideX + insideWidth - buttonW, y, buttonW, heightPer, TRUE);
+        tg->nextPrevExon(tg, hvg, item, insideX + insideWidth - buttonW, y, buttonW, heightPer, TRUE);
     /* Depending on which button mapboxes we drew, draw the remaining mapbox. */
     if (lButton && rButton)
         {
         geneMapBoxX += buttonW;
@@ -3282,10 +3282,10 @@
 tg->itemHeight = tgFixedItemHeight;
 tg->itemStart = linkedFeaturesItemStart;
 tg->itemEnd = linkedFeaturesItemEnd;
 tg->itemNameColor = linkedFeaturesNameColor;
-tg->nextPrevItem = linkedFeaturesNextPrevItem;
-tg->labelNextPrevItem = linkedFeaturesLabelNextPrevItem;
+tg->nextPrevExon = linkedFeaturesNextPrevItem;
+tg->nextPrevItem = linkedFeaturesLabelNextPrevItem;
 }
 
 int linkedFeaturesSeriesItemStart(struct track *tg, void *item)
 /* Return start chromosome coordinate of item. */
@@ -9357,10 +9357,10 @@
 tg->totalHeight = pgSnpHeight;
 tg->itemName = pgSnpName;
 tg->drawItemAt = pgSnpDrawAt;
 tg->mapItem = pgSnpMapItem;
-tg->labelNextItemButtonable = TRUE;
-tg->labelNextPrevItem = linkedFeaturesLabelNextPrevItem;
+tg->nextItemButtonable = TRUE;
+tg->nextPrevItem = linkedFeaturesLabelNextPrevItem;
 }
 
 void loadBlatz(struct track *tg)
 {
@@ -10189,30 +10189,30 @@
 tg->itemColor = gvColor;
 tg->itemNameColor = gvColor;
 tg->itemName = gvName;
 tg->mapItemName = gvPosMapName;
-tg->labelNextItemButtonable = TRUE;
-tg->labelNextPrevItem = linkedFeaturesLabelNextPrevItem;
+tg->nextItemButtonable = TRUE;
+tg->nextPrevItem = linkedFeaturesLabelNextPrevItem;
 }
 
 void protVarMethods (struct track *tg)
 /* name vs id, next items */
 {
 tg->loadItems = loadProtVar;
 tg->itemName = protVarName;
 tg->mapItemName = protVarMapName;
-tg->labelNextItemButtonable = TRUE;
-tg->labelNextPrevItem = linkedFeaturesLabelNextPrevItem;
+tg->nextItemButtonable = TRUE;
+tg->nextPrevItem = linkedFeaturesLabelNextPrevItem;
 }
 
 void oregannoMethods (struct track *tg)
 /* load so can allow filtering on type */
 {
 tg->loadItems = loadOreganno;
 tg->itemColor = oregannoColor;
 tg->itemNameColor = oregannoColor;
-tg->labelNextItemButtonable = TRUE;
-tg->labelNextPrevItem = linkedFeaturesLabelNextPrevItem;
+tg->nextItemButtonable = TRUE;
+tg->nextPrevItem = linkedFeaturesLabelNextPrevItem;
 }
 
 char *omimGeneName(struct track *tg, void *item)
 /* set name for omimGene track */
@@ -10960,12 +10960,12 @@
     else
        exonArrows = "on";
     }
 track->exonArrows = sameString(exonArrows, "on");
-track->nextItemButtonable = TRUE;
+track->nextExonButtonable = TRUE;
 if (nextItem && sameString(nextItem, "off"))
-    track->nextItemButtonable = FALSE;
-track->labelNextItemButtonable = track->nextItemButtonable;
+    track->nextExonButtonable = FALSE;
+track->nextItemButtonable = track->nextExonButtonable;
 #ifndef GBROWSE
 char *iatName = trackDbSetting(tdb, "itemAttrTbl");
 if (iatName != NULL)
     track->itemAttrTbl = itemAttrTblNew(iatName);