src/hg/hgTracks/expRatioTracks.c 1.49
1.49 2010/05/11 01:43:27 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/hgTracks/expRatioTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/expRatioTracks.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -b -B -U 4 -r1.48 -r1.49
--- src/hg/hgTracks/expRatioTracks.c 22 Jan 2010 22:52:02 -0000 1.48
+++ src/hg/hgTracks/expRatioTracks.c 11 May 2010 01:43:27 -0000 1.49
@@ -230,9 +230,9 @@
void lfsMapItemName(struct track *tg, struct hvGfx *hvg, void *item, char *itemName, char *mapItemName, int start, int end,
int x, int y, int width, int height)
{
if(tg->visibility != tvDense && tg->visibility != tvHide)
- mapBoxHcTwoItems(hvg, start, end, x,y, width, height, tg->mapName, itemName, itemName, itemName);
+ mapBoxHcTwoItems(hvg, start, end, x,y, width, height, tg->track, itemName, itemName, itemName);
}
struct linkedFeaturesSeries *lfsFromMsBedSimple(struct bed *bedList, char *name)
@@ -489,9 +489,9 @@
char *affyMap;
enum affyOptEnum affyType;
bedList = tg->items;
-safef(varName, sizeof(varName), "%s.%s", tg->mapName, "type");
+safef(varName, sizeof(varName), "%s.%s", tg->track, "type");
affyMap = cartUsualString(cart, varName, affyEnumToString(affyTissue));
affyType = affyStringToEnum(affyMap);
if(tg->limitedVis == tvDense)
{
@@ -571,9 +571,9 @@
grouping = maGetGroupingFromCt(ct);
else
{
struct microarrayGroups *groups = maGetTrackGroupings(database, tg->tdb);
- grouping = maCombineGroupingFromCart(groups, cart, tg->mapName);
+ grouping = maCombineGroupingFromCart(groups, cart, tg->track);
}
lfsFromBedAndGrouping(tg, grouping);
}
@@ -900,9 +900,9 @@
char *tdbSetting = trackDbSettingOrDefault(tg->tdb, "expColor", "redGreen");
char *colorVal = NULL;
enum expColorType expColor;
-safef(colorVarName, sizeof(colorVarName), "%s.color", tg->tdb->tableName);
+safef(colorVarName, sizeof(colorVarName), "%s.color", tg->tdb->track);
colorVal = cartUsualString(cart, colorVarName, tdbSetting);
expColor = getExpColorType(colorVal);
/* if val is error value show make it gray */
@@ -1234,9 +1234,9 @@
int rowOffset;
int itemCount =0;
struct bed *bedList = NULL, *bed;
enum trackVisibility vis = tg->visibility;
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
bed = bedLoadN(row+rowOffset, 15);
slAddHead(&bedList, bed);
@@ -1344,9 +1344,9 @@
/* identical to full mode, there's this custom leftLabels function. */
{
int y = yOff;
-if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+if (sameString(tg->table, "CGHBreastCancerUCSF"))
loadFiltersAndHash("phenBreastTumors");
if (isWithCenterLabels(tg))
y += mgFontLineHeight(font);
@@ -1365,9 +1365,9 @@
for (item = tg->items; item != NULL; item = item->next)
{
char *name = tg->itemName(tg, item);
int itemHeight = tg->itemHeight(tg, item);
- if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+ if (sameString(tg->table, "CGHBreastCancerUCSF"))
{
struct hashEl *hel = hashLookup(clinicalHash, name);
struct simpleClinical *clinicalItem;
if (hel != NULL)
@@ -1413,26 +1413,26 @@
nProbes = slCount(probes);
nExps = slCount(marrays);
totalHeight = nExps * lineHeight;
if ((nProbes > MICROARRAY_CLICK_LIMIT) &&
- !(sameString(tg->mapName, "expRatioUCSFDemo") || sameString(tg->mapName, "cnvLungBroadv2") || sameString(tg->mapName, "CGHBreastCancerUCSF") || sameString(tg->mapName, "expBreastCancerUCSF")) )
+ !(sameString(tg->table, "expRatioUCSFDemo") || sameString(tg->table, "cnvLungBroadv2") || sameString(tg->table, "CGHBreastCancerUCSF") || sameString(tg->table, "expBreastCancerUCSF")) )
{
int xOffRc = hvGfxAdjXW(hvg, xOff, insideWidth);
if(theImgBox && curImgTrack)
{
char link[512];
- safef(link,sizeof(link),"%s&g=%s&i=zoomInMore",hgcNameAndSettings(), tg->mapName); // NOTE: winStart,winEnd removed due to portal
+ safef(link,sizeof(link),"%s&g=%s&i=zoomInMore",hgcNameAndSettings(), tg->track); // NOTE: winStart,winEnd removed due to portal
#ifdef IMAGEv2_SHORT_MAPITEMS
if(xOffRc < insideX && xOffRc+insideWidth > insideX)
- warn("expRatioMapBoxes(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",tg->mapName,xOffRc, y, xOffRc+insideWidth, y+totalHeight, link);
+ warn("expRatioMapBoxes(%s) map item spanning slices. LX:%d TY:%d RX:%d BY:%d link:[%s]",tg->track,xOffRc, y, xOffRc+insideWidth, y+totalHeight, link);
#endif//def IMAGEv2_SHORT_MAPITEMS
- imgTrackAddMapItem(curImgTrack,link,"zoomInMore",xOffRc, y, xOffRc+insideWidth, y+totalHeight, tg->mapName);
+ imgTrackAddMapItem(curImgTrack,link,"zoomInMore",xOffRc, y, xOffRc+insideWidth, y+totalHeight, tg->track);
}
else
{
hPrintf("<AREA SHAPE=RECT COORDS=\"%d,%d,%d,%d\" ", xOffRc, y, xOffRc+insideWidth, y+totalHeight);
hPrintf("HREF=\"%s&g=%s&c=%s&l=%d&r=%d&db=%s&i=zoomInMore\" ",
- hgcNameAndSettings(), tg->mapName, chromName, winStart, winEnd, database);
+ hgcNameAndSettings(), tg->track, chromName, winStart, winEnd, database);
hPrintf("TITLE=\"zoomInMore\">\n");
}
}
else
@@ -1447,20 +1447,20 @@
x1 = 0;
if (x2 > insideWidth-1)
x2 = insideWidth-1;
w = x2 - x1 + 1;
- if (sameString(tg->mapName, "expRatioUCSFDemo") || sameString(tg->mapName, "cnvLungBroadv2") || sameString(tg->mapName, "expBreastCancerUCSF"))
+ if (sameString(tg->table, "expRatioUCSFDemo") || sameString(tg->table, "cnvLungBroadv2") || sameString(tg->table, "expBreastCancerUCSF"))
{
struct slList *item;
for (item = tg->items; item != NULL; item = item->next)
{
char *name = tg->itemName(tg, item);
- mapBoxHcTwoItems(hvg, winStart, winEnd, xOff, y, winEnd-winStart, lineHeight, tg->mapName, name, name, name);
+ mapBoxHcTwoItems(hvg, winStart, winEnd, xOff, y, winEnd-winStart, lineHeight, tg->track, name, name, name);
y = y + lineHeight;
}
break;
}
- else if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+ else if (sameString(tg->table, "CGHBreastCancerUCSF"))
{
struct slList *item;
struct hashEl *hel = NULL;
struct simpleClinical *clinicalItem;
@@ -1474,17 +1474,17 @@
{
clinicalItem = (struct simpleClinical *)hel->val;
if (ucsfdemoMatch(clinicalItem->er, clinicalItem->pr))
{
- mapBoxHcTwoItems(hvg, winStart, winEnd, xOff, y, winEnd-winStart, lineHeight, tg->mapName, name, name, name);
+ mapBoxHcTwoItems(hvg, winStart, winEnd, xOff, y, winEnd-winStart, lineHeight, tg->track, name, name, name);
y = y + lineHeight;
}
}
}
break;
}
else
- mapBoxHcTwoItems(hvg, probe->start, probe->end, x1+xOff, y, w, totalHeight, tg->mapName, probe->name, probe->name, probe->name);
+ mapBoxHcTwoItems(hvg, probe->start, probe->end, x1+xOff, y, w, totalHeight, tg->track, probe->name, probe->name, probe->name);
}
}
}
@@ -1585,9 +1585,9 @@
char *drawExons = trackDbSetting(tg->tdb, "expDrawExons");
boolean drawExonChecked = FALSE;
-safef(exonDrawCartName, sizeof(exonDrawCartName), "%s.expDrawExons", tg->mapName);
+safef(exonDrawCartName, sizeof(exonDrawCartName), "%s.expDrawExons", tg->track);
drawExonChecked = cartCgiUsualBoolean(cart, exonDrawCartName, FALSE);
if (drawExons && sameWord(drawExons, "on") && drawExonChecked)
{
expRatioDrawItemsWithExons(tg, seqStart, seqEnd, hvg, xOff, yOff, width,
@@ -1626,15 +1626,15 @@
}
}
else
{
- if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+ if (sameString(tg->table, "CGHBreastCancerUCSF"))
loadFiltersAndHash("phenBreastTumors");
struct slList *item;
for (item = tg->items, i = 0; item != NULL && i < nExps; item = item->next, i++)
{
/* filter */
- if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+ if (sameString(tg->table, "CGHBreastCancerUCSF"))
{
struct hashEl *hel = NULL;
struct simpleClinical *clinicalItem;
char *name = tg->itemName(tg, item);
@@ -1761,9 +1761,9 @@
expRatioMethods(tg);
tg->drawItems = expRatioDrawItems;
tg->drawLeftLabels = expRatioDrawLeftLabels;
tg->trackFilter = lfsFromExpRatio;
-if (sameString(tg->mapName, "CGHBreastCancerUCSF"))
+if (sameString(tg->table, "CGHBreastCancerUCSF"))
tg->totalHeight = ucsfdemoTotalHeight;
}
void expRatioMethodsFromCt(struct track *tg)