eef3ac987538affd38eb38ccddf6ce6721f4c6f4 jcasper Sun Nov 23 22:03:29 2025 -0800 Removing bigCompositeUpdate CGI (folded into cartDump), and some kent-ifying of the remaining code. refs #36320 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 80db9f1d65c..184093b871b 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -6006,72 +6006,32 @@ { bedMethods(tg); tg->loadItems = loadDbRIP; tg->itemColor = dbRIPColor; tg->itemNameColor = dbRIPColor; tg->itemLabelColor = dbRIPColor; } void bacEndPairsMethods(struct track *tg) /* Fill in track methods for linked features.series */ { linkedFeaturesSeriesMethods(tg); tg->loadItems = loadBacEndPairs; } -/* Functions associated with bigComposite */ - -void -bigCompositeLoadItems_no_op(struct track *tg) {} - -static void -bigCompositeMethods(struct track *tg) { -/* ADS: This is fake; exists to define functions for bigComposite */ - tg->bedSize = 3; - bedMethods(tg); - tg->loadItems = bigCompositeLoadItems_no_op; -} - -/* Functions associated with MethBase2 */ - -static void -MethBase2HmrMethods(struct track *tg) -/* HMRs are a BED4 (not using score or direction) that is always dense - * because they inherently can't overlap and are bigBed */ -{ - bedMethods(tg); - tg->bedSize = 4; - tg->loadItems = loadSimpleBed; - tg->limitedVis = tvDense; - tg->limitedVisSet = TRUE; - tg->isBigBed = TRUE; -} - -static void -MethBase2BigWigFull(struct track *tg, struct trackDb *tdb, int wordCount, - char *words[]) -/* ADS: Just a bigWig set to always show full; surely a better way to - * accomplish that */ -{ - bigWigMethods(tg, tdb, wordCount, words); - tg->limitedVisSet = TRUE; - tg->limitedVis = tvFull; -} - #endif /* GBROWSE */ - // The following few functions are shared by GAD, OMIM, DECIPHER, Superfamily. // Those tracks need an extra label derived from item name -- the extra label // is used as mouseover text for each item, and appears to the immediate left // of the feature in full mode. struct bedPlusLabel { struct bed bed; // inline, so struct bedPlusLabel * can be cast to struct bed *. char *label; }; typedef char *labelFromNameFunction(char *db, char *name); static void bedPlusLabelLoad(struct track *tg, labelFromNameFunction func) /* Load items from a bed table; if vis is pack or full, add extra label derived from item name. */ { @@ -11809,31 +11769,31 @@ { if ( tg->limitWiggle) // these are always in tvFull subtrack->limitedVis = tvMin(subtrack->limitedVis, tg->limitedVis); // But don't prevent subtracks from being further restricted! //subtrack->limitedVisSet = tg->limitedVisSet; } } if (tg->height == 0 && tg->limitedVis != tvHide) tg->limitedVisSet = FALSE; // Items may not be loaded yet, so going to need to check again } return tg->limitedVis; } void compositeTrackVis(struct track *track) -/* set visibilities of subtracks */ +/* set visibilities of subtracks. This seems to be unused - JC 11/2025 */ { struct track *subtrack; if (track->visibility == tvHide) return; /* Count visible subtracks. */ for (subtrack = track->subtracks; subtrack != NULL; subtrack = subtrack->next) if (!subtrack->limitedVisSet) { if (isSubtrackVisible(subtrack)) subtrack->visibility = track->visibility; else subtrack->visibility = tvHide; } @@ -15019,42 +14979,30 @@ } else if (sameWord(type, "bigDbSnp")) { tdb->canPack = TRUE; track->isBigBed = TRUE; bigDbSnpMethods(track); } else if (sameWord(type, "bedGraph")) { bedGraphMethods(track, tdb, wordCount, words); } else if (sameWord(type, "bigWig")) { bigWigMethods(track, tdb, wordCount, words); } -else if (sameWord(type, "bigComposite")) - { - bigCompositeMethods(track); - } -else if (sameWord(type, "hmr")) - { - MethBase2HmrMethods(track); - } -else if (sameWord(type, "levels") || sameWord(type, "reads")) - { - MethBase2BigWigFull(track, tdb, wordCount, words); - } else #endif /* GBROWSE */ if (sameWord(type, "wig")) { wigMethods(track, tdb, wordCount, words); } else if (startsWith("wigMaf", type)) { wigMafMethods(track, tdb, wordCount, words); } #ifndef GBROWSE else if (sameWord(type, "sample")) { sampleMethods(track, tdb, wordCount, words); }