84440373a2ad67b39c36c614687807bda9a423b2 tdreszer Wed Sep 29 11:12:37 2010 -0700 Added definition of multiTrack and changed container to be either multiTrack or Composite. This allows multiTracks (such as multiWigs) to behave as composites in some code paths. diff --git src/hg/lib/trackDbCustom.c src/hg/lib/trackDbCustom.c index 0926f9d..69d6bb8 100644 --- src/hg/lib/trackDbCustom.c +++ src/hg/lib/trackDbCustom.c @@ -67,7 +67,7 @@ return tvHide; else if (sameString(value, "dense") || sameString(value, "1")) return tvDense; -else if (sameString(value, "full") || sameString(value, "2")) +else if (sameString(value, "full") || sameString(value, "2") || sameString(value, "show")) return tvFull; else if (sameString(value, "pack") || sameString(value, "3")) return tvPack; @@ -972,23 +972,11 @@ return trackDbCmp(&a, &b); } -struct trackDb *trackDbCompositeParent(struct trackDb *tdb) -/* Return closest ancestor who is a composite track. */ -{ -struct trackDb *parent; -for (parent = tdb->parent; parent != NULL; parent = parent->parent) - { - if (trackDbLocalSetting(parent, "compositeTrack")) - return parent; - } -return NULL; -} - struct trackDb *trackDbTopLevelSelfOrParent(struct trackDb *tdb) -/* Look for a parent who is a composite track and return that. Failing that +/* Look for a parent who is a composite or multiTrack track and return that. Failing that * just return self. */ { -struct trackDb *parent = trackDbCompositeParent(tdb); +struct trackDb *parent = tdbGetContainer(tdb); if (parent != NULL) return parent; else