2e3514ccacc941c9b8ffcaecb83438b4c3053e5e
Merge parents 4cbae69 a13fa51
kate
  Thu Oct 22 20:35:34 2015 -0700
Resolving merge

diff --cc src/hg/hgTracks/hgTracks.c
index 08486bd,5735c0c..7ed2472
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@@ -1207,53 -1208,55 +1207,54 @@@
          samplePrintYAxisLabel( hvg, y+5, track, "3.0", min0, max0 );
          samplePrintYAxisLabel( hvg, y+5, track, "4.0", min0, max0 );
          samplePrintYAxisLabel( hvg, y+5, track, "5.0", min0, max0 );
          samplePrintYAxisLabel( hvg, y+5, track, "6.0", min0, max0 );
          }
      }
  else
      {
      sprintf( minRangeStr, "%d", (int)round(minRangeCutoff));
      sprintf( maxRangeStr, "%d", (int)round(maxRangeCutoff));
      }
  /* special label handling for wigMaf type tracks -- they
     display a left label in pack mode.  To use the full mode
     labeling, temporarily set visibility to full.
     Restore savedVis later */
 -if (startsWith("wigMaf", track->tdb->type) || startsWith("maf", track->tdb->type))
 +if (startsWith("bigMaf", track->tdb->type) || startsWith("wigMaf", track->tdb->type) || startsWith("maf", track->tdb->type))
      vis = tvFull;
  
  switch (vis)
      {
      case tvHide:
          break;  /* Do nothing; */
      case tvPack:
      case tvSquish:
  	y += tHeight;
          break;
      case tvFull:
          if (isCenterLabelIncluded(track))
              y += fontHeight;
 -        start = 1;
  
          if( track->subType == lfSubSample && track->items == NULL )
              y += track->height;
  
          for (item = track->items; item != NULL; item = item->next)
              {
              char *rootName;
              char *name = track->itemName(track, item);
              int itemHeight = track->itemHeight(track, item);
+             //warn(" track %s, itemHeight %d\n", track->shortLabel, itemHeight);
              newy = y;
  
              if (track->itemLabelColor != NULL)
                  labelColor = track->itemLabelColor(track, item, hvg);
  
              /* Do some fancy stuff for sample tracks.
               * Draw y-value limits for 'sample' tracks. */
              if (track->subType == lfSubSample )
                  {
                  if( prev == NULL )
                      newy += itemHeight;
                  else
                      newy += sampleUpdateY(name,
                              track->itemName(track, prev), itemHeight);
                  if( newy == y )