3c529301c2900f3b03ea89955426db75b9b631f9 angie Mon Feb 7 10:08:54 2011 -0800 Track #1684 (SNPs 132 (dbSNP)): Added coloring by allele frequency:items are shaded on a scale of red (rare) to blue (common), or black when no frequencies were given. Now I'm wondering if I should have used a log scale, but this works so I'm checking it in. diff --git src/hg/inc/snp125Ui.h src/hg/inc/snp125Ui.h index 97a5448..aef6bdf 100644 --- src/hg/inc/snp125Ui.h +++ src/hg/inc/snp125Ui.h @@ -36,34 +36,42 @@ extern char *snp125ColorLabel[]; extern int snp125ColorArraySize; /****** Color source related controls *******/ /* Molecule Type, Class, Validation, Function */ enum snp125ColorSource { snp125ColorSourceLocType, snp125ColorSourceClass, snp125ColorSourceValid, snp125ColorSourceFunc, snp125ColorSourceMolType, snp125ColorSourceExceptions, snp125ColorSourceBitfields, + snp125ColorSourceAlleleFreq, }; #define SNP125_DEFAULT_COLOR_SOURCE snp125ColorSourceFunc +enum snp125ColorSource snp125ColorSourceFromCart(struct cart *cart, struct trackDb *tdb); +/* Look up color source in cart, keeping backwards compatibility with old cart var names. */ + +char *snp125ColorSourceToLabel(struct trackDb *tdb, enum snp125ColorSource cs); +/* Due to availability of different color sources in several different versions, + * this is not just an array lookup, hence the encapsulation. Don't modify return value. */ + extern char *snp125ColorSourceLabels[]; extern char *snp125ColorSourceOldVar; extern int snp125ColorSourceArraySize; extern char *snp128ColorSourceLabels[]; extern int snp128ColorSourceArraySize; extern char *snp132ColorSourceLabels[]; extern int snp132ColorSourceArraySize; /****** MolType related controls *******/ /* unknown, genomic, cDNA */ extern char *snp125MolTypeLabels[]; extern char *snp125MolTypeOldColorVars[];