b393c3f11daea1b552d81bb90ec64e844e7fa955 kate Thu Apr 7 09:15:13 2016 -0700 Fix to GTEx limitVis fix, tnx Galt diff --git src/hg/hgTracks/gtexTracks.c src/hg/hgTracks/gtexTracks.c index 13c5e66..3864135 100644 --- src/hg/hgTracks/gtexTracks.c +++ src/hg/hgTracks/gtexTracks.c @@ -847,31 +847,32 @@ } int topGraphHeight = gtexGeneGraphHeight(tg, geneInfo, TRUE); topGraphHeight = max(topGraphHeight, tl.fontHeight); int bottomGraphHeight = 0; boolean isComparison = ((struct gtexGeneExtras *)tg->extraUiData)->isComparison; if (isComparison) { bottomGraphHeight = max(gtexGeneGraphHeight(tg, geneInfo, FALSE), tl.fontHeight) + gtexGeneMargin(); } height = topGraphHeight + bottomGraphHeight + gtexGeneMargin() + gtexGeneModelHeight(extras); return height; } -static int gtexGeneMaxHeight(struct track *tg) +//DEBUG RESTORE? static +int gtexGeneMaxHeight(struct track *tg) /* Maximum height in pixels of a gene graph */ { return gtexGeneItemHeightOptionalMax(tg, NULL, TRUE); } static int gtexGeneItemHeight(struct track *tg, void *item) { int height = gtexGeneItemHeightOptionalMax(tg, item, FALSE); return height; } static char *tissueExpressionText(struct gtexTissue *tissue, double expScore, boolean doLogTransform, char *qualifier) /* Construct mouseover text for tissue graph */ { @@ -1045,33 +1046,33 @@ int height = 0; if (vis == tvDense) { height = tgFixedTotalHeightOptionalOverflow(tg, vis, tl.fontHeight+1, tl.fontHeight, FALSE); } else if (vis == tvSquish) { // for visibility, set larger than the usual squish, which is half font height height = gtexSquishItemHeight() * 2; // the squish packer halves this height = tgFixedTotalHeightOptionalOverflow(tg, vis, height+1, height, FALSE); } else if ((vis == tvPack) || (vis == tvFull)) { // layout -- initially as fixed height - int height = gtexGeneMaxHeight(tg); // TODO KATE - height = tl.fontHeight; - tgFixedTotalHeightOptionalOverflow(tg, vis, height, height, FALSE); + //int lineHeight = gtexGeneMaxHeight(tg); // TODO KATE THIS MAY BE OBSOLETE + int lineHeight = tl.fontHeight; + height = tgFixedTotalHeightOptionalOverflow(tg, vis, lineHeight, lineHeight, FALSE); // set variable height rows if (tg->ss->rowCount != 0) { if (!tg->ss->rowSizes) { // collect the rowSizes data across all windows assert(currentWindow==windows); // first window assert(tg->ss->vis == vis); // viz matches, we have the right one struct spaceSaver *ssHold; AllocVar(ssHold); struct track *tgSave = tg; for(tg=tgSave; tg; tg=tg->nextWindow) { assert(tgSave->ss->vis == tg->ss->vis); // viz matches, we have the right one