54163aeec62cf419c382c5d3f5aeef1caffb5c43 fanhsu Tue May 31 15:35:08 2011 -0700 Added logic for OMIM color for Others category. diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 93eb3ff..685fc7c 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -10889,31 +10889,33 @@ lighter.g = (6*normal->g + 4*255) / 10; lighter.b = (6*normal->b + 4*255) / 10; lightest.r = (1*normal->r + 2*255) / 3; lightest.g = (1*normal->g + 2*255) / 3; lightest.b = (1*normal->b + 2*255) / 3; struct sqlConnection *conn = hAllocConn(database); class1Clr = hvGfxFindColorIx(hvg, lightest.r, lightest.g, lightest.b); class2Clr = hvGfxFindColorIx(hvg, lighter.r, lighter.g, lighter.b); class3Clr = hvGfxFindColorIx(hvg, normal->r, normal->g, normal->b); //class4Clr = hvGfxFindColorIx(hvg, 153,0, 204); // purple class4Clr = hvGfxFindColorIx(hvg, 56, 11, 97); -classOtherClr = hvGfxFindColorIx(hvg, 200, 200, 200); // light gray +//classOtherClr = hvGfxFindColorIx(hvg, 200, 200, 200); // light gray +classOtherClr = MG_RED; +//hvGfxFindColorIx(hvg, 200, 200, 200); // light gray safef(query, sizeof(query), "select omimId, phenotypeClass from omimPhenotype where omimId=%s", el->name); sr = sqlMustGetResult(conn, query); row = sqlNextRow(sr); hFreeConn(&conn); if (row == NULL) { // set to gray if this entry does not have any disorder info sqlFreeResult(&sr); return classOtherClr; } else @@ -10927,36 +10929,42 @@ sqlFreeResult(&sr); return class3Clr; } else if (sameWord(phenClass, "2")) { // set to light green for class 2 sqlFreeResult(&sr); return class2Clr; } else if (sameWord(phenClass, "1")) { // set to lighter green for class 1 sqlFreeResult(&sr); return class1Clr; } - else + else if (sameWord(phenClass, "4")) { - // set to purplish color for phenClass 4 + // set to the color for phenClass 4 sqlFreeResult(&sr); return class4Clr; } + else + { + // set to the color for Others + sqlFreeResult(&sr); + return classOtherClr; + } } } void omimGene2Methods (struct track *tg) /* Methods for version 2 of OMIM Genes track. */ { tg->loadItems = omimGene2Load; tg->itemColor = omimGene2Color; tg->itemNameColor = omimGene2Color; tg->drawItemAt = bedPlusLabelDrawAt; tg->mapItem = bedPlusLabelMapItem; tg->nextPrevExon = simpleBedNextPrevEdge; } static char *omimAvSnpAaReplacement(char *name) @@ -11095,36 +11103,42 @@ { if (sameWord(phenClass, "2")) { // set to light green for class 2 sqlFreeResult(&sr); return class2Clr; } else { if (sameWord(phenClass, "1")) { // set to lighter green for class 1 sqlFreeResult(&sr); return class1Clr; } - else + else if (sameWord(phenClass, "4")) { - // set to purplish color for phenClass 4 + // set to the color for phenClass 4 sqlFreeResult(&sr); return class4Clr; } + else + { + // set to the color for Others + sqlFreeResult(&sr); + return classOtherClr; + } } } } } static void omimLocationLoad(struct track *tg) /* Load and filter OMIM Loci items, storing long label from omimLocationDescription. */ { bedPlusLabelLoad(tg, omimLocationDescription); omimFilter(tg); } void omimLocationMethods (struct track *tg) /* Methods for OMIM Loci (Non-Gene Entry Cytogenetic Locations). */ {