30f1aef883d9fd6a02b96a0c2916f99727d7a457 kate Tue Aug 4 17:21:47 2015 -0700 Major reorg of track load/draw, prep for computing medians (for filtering and comparison graphs. refs #15645 diff --git src/hg/hgTracks/gtexTracks.c src/hg/hgTracks/gtexTracks.c index a0c8552..6743353 100644 --- src/hg/hgTracks/gtexTracks.c +++ src/hg/hgTracks/gtexTracks.c @@ -53,30 +53,45 @@ parseColor(rgb, &red, &green, &blue); return (hvGfxFindColorIx(hvg, red, green, blue)); //return MAKECOLOR_32(red, green, blue); } static void initGeneColors(struct hvGfx *hvg) { if (statusColors.coding != 0) return; statusColors.coding = findColorIx(hvg, GENCODE_CODING_COLOR); statusColors.nonCoding = findColorIx(hvg, GENCODE_NONCODING_COLOR); statusColors.problem = findColorIx(hvg, GENCODE_PROBLEM_COLOR); statusColors.unknown = findColorIx(hvg, UNKNOWN_COLOR); } +static Color getTranscriptStatusColor(struct hvGfx *hvg, struct gtexGeneBed *geneBed) +/* Find GENCODE color for transcriptClass of canonical transcript */ +{ +initGeneColors(hvg); +if (geneBed->transcriptClass == NULL) + return statusColors.unknown; +if (sameString(geneBed->transcriptClass, "coding")) + return statusColors.coding; +if (sameString(geneBed->transcriptClass, "nonCoding")) + return statusColors.nonCoding; +if (sameString(geneBed->transcriptClass, "problem")) + return statusColors.problem; +return statusColors.unknown; +} + static int gtexBarWidth() { int winSize = winEnd - winStart; if (winSize < WIN_MAX_GRAPH) return MAX_BAR_WIDTH; else if (winSize < WIN_MED_GRAPH) return MED_BAR_WIDTH; else return MIN_BAR_WIDTH; } static int gtexGraphPadding() { int winSize = winEnd - winStart; if (winSize < WIN_MAX_GRAPH) @@ -124,36 +139,30 @@ // TODO: whack this static int valToY(double val, double maxVal, int maxHeight) /* Convert a value from 0 to maxVal to 0 to height-1 */ { if (val == 0.0) return 0; double scaled = (log10(val)+3.001)/(log10(maxVal)+3.001); if (scaled < 0) warn("scaled=%f\n", scaled); int y = scaled * (maxHeight); //uglyf("%.2f -> %.2f height %d", val, scaled, (int)scaled * (maxHeight-1)); return (maxHeight-1) - y; } -struct gtexGeneExtras - { - double maxMedian; - char *graphType; - boolean isComparison; - }; /* Cache tissue metadata */ struct gtexTissue *getTissues() /* Get tissue metadata from database */ { static struct gtexTissue *gtexTissues = NULL; if (gtexTissues == NULL) gtexTissues = gtexGetTissues(); return gtexTissues; } struct rgbColor *getGtexTissueColors() /* Get RGB colors from tissue table */ { @@ -187,30 +196,51 @@ //if (x1 + width > x2) //return -1; return x1; } static int gtexGeneHeight() { return 8; } static int gtexGeneMargin() { return 1; } +/* Track info generated during load, used by draw */ + +struct gtexGeneExtras +/* Track info */ + { + double maxMedian; + char *graphType; + boolean isComparison; + }; + +struct gtexGeneInfo +/* GTEx gene model, names, and expression medians */ + { + struct gtexGeneInfo *next; /* Next in singly linked list */ + struct gtexGeneBed *geneBed;/* Gene name, id, canonical transcript, exp count and medians + from BED table */ + struct genePred *geneModel; /* Gene structure from model table */ + float *medians1; /* Computed medians */ + float *medians2; /* Computed medians for comparison (inverse) graph */ + }; + static struct gtexGeneBed *loadComputedMedians(struct gtexGeneBed *geneBed, char *graphType) /* Compute medians based on graph type. Returns a list of 2 for comparison graph types */ /* TODO: add support for filter function */ { /* FIXME: dummy load of two for display implementation */ struct gtexGeneBed *medians = NULL, *medians2 = NULL; AllocVar(medians); medians->expCount = geneBed->expCount; int i; #ifdef NEW struct sqlConnection *conn = hAllocConn("hgFixed"); if (conn == NULL) return NULL; @@ -238,52 +268,104 @@ for (i=0; i<geneBed->expCount; i++) //medians->expScores[i] = slDoubleMedian(scores[i]); medians->expScores[i] = geneBed->expScores[i]; AllocVar(medians2); medians2->expCount = geneBed->expCount; AllocArray(medians2->expScores, medians2->expCount); for (i = 0; i < medians2->expCount; ++i) medians2->expScores[i] = geneBed->expScores[i]; medians->next = medians2; return medians; } +static struct hash *loadGeneModels(char *table) +/* Load gene models from table */ +{ +struct sqlConnection *conn = hAllocConn(database); +struct sqlResult *sr; +char **row; +int rowOffset; +sr = hRangeQuery(conn, table, chromName, winStart, winEnd, NULL, &rowOffset); + +struct hash *modelHash = newHash(0); +struct genePred *model = NULL; +while ((row = sqlNextRow(sr)) != NULL) + { + model = genePredLoad(row+rowOffset); + hashAdd(modelHash, model->name, model); + } +sqlFreeResult(&sr); +hFreeConn(&conn); +return modelHash; +} + +static void gtexGeneLoadItems(struct track *tg) +{ +// Get track UI info +struct gtexGeneExtras *extras; +AllocVar(extras); +tg->extraUiData = extras; + +// TODO: move test to lib +char *graphType = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_GRAPH, + GTEX_GRAPH_DEFAULT); +extras->graphType = cloneString(graphType); +if (sameString(graphType, GTEX_GRAPH_AGE) || sameString(graphType, GTEX_GRAPH_SEX)) + extras->isComparison = TRUE; + +extras->maxMedian = gtexMaxMedianScore(NULL); + +// Construct track items + +// Get geneModels in range +//TODO: version the table name ? +char *modelTable = "gtexGeneModel"; +struct hash *modelHash = loadGeneModels(modelTable); + +// Get geneBeds (names and all-sample tissue median scores) in range +bedLoadItem(tg, tg->table, (ItemLoader)gtexGeneBedLoad); + +// Create geneInfo items with BED and geneModels attached +struct gtexGeneInfo *geneInfo = NULL, *list = NULL; +struct gtexGeneBed *geneBed = (struct gtexGeneBed *)tg->items; +while (geneBed != NULL) + { + AllocVar(geneInfo); + geneInfo->geneBed = geneBed; + geneInfo->geneModel = hashFindVal(modelHash, geneBed->geneId); + slAddHead(&list, geneInfo); + geneBed = geneBed->next; + geneInfo->geneBed->next = NULL; + } +slReverse(&list); +tg->items = list; +} + static void gtexGeneDrawAt(struct track *tg, void *item, struct hvGfx *hvg, int xOff, int y, double scale, MgFont *font, Color color, enum trackVisibility vis) { -struct gtexGeneBed *geneBed = item; -initGeneColors(hvg); -//warn("item: %s, xOff=%d\n", geneBed->name, xOff); -// Color using transcriptClass -Color statusColor; -if (geneBed->transcriptClass == NULL) - statusColor = statusColors.unknown; -else if (sameString(geneBed->transcriptClass, "coding")) - statusColor = statusColors.coding; -else if (sameString(geneBed->transcriptClass, "nonCoding")) - statusColor = statusColors.nonCoding; -else if (sameString(geneBed->transcriptClass, "problem")) - statusColor = statusColors.problem; -else - statusColor = statusColors.unknown; +struct gtexGeneInfo *geneInfo = (struct gtexGeneInfo *)item; +struct gtexGeneBed *geneBed = geneInfo->geneBed; +// Color in dense mode using transcriptClass +Color statusColor = getTranscriptStatusColor(hvg, geneBed); if (vis != tvFull && vis != tvPack) { - bedDrawSimpleAt(tg, item, hvg, xOff, y, scale, font, statusColor, vis); + bedDrawSimpleAt(tg, geneBed, hvg, xOff, y, scale, font, statusColor, vis); return; } struct gtexGeneBed *computedMedians = NULL; // 1 or 2 (if comparison) // with medians computed for sample subsets struct gtexGeneExtras *extras = (struct gtexGeneExtras *)tg->extraUiData; if ((extras->isComparison) && (tg->visibility == tvFull || tg->visibility == tvPack)) //&& gtexGraphHeight() != MIN_GRAPH_HEIGHT) { // compute medians based on configuration (comparisons, and later, filters) computedMedians = loadComputedMedians(geneBed, extras->graphType); } int i; int expCount = geneBed->expCount; @@ -340,51 +422,34 @@ double expScore = geneBed->expScores[i]; int height = valToHeight(expScore, maxMedian, gtexGraphHeight()); // TODO: adjust yGene to get gene track distance as desired //if (i ==0) uglyf("DRAW: expScore=%.2f, maxMedian=%.2f, graphHeight=%d, y=%d<br>", expScore, maxMedian, gtexGraphHeight(), y); //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, yZero-height, barWidth, height, fillColorIx); else hvGfxOutlinedBox(hvg, x1, yZero-height, barWidth, height, fillColorIx, lineColorIx); x1 = x1 + barWidth + graphPadding; } // mark gene extent int yGene = yZero + gtexGeneMargin() - 1; -// load & draw gene model -char query[1024]; -char **row; -// FIXME: move to load items (load all in range) -char *modelTable = "gtexGeneModel"; -int hasBin = hOffsetPastBin(database, geneBed->chrom, modelTable); -sqlSafef(query, sizeof query, "select * from %s where name='%s'", modelTable, geneBed->geneId); -struct sqlConnection *conn = hAllocConn(database); -if (conn == NULL) - return; -struct genePred *geneModel = NULL; -struct sqlResult *sr = sqlGetResult(conn, query); -if ((row = sqlNextRow(sr)) != NULL) - geneModel = genePredLoad(row + hasBin); -sqlFreeResult(&sr); -hFreeConn(&conn); -if (geneModel == NULL) - return; -struct linkedFeatures *lf = linkedFeaturesFromGenePred(tg, geneModel, FALSE); +// draw gene model tg->heightPer = gtexGeneHeight()+1; +struct linkedFeatures *lf = linkedFeaturesFromGenePred(tg, geneInfo->geneModel, FALSE); lf->filterColor = statusColor; linkedFeaturesDrawAt(tg, lf, hvg, xOff, yGene, scale, font, color, tvSquish); tg->heightPer = heightPer; if (!extras->isComparison || slCount(computedMedians) != 2) return; // draw comparison graph (upside down) x1 = startX; // yZero is at top of graph yZero = yGene + gtexGeneHeight(); for (i=0; i<expCount; i++) { struct rgbColor fillColor = colors[i]; @@ -411,134 +476,138 @@ 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) or a single map for squish/dense modes */ { //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); if (tg->visibility == tvDense || tg->visibility == tvSquish) { genericMapItem(tg, hvg, item, itemName, itemName, start, end, x, y, width, height); } struct gtexTissue *tissues = getTissues(); struct gtexTissue *tissue = NULL; -struct gtexGeneBed *gtex = item; +struct gtexGeneInfo *geneInfo = item; +struct gtexGeneBed *geneBed = geneInfo->geneBed; int barWidth = gtexBarWidth(); int padding = gtexGraphPadding(); double maxMedian = ((struct gtexGeneExtras *)tg->extraUiData)->maxMedian; -int graphX = gtexGraphX((struct gtexGeneBed *)item); +int graphX = gtexGraphX(geneBed); 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]; + double expScore = geneBed->expScores[i]; //TODO: use valToHeight int yMedian = valToY(expScore, maxMedian, 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, maxMedian=%.2f, graphHeight=%d, y=%d<br>", expScore, maxMedian, 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; } } +#ifdef OLD static struct gtexGeneBed *loadGtexGeneBed(char **row) { struct gtexGeneBed *geneBed = gtexGeneBedLoad(row); // TODO: rethink schemas // for now... replace expScores with medians from tissue data file -#ifdef NEW struct gtexTissue *tissue = NULL, *tissues = getTissues(); int i=0; char query[1024]; struct sqlConnection *conn = hAllocConn("hgFixed"); for (tissue = tissues; tissue != NULL; tissue = tissue->next, i++) { sqlSafef(query, sizeof(query), "select * from gtexTissueData where geneId='%s' and tissue='%s'", geneBed->geneId, tissue->name); struct gtexTissueData *tissueData = gtexTissueDataLoadByQuery(conn, query); geneBed->expScores[i] = tissueData->median; } hFreeConn(&conn); -#endif return geneBed; } +#endif -static void gtexGeneLoadItems(struct track *tg) +static char *gtexGeneItemName(struct track *tg, void *item) +/* Return gene name */ { -bedLoadItem(tg, tg->table, (ItemLoader)loadGtexGeneBed); - -struct gtexGeneExtras *extras; -AllocVar(extras); -tg->extraUiData = extras; - -// TODO: move test to lib -char *graphType = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, GTEX_GRAPH, - GTEX_GRAPH_DEFAULT); -extras->graphType = cloneString(graphType); -if (sameString(graphType, GTEX_GRAPH_AGE) || sameString(graphType, GTEX_GRAPH_SEX)) - extras->isComparison = TRUE; - -extras->maxMedian = gtexMaxMedianScore(NULL); +struct gtexGeneInfo *geneInfo = (struct gtexGeneInfo *)item; +struct gtexGeneBed *geneBed = geneInfo->geneBed; +return geneBed->name; } static int gtexGeneItemHeight(struct track *tg, void *item) { if ((item == NULL) || (tg->visibility == tvSquish) || (tg->visibility == tvDense)) return 0; int extra = 0; if (((struct gtexGeneExtras *)tg->extraUiData)->isComparison) extra = gtexGraphHeight() + 2; //uglyf("GTEX itemHeight extra = %d<br>", extra); return gtexGraphHeight() + gtexGeneMargin() + gtexGeneHeight() + extra; } static int gtexTotalHeight(struct track *tg, enum trackVisibility vis) /* Figure out total height of track */ { int height; int extra = 0; if (((struct gtexGeneExtras *)tg->extraUiData)->isComparison) extra = gtexGraphHeight() + 2; if (tg->visibility == tvSquish || tg->visibility == tvDense) height = 10; else height = gtexGraphHeight() + gtexGeneMargin() + gtexGeneHeight() + extra; //uglyf("GTEX totalHeight = %d<br>", height); return tgFixedTotalHeightOptionalOverflow(tg, vis, height, height, FALSE); } +static int gtexGeneItemStart(struct track *tg, void *item) +/* Return end chromosome coordinate of item, including graph */ +{ +struct gtexGeneInfo *geneInfo = (struct gtexGeneInfo *)item; +struct gtexGeneBed *geneBed = geneInfo->geneBed; +return geneBed->chromStart; +} + static int gtexGeneItemEnd(struct track *tg, void *item) /* Return end chromosome coordinate of item, including graph */ { -struct gtexGeneBed *geneBed = (struct gtexGeneBed *)item; +struct gtexGeneInfo *geneInfo = (struct gtexGeneInfo *)item; +struct gtexGeneBed *geneBed = geneInfo->geneBed; double scale = scaleForWindow(insideWidth, winStart, winEnd); int graphWidth = gtexGraphWidth(geneBed); return max(geneBed->chromEnd, max(winStart, geneBed->chromStart) + graphWidth/scale); } void gtexGeneMethods(struct track *tg) { tg->drawItemAt = gtexGeneDrawAt; tg->loadItems = gtexGeneLoadItems; +//tg->freeItems = gtexGeneFreeItems; tg->mapItem = gtexGeneMapItem; +tg->itemName = gtexGeneItemName; +tg->mapItemName = gtexGeneItemName; tg->itemHeight = gtexGeneItemHeight; +tg->itemStart = gtexGeneItemStart; tg->itemEnd = gtexGeneItemEnd; tg->totalHeight = gtexTotalHeight; }