dbb7cbfd254794919a8e491cc3d3eb7c6009ba15
angie
  Tue Jan 25 14:58:05 2011 -0800
Track #1684 (SNPs 132 (dbSNP)): Added new coloring and filtering optionsfor new columns exceptions and bitfields.  Fixed remaining hardcoded cart
var names to use track name, keeping backwards compat with old sessions.
Lots of refactoring -- got rid of snp125Extended business (mostly so I
wouldn't have to make a snp132Extended); color is stored in snp->weight
now, and extraName stuff overwrites name.  Added new color-sorting in
squish mode so the most interesting SNPs appear at the top.  Also added
new trackDb var defaultMaxWeight for the NonUnique subset (so its items
aren't invisible by default).

diff --git src/hg/hgTracks/variation.h src/hg/hgTracks/variation.h
index 096af02..924cda7 100644
--- src/hg/hgTracks/variation.h
+++ src/hg/hgTracks/variation.h
@@ -1,30 +1,31 @@
 /* variation.h - hgTracks routines that are specific to the SNP and haplotype tracks */
 
 #ifndef VARIATION_H
 #define VARIATION_H
 
 #include "common.h"
 #include "hCommon.h"
 #include "hdb.h"
 #include "hgTracks.h"
 #include "snp.h"
 #include "snpMap.h"
 #include "hui.h"
 #include "snpUi.h"
 #include "snp125.h"
 #include "snp125Ui.h"
+#include "snp132Ext.h"
 #include "spaceSaver.h"
 #include "ld.h"
 #include "ld2.h"
 #include "hash.h"
 #include "ldUi.h"
 #include "gfxPoly.h"
 #include "memgfx.h"
 #include "cnpIafrate.h"
 #include "cnpIafrate2.h"
 #include "cnpSebat.h"
 #include "cnpSebat2.h"
 #include "cnpSharp.h"
 #include "cnpSharp2.h"
 #include "cnpRedon.h"
 #include "cnpLocke.h"
@@ -91,34 +92,30 @@
 boolean snpSourceFilterItem(struct track *tg, void *item);
 /* Return TRUE if item passes filter. */
 
 boolean snpMolTypeFilterItem(struct track *tg, void *item);
 /* Return TRUE if item passes filter. */
 
 boolean snpClassFilterItem(struct track *tg, void *item);
 /* Return TRUE if item passes filter. */
 
 boolean snpValidFilterItem(struct track *tg, void *item);
 /* Return TRUE if item passes filter. */
 
 boolean snpFuncFilterItem(struct track *tg, void *item);
 /* Return TRUE if item passes filter. */
 
-void loadSnp(struct track *tg);
-void loadSnp125(struct track *tg);
-/* Load up snps from database table to track items. */
-
 void freeSnp(struct track *tg);
 /* Free up snp items. */
 
 Color snpColor(struct track *tg, void *item, struct hvGfx *hvg);
 Color snp125Color(struct track *tg, void *item, struct hvGfx *hvg);
 /* Return color of snp track item. */
 
 void snpDrawItemAt(struct track *tg, void *item, struct hvGfx *hvg, int xOff, int y, 
 		   double scale, MgFont *font, Color color, enum trackVisibility vis);
 /* Draw a single snp item at position. */
 
 void snpMethods(struct track *tg);
 void snp125Methods(struct track *tg);
 /* Make track for snps. */