f775312d85bfd7f6d718a0b996c5cee58b49edec
tdreszer
  Wed Jul 7 15:54:48 2010 -0700
Initial support of subtrack vis override of composite->view vis using ifdefs
diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c
index 184c76b..2c738ac 100644
--- src/hg/hgTracks/simpleTracks.c
+++ src/hg/hgTracks/simpleTracks.c
@@ -9043,6 +9043,9 @@
 /* Has this subtrack not been deselected in hgTrackUi or declared with
  * "subTrack ... off"?  -- assumes composite track is visible. */
 {
+#ifdef SUBTRACKS_HAVE_VIS
+boolean overrideComposite = (NULL != cartOptionalString(cart, subtrack->track));
+#endif///def SUBTRACKS_HAVE_VIS
 if (subtrack->limitedVisSet && subtrack->limitedVis == tvHide)
     return FALSE;
 bool enabledInTdb = subtrackEnabledInTdb(subtrack);
@@ -9056,6 +9059,10 @@
     if(var != NULL && (sameString(var,"on") || atoi(var) >= 0))
         cartRemove(cart, option);     // Because disabled CBs need to remain in the cart.
     }
+#ifdef SUBTRACKS_HAVE_VIS
+if(overrideComposite)
+    enabled = TRUE;
+#endif///def SUBTRACKS_HAVE_VIS
 return enabled;
 }
 
@@ -11135,6 +11142,7 @@
 	track->colorShades = shadesOfGray;
     }
 track->tdb = tdb;
+tdbExtrasAddOrUpdate(tdb,"track",track); // Be able to find track struct from tdb
 
 /* Handle remote database settings - just a JK experiment at the moment. */
 track->remoteSqlHost = trackDbSetting(tdb, "sqlHost");