3014860f3040982981c8be735cb89fd9e8d73761
braney
  Tue Aug 18 14:19:40 2015 -0700
fix a few problems that Brian found in #6551

diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 07ec133..54902ca 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -3962,40 +3962,44 @@
             track->visibility = tvHide;
             }
     }
 else
     {
     // we're going to set all the trackDb default visibilities on in the cart
     void pruneRedundantCartVis(struct track *trackList);
     pruneRedundantCartVis(trackList);
     cartSetString(cart, CART_HAS_DEFAULT_VISIBILITY, "on");
     }
 
 /* Get visibility values if any from ui. */
 for (track = trackList; track != NULL; track = track->next)
     {
     // if the defaults aren't set in the cart and this track isn't hidden, set its visibility in the cart
-    if (!defaultsSet && (track->tdb->visibility != tvHide))
+    char *s = cartOptionalString(cart, track->track);
+    if (!defaultsSet && (track->tdb->visibility != tvHide) && (s == NULL))
         {
 	struct trackDb *parent = track->tdb->parent;
         if (parent) 
+            {
+            char *super = cartOptionalString(cart, parent->track);
+            if (super == NULL)
                 cartSetString(cart, parent->track, !parent->isShow ?  "hide" : "show");
+            }
 	if (!parent || parent->isShow)
             cartSetString(cart, track->track, hStringFromTv(track->tdb->visibility));
         }
 
-    char *s = cartOptionalString(cart, track->track);
     if (cgiOptionalString("hideTracks"))
 	{
 	s = cgiOptionalString(track->track);
 	if (s != NULL)
 	    {
 	    if (hTvFromString(s) == track->tdb->visibility)
 		cartRemove(cart, track->track);
 	    else
 		cartSetString(cart, track->track, s);
 	    }
 	}
     if (s != NULL && !track->limitedVisSet)
 	track->visibility = hTvFromString(s);
     if (tdbIsCompositeChild(track->tdb))
         track->visibility = tdbVisLimitedByAncestry(cart, track->tdb, FALSE);
@@ -4494,31 +4498,31 @@
 
 // honor defaultImgOrder
 if (cgiVarExists("hgt.defaultImgOrder"))
     {
     char wildCard[32];
     safef(wildCard,sizeof(wildCard),"*_%s",IMG_ORDER_VAR);
     cartRemoveLike(cart, wildCard);
     }
 // Subtrack settings must be removed when composite/view settings are updated
 parentChildCartCleanup(trackList,cart,oldVars);
 if (measureTiming)
     measureTime("parentChildCartCleanup");
 
 
 /* Honor hideAll variable */
-if (hideAll)
+if (hideAll || defaultTracks)
     {
     int vis = (hideAll ? tvHide : -1);
     changeTrackVis(groupList, NULL, vis);
     }
 
 /* Before loading items, deal with the next/prev item arrow buttons if pressed. */
 if (cgiVarExists("hgt.nextItem"))
     doNextPrevItem(TRUE, cgiUsualString("hgt.nextItem", NULL));
 else if (cgiVarExists("hgt.prevItem"))
     doNextPrevItem(FALSE, cgiUsualString("hgt.prevItem", NULL));
 
 if(!psOutput && !cartUsualBoolean(cart, "hgt.imageV1", FALSE))
     {
     // Start an imagebox (global for now to avoid huge rewrite of hgTracks)
     // Set up imgBox dimensions