04548151dfb844d5acb75857d1e39a121306b9e8 fanhsu Mon Dec 6 08:55:36 2010 -0800 Refined processing of DECIPHER track per Angie's input. diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 0cad3ba..73e1b32 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -10855,31 +10855,31 @@ /* set the color to red if the entry is listed in morbidmap */ safef(query, sizeof(query), "select geneSymbols from omimMorbidMap where omimId=%s", el->name); geneSymbols = sqlQuickString(conn, query); hFreeConn(&conn); if (geneSymbols != NULL) { return hvGfxFindColorIx(hvg, 255, 0, 0); } else { return hvGfxFindColorIx(hvg, 0, 0, 200); } } /* reserve space no more than 20 unique OMIM entries */ -#define OMIM_MAX_DESC_LEN 160 +#define OMIM_MAX_DESC_LEN 256 char omimGeneBuffer[20 * OMIM_MAX_DESC_LEN]; char *omimGeneDiseaseList(struct track *tg, struct bed *item) /* Return list of diseases associated with a OMIM entry */ { struct sqlConnection *conn; char query[256]; struct sqlResult *sr; char **row; char *chp; int i=0; conn = hAllocConn(database); safef(query,sizeof(query), @@ -10931,60 +10931,34 @@ sPhenotypes = omimGeneDiseaseList(tg, item); w = x2-x1; if (w < 1) w = 1; if (color) { hvGfxBox(hvg, x1, y, w, heightPer, omimGeneColor(tg, item, hvg)); if (vis == tvFull) { hvGfxTextRight(hvg, x1-mgFontStringWidth(font, sPhenotypes)-2, y, mgFontStringWidth(font, sPhenotypes), heightPer, MG_BLACK, font, sPhenotypes); } - if (tg->drawName && vis != tvSquish) - { - /* Clip here so that text will tend to be more visible... */ - char *s = tg->itemName(tg, bed); - w = x2-x1; - if (w > mgFontStringWidth(font, s)) - { - Color textColor = hvGfxContrastingColor(hvg, color); - hvGfxTextCentered(hvg, x1, y, w, heightPer, textColor, font, s); - } - } if (vis != tvDense) mapBoxHc(hvg, bed->chromStart, bed->chromEnd, x1, y, x2 - x1, heightPer, tg->track, tg->mapItemName(tg, bed), sPhenotypes); } -if (tg->subType == lfWithBarbs) - { - int dir = 0; - if (bed->strand[0] == '+') - dir = 1; - else if(bed->strand[0] == '-') - dir = -1; - if (dir != 0 && w > 2) - { - int midY = y + (heightPer>>1); - Color textColor = hvGfxContrastingColor(hvg, color); - clippedBarbs(hvg, x1, midY, w, tl.barbHeight, tl.barbSpacing, - dir, textColor, TRUE); - } - } } void omimGeneMethods (struct track *tg) { tg->itemColor = omimGeneColor; tg->itemNameColor = omimGeneColor; tg->itemName = omimGeneName; tg->drawItemAt = omimGeneDrawAt; } Color restColor(struct track *tg, void *item, struct hvGfx *hvg) /* set the color for REST track items */ { struct bed *el = item;