8d590dadea00d1b8d2159360c03f08c6cc56b04c angie Mon Mar 3 14:01:29 2014 -0800 Fixed a typo that caused hgTracks to ignore settings for coloringSNPs by exceptions. Thanks Brian L! fixes #12793 diff --git src/hg/hgTracks/variation.c src/hg/hgTracks/variation.c index 2497fd4..59a4409 100644 --- src/hg/hgTracks/variation.c +++ src/hg/hgTracks/variation.c @@ -677,31 +677,31 @@ snp125ValidFilter = snp125FilterFromCart(cart, track, "valid", &snp125ValidFilterOn); snp125FuncFilter = snp125FilterFromCart(cart, track, "func", &snp125FuncFilterOn); 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, snp125ValidArraySizeHuman); snp125LocTypeCart = snp125ColorsFromCart(track, "locType", snp125LocTypeOldColorVars, TRUE, snp125LocTypeDefault, snp125LocTypeArraySize); -snp132ExceptionsCart = snp125ColorsFromCart(track, "exception", snp132ExceptionVarName, FALSE, +snp132ExceptionsCart = snp125ColorsFromCart(track, "exceptions", snp132ExceptionVarName, FALSE, snp132ExceptionDefault, snp132ExceptionArraySize); 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