fbe9faf925e4fbcb5366c86d821be064a1b56872 kate Wed Jul 22 17:03:47 2015 -0700 Add faint gray line under graph to show extent when bars are missing. refs #15645 diff --git src/hg/hgTracks/gtexTracks.c src/hg/hgTracks/gtexTracks.c index 5f22dc8..d54fb51 100644 --- src/hg/hgTracks/gtexTracks.c +++ src/hg/hgTracks/gtexTracks.c @@ -84,30 +84,39 @@ else return MIN_GRAPH_PADDING; } static int gtexGraphHeight() { int winSize = winEnd - winStart; if (winSize < WIN_MAX_GRAPH) return MAX_GRAPH_HEIGHT; else if (winSize < WIN_MED_GRAPH) return MED_GRAPH_HEIGHT; else return MIN_GRAPH_HEIGHT; } +static int gtexGraphWidth(struct gtexGeneBed *gtex) +/* Width of GTEx graph in pixels */ +{ +int barWidth = gtexBarWidth(); +int padding = gtexGraphPadding(); +int count = gtex->expCount; +return (barWidth * count) + (padding * (count-1)); +} + static int valToY(double val, double maxVal, int height) /* Convert a value from 0 to maxVal to 0 to height-1 */ { double scaled = val/maxVal; int y = scaled * (height); return (height-1) - y; //int y = scaled * (height-1); //return (height - 1) - y; } struct gtexGeneExtras { double maxExp; }; @@ -135,41 +144,30 @@ struct gtexTissue *tissue = NULL; int count = slCount(tissues); struct rgbColor *colors; AllocArray(colors, count); int i = 0; for (tissue = tissues; tissue != NULL; tissue = tissue->next) { // TODO: reconcile colors[i] = (struct rgbColor){.r=COLOR_32_BLUE(tissue->color), .g=COLOR_32_GREEN(tissue->color), .b=COLOR_32_RED(tissue->color)}; //colors[i] = mgColorIxToRgb(NULL, tissue->color); i++; } return colors; } -#ifdef NEW -static int gtexGraphWidth(struct gtexGeneBed *gtex) -/* Width of GTEx graph in pixels */ -{ -int barWidth = gtexBarWidth(); -int padding = gtexGraphPadding(); -int count = gtex->expCount; -return (barWidth * count) + (padding * (count-1)); -} -#endif - static int gtexGraphX(struct gtexGeneBed *gtex) /* Locate graph on X, relative to viewport. Return -1 if it won't fit */ { int start = max(gtex->chromStart, winStart); //int end = min(gtex->chromEnd, winEnd); //if (start > end) //return -1; double scale = scaleForWindow(insideWidth, winStart, winEnd); int x1 = round((start - winStart) * scale); //int x2 = round((end - winStart) * scale); //int width = gtexGraphWidth(gtex); //if (x1 + width > x2) //return -1; return x1; } @@ -212,31 +210,35 @@ int expCount = geneBed->expCount; double maxExp = ((struct gtexGeneExtras *)tg->extraUiData)->maxExp; struct rgbColor lineColor = {.r=0}; int lineColorIx = hvGfxFindColorIx(hvg, lineColor.r, lineColor.g, lineColor.b); int heightPer = tg->heightPer; int graphX = gtexGraphX(geneBed); if (graphX < 0) return; // x1 is at left of graph int x1 = xOff + graphX; // yZero is at bottom of graph int yZero = gtexGraphHeight() + y - 1; -uglyf("DRAW: xOff=%d, x1=%d, y=%d, yZero=%d<br>", xOff, x1, y, yZero); +// draw faint line under graph to delineate extent when bars are missing (tissue w/ 0 expression) +Color lightGray = MAKECOLOR_32(0xD1, 0xD1, 0xD1); +hvGfxBox(hvg, x1, yZero+1, gtexGraphWidth(geneBed), 1, lightGray); + +//uglyf("DRAW: xOff=%d, x1=%d, y=%d, yZero=%d<br>", xOff, x1, y, yZero); int barWidth = gtexBarWidth(); int graphPadding = gtexGraphPadding(); char *colorScheme = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_COLORS, GTEX_COLORS_DEFAULT); struct rgbColor *colors; if (sameString(colorScheme, GTEX_COLORS_GTEX)) { // retrieve from table // TODO: cache this colors = getGtexTissueColors(); } else { // currently the only other choice @@ -249,111 +251,112 @@ struct rgbColor fillColor = colors[i]; if (barWidth == 1 && sameString(colorScheme, GTEX_COLORS_GTEX)) { // brighten colors a bit so they'll be more visible at this scale struct hslColor hsl = mgRgbToHsl(fillColor); hsl.s = min(1000, hsl.s + 300); fillColor = mgHslToRgb(hsl); } int fillColorIx = hvGfxFindColorIx(hvg, fillColor.r, fillColor.g, fillColor.b); double expScore = geneBed->expScores[i]; int yMedian = valToY(expScore, maxExp, gtexGraphHeight()) + y; //int height = yZero - yMedian + 1; int height = yZero - yMedian; // TODO: adjust yGene instead of yMedian+1 to get gene track distance as desired //if (i ==0) uglyf("DRAW: expScore=%.2f, maxExp=%.2f, graphHeight=%d, y=%d<br>", expScore, maxExp, gtexGraphHeight(), y); - if (i ==0) uglyf("DRAW: yZero=%d, yMedian=%d, height=%d<br>", yZero, yMedian, height); + //if (i ==0) uglyf("DRAW: yZero=%d, yMedian=%d, height=%d<br>", yZero, yMedian, height); if (graphPadding == 0 || sameString(colorScheme, GTEX_COLORS_GTEX)) hvGfxBox(hvg, x1, yMedian+1, barWidth, height, fillColorIx); else hvGfxOutlinedBox(hvg, x1, yMedian+1, barWidth, height, fillColorIx, lineColorIx); x1 = x1 + barWidth + graphPadding; } + // mark gene extent int yGene = yZero + gtexGeneMargin() - 1; #ifdef NO_GENE // underline int start = max(geneBed->chromStart, winStart); int end = min(geneBed->chromEnd, winEnd); if (start > end) return; int xStart = round((start - winStart) * scale)+xOff; int width = round((end-start)*scale); hvGfxBox(hvg, xStart, yGene, width, gtexGeneHeight(), lineColorIx); //uglyf("DRAW: xStart=%d, yGene=%d, width=%d, height=%d<br> ", xStart, yGene, width, gtexGeneHeight()); #endif // load & draw gene model char query[1024]; char **row; sqlSafef(query, sizeof query, "select * from gtexGeneModel where name='%s'", geneBed->geneId); struct sqlConnection *conn = hAllocConn(database); if (conn == NULL) return; -uglyf("query: %s<br>", query); +//uglyf("query: %s<br>", query); struct sqlResult *sr = sqlGetResult(conn, query); struct genePred *geneModel = NULL; if (sr != NULL) { if ((row = sqlNextRow(sr)) != NULL) geneModel = genePredLoad(row); sqlFreeResult(&sr); } if (geneModel == NULL) return; struct linkedFeatures *lf = linkedFeaturesFromGenePred(tg, geneModel, FALSE); tg->heightPer = gtexGeneHeight()+1; lf->filterColor = statusColor; linkedFeaturesDrawAt(tg, lf, hvg, xOff, yGene, scale, font, color, tvSquish); tg->heightPer = heightPer; hFreeConn(&conn); } static void gtexGeneMapItem(struct track *tg, struct hvGfx *hvg, void *item, char *itemName, char *mapItemName, int start, int end, int x, int y, int width, int height) /* Create a map box for each tissue (bar in the graph) */ { -uglyf("map item: itemName=%s, mapItemName=%s, start=%d, end=%d, x=%d, y=%d, width=%d, height=%d, insideX=%d<br>", - itemName, mapItemName, start, end, x, y, width, height, insideX); +//uglyf("map item: itemName=%s, mapItemName=%s, start=%d, end=%d, x=%d, y=%d, width=%d, height=%d, insideX=%d<br>", + //itemName, mapItemName, start, end, x, y, width, height, insideX); struct gtexTissue *tissues = getGtexTissues(); struct gtexTissue *tissue = NULL; struct gtexGeneBed *gtex = item; int barWidth = gtexBarWidth(); int padding = gtexGraphPadding(); double maxExp = ((struct gtexGeneExtras *)tg->extraUiData)->maxExp; int graphX = gtexGraphX((struct gtexGeneBed *)item); if (graphX < 0) return; // x1 is at left of graph int x1 = insideX + graphX; int i = 0; int yZero = gtexGraphHeight() + y - 1; for (tissue = tissues; tissue != NULL; tissue = tissue->next, i++) { double expScore = gtex->expScores[i]; int yMedian = valToY(expScore, maxExp, gtexGraphHeight()) + y; int height = yZero - yMedian; // TODO: call genericMapItem //genericMapItem(tg, hvg, item, itemName, tissue->description, start, end, x1, y, barWidth, height); mapBoxHc(hvg, start, end, x1, yMedian+1, barWidth, height, tg->track, mapItemName, tissue->description); - if (i==0) uglyf("MAP: expScore=%.2f, maxExp=%.2f, graphHeight=%d, y=%d<br>", expScore, maxExp, gtexGraphHeight(), y); - if (i==0) uglyf("MAP: x=%d, x1=%d, y=%d, yZero=%d<br>", x, x1, y, yZero); - if (i==0) uglyf("MAP: yZero=%d, yMedian=%d, height=%d<br>", yZero, yMedian, height); + //if (i==0) uglyf("MAP: expScore=%.2f, maxExp=%.2f, graphHeight=%d, y=%d<br>", expScore, maxExp, gtexGraphHeight(), y); + //if (i==0) uglyf("MAP: x=%d, x1=%d, y=%d, yZero=%d<br>", x, x1, y, yZero); + //if (i==0) uglyf("MAP: yZero=%d, yMedian=%d, height=%d<br>", yZero, yMedian, height); x1 = x1 + barWidth + padding; } } static struct gtexGeneBed *loadGtexGeneBed(char **row) { return gtexGeneBedLoad(row); } static void gtexGeneLoadItems(struct track *track) { bedLoadItem(track, track->table, (ItemLoader)loadGtexGeneBed); double maxExp = 0.0; int i; struct gtexGeneBed *geneBed;