src/hg/hgTracks/netTrack.c 1.25

Index: src/hg/hgTracks/netTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/netTrack.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -B -U 4 -r1.24 -r1.25
--- src/hg/hgTracks/netTrack.c	17 Mar 2009 04:35:42 -0000	1.24
+++ src/hg/hgTracks/netTrack.c	18 Mar 2009 18:27:00 -0000	1.25
@@ -7,18 +7,17 @@
 #include "linefile.h"
 #include "jksql.h"
 #include "hdb.h"
 #include "hgTracks.h"
-#include "chainNet.h"
-#include "chainCart.h"
+#include "netCart.h"
 #include "chainNetDbLoad.h"
 
 static char const rcsid[] = "$Id$";
 
 struct cartOptions
     {
     enum netColorEnum netColor; /*  ChromColors, GrayScale */
-    int levelFilter ; /* filter chains by level 1 thru 6 */
+    enum netLevelEnum netLevel; /* filter chains by level 1 thru 6 (0==All) */
     };
 
 struct netItem
 /* A net track item. */
@@ -278,14 +277,10 @@
 struct cartOptions *netCart;
 
 AllocVar(netCart);
 
-netCart->netColor = netColorStringToEnum(
-	trackDbSettingClosestToHomeOrDefault(tg->tdb, NET_COLOR, CHROM_COLORS));
-/* allow cart to override trackDb */
-netCart->netColor = netColorStringToEnum(
-	cartUsualStringClosestToHome(cart, tg->tdb, FALSE, NET_COLOR,
-	netColorEnumToString(netCart->netColor)));
+netCart->netColor = netFetchColorOption(cart, tg->tdb, FALSE);
+netCart->netLevel = netFetchLevelOption(cart, tg->tdb, FALSE);
 
 tg->loadItems = netLoad;
 tg->freeItems = netFree;
 tg->drawItems = netDraw;