a7ab24571507f19cc40e4ef65800401b43000a0f braney Mon Dec 6 13:16:27 2021 -0800 support itemRgb for bigPsl, remove overload of lf->extra field for USE_ITEM_RGB and replace it with a reasonably named field in lf (useItemRbg) diff --git src/hg/hgTracks/wikiTrack.c src/hg/hgTracks/wikiTrack.c index 0a8aaf9..7cf6437 100644 --- src/hg/hgTracks/wikiTrack.c +++ src/hg/hgTracks/wikiTrack.c @@ -124,31 +124,31 @@ while ((row = sqlNextRow(sr)) != NULL) { struct wikiTrack *item = wikiTrackLoad(row); AllocVar(bed); bed->chrom = cloneString(item->chrom); bed->chromStart = item->chromStart; bed->chromEnd = item->chromEnd; bed->name = cloneString(item->name); bed->score = item->score; safecpy(bed->strand, sizeof(bed->strand), item->strand); bed->thickStart = item->chromStart; bed->thickEnd = item->chromEnd; bed->itemRgb = hexToDecimal(item->color); bed8To12(bed); lf = lfFromBedExtra(bed, scoreMin, scoreMax); - lf->extra = (void *)USE_ITEM_RGB; /* signal for coloring */ + lf->useItemRgb = TRUE; lf->filterColor=bed->itemRgb; /* overload itemAttr fields to be able to pass id to hgc click box */ struct itemAttr *id; AllocVar(id); id->chromStart = item->id; lf->itemAttr = id; slAddHead(&lfList, lf); wikiTrackFree(&item); } sqlFreeResult(&sr); wikiDisconnect(&wikiConn); slSort(&lfList, linkedFeaturesCmp); @@ -156,31 +156,31 @@ if ((! wikiTrackReadOnly()) && wikiTrackEnabled(database, NULL)) { // add special item to allow creation of new entries AllocVar(bed); bed->chrom = chromName; bed->chromStart = winStart; bed->chromEnd = winEnd; bed->name = cloneString("Make new entry"); bed->score = 100; bed->strand[0] = ' '; /* no barbs when strand is unknown */ bed->thickStart = winStart; bed->thickEnd = winEnd; bed->itemRgb = 0xcc0000; bed8To12(bed); lf = lfFromBedExtra(bed, scoreMin, scoreMax); - lf->extra = (void *)USE_ITEM_RGB; /* signal for coloring */ + lf->useItemRgb = TRUE; lf->filterColor=bed->itemRgb; slAddHead(&lfList, lf); } tg->items = lfList; } /* static void wikiTrackLoadItems(struct track *tg) */ struct bed *wikiTrackGetBedRange(char *table, char *chromName, int start, int end) /* fetch wiki track items as simple bed 3 list in given range */ { struct bed *bed, *bedList = NULL; struct sqlConnection *wikiConn = wikiConnect(); struct sqlResult *sr; char **row;