49029c6209ad86693a552fd4dd8e7a4a55d8777f braney Thu Apr 13 09:48:13 2023 -0700 fix problems with squishyPack track name and non-sticky squishyPackPoint refs #30225 diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 212b998..50e9d49 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -4784,32 +4784,32 @@ if (lf->squishyPackVal >= squishyPackPoint) slAddHead(&squishTrack->items, lf); else slAddHead(&track->items, lf); } // if the squish track has no items, don't bother including it if (slCount(squishTrack->items) == 0) continue; slReverse(&track->items); slReverse(&squishTrack->items); squishTrack->track = cloneString(buffer); squishTrack->originalTrack = cloneString(track->track); - squishTrack->shortLabel = cloneString(buffer); - squishTrack->longLabel = cloneString(buffer); + squishTrack->shortLabel = cloneString(track->shortLabel); + squishTrack->longLabel = cloneString(track->longLabel); /* insert the squished track */ track->next = squishTrack; squishTrack->next = nextTrack; } } } void makeActiveImage(struct track *trackList, char *psOutput) /* Make image and image map. */ { struct track *track; MgFont *font = tl.font; struct hvGfx *hvg; struct tempName pngTn; @@ -5294,39 +5294,42 @@ curImgTrack = imgBoxTrackFind(theImgBox,track->tdb,NULL); curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stButton,NULL,NULL, sliceWidth[stButton],sliceHeight, sliceOffsetX[stButton],sliceOffsetY); } else if (!trackImgOnly) // Side buttons only need to be drawn when drawing page { // with js advanced features off if (grayButtonGroup) drawGrayButtonBox(hvgSide, trackTabX, yStart, trackTabWidth, h, track->hasUi); else drawBlueButtonBox(hvgSide, trackTabX, yStart, trackTabWidth, h, track->hasUi); } if (track->hasUi) { + char *title = track->track; + if (track->originalTrack != NULL) + title = track->originalTrack; if (tdbIsCompositeChild(track->tdb)) { struct trackDb *parent = tdbGetComposite(track->tdb); mapBoxTrackUi(hvgSide, trackTabX, yStart, trackTabWidth, (yEnd - yStart - 1), parent->track, parent->shortLabel, track->track); } else - mapBoxTrackUi(hvgSide, trackTabX, yStart, trackTabWidth, h, track->track, - track->shortLabel, track->track); + mapBoxTrackUi(hvgSide, trackTabX, yStart, trackTabWidth, h, title, + track->shortLabel, title); } } } butOff = trackTabX + trackTabWidth; leftLabelX += butOff; leftLabelWidth -= butOff; } /* Draw left labels. */ if (withLeftLabels) { if (theImgBox == NULL) {