32cc546299ff4332882442b58816fc7a1ca33237 angie Tue Apr 19 12:24:33 2011 -0700 Fixed typo that broke snp132's coloring by bitfields. diff --git src/hg/hgTracks/variation.c src/hg/hgTracks/variation.c index d265d7a..b9562ab 100644 --- src/hg/hgTracks/variation.c +++ src/hg/hgTracks/variation.c @@ -680,31 +680,31 @@ snp125LocTypeFilter = snp125FilterFromCart(cart, track, "locType", &snp125LocTypeFilterOn); snp132ExceptionFilter = snp125FilterFromCart(cart, track, "exceptions", &snp132ExceptionFilterOn); snp132BitfieldFilter = snp125FilterFromCart(cart, track, "bitfields", &snp132BitfieldFilterOn); snp125ColorSource = snp125ColorSourceFromCart(cart, tdb); snp125MolTypeCart = snp125ColorsFromCart(track, "molType", snp125MolTypeOldColorVars, TRUE, snp125MolTypeDefault, snp125MolTypeArraySize); snp125ClassCart = snp125ColorsFromCart(track, "class", snp125ClassOldColorVars, TRUE, snp125ClassDefault, snp125ClassArraySize); snp125ValidCart = snp125ColorsFromCart(track, "valid", snp125ValidOldColorVars, TRUE, snp125ValidDefault, snp125ValidArraySize); snp125LocTypeCart = snp125ColorsFromCart(track, "locType", snp125LocTypeOldColorVars, TRUE, snp125LocTypeDefault, snp125LocTypeArraySize); snp132ExceptionsCart = snp125ColorsFromCart(track, "exception", snp132ExceptionVarName, FALSE, snp132ExceptionDefault, snp132ExceptionArraySize); -snp132BitfieldsCart = snp125ColorsFromCart(track, "bitfield", snp132BitfieldVarName, FALSE, +snp132BitfieldsCart = snp125ColorsFromCart(track, "bitfields", snp132BitfieldVarName, FALSE, snp132BitfieldDefault, snp132BitfieldArraySize); snp125FuncCartColorHash = hashNew(0); snp125FuncCartNameHash = hashNew(0); int i; for (i=0; i < snp125FuncArraySize; i++) { safef(cartVar, sizeof(cartVar), "%s.func%s", track, snp125OldColorVarToNew(snp125FuncOldColorVars[i], "func")); char *cartVal = cartUsualString(cart, cartVar, cartUsualString(cart, snp125FuncOldColorVars[i], snp125FuncDefault[i])); /* There are many function types, some of which are mapped onto * simpler types in snp125Ui.c. First store the indexes of * selected colors of simpler types that we present as coloring