src/hg/hgTracks/hgTracks.c 1.1618
1.1618 2010/01/07 01:35:19 kent
Fixing indentation. Removing an unused define/ifdef. Adding braces for readability in a couple of places.
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1617
retrieving revision 1.1618
diff -b -B -U 4 -r1.1617 -r1.1618
--- src/hg/hgTracks/hgTracks.c 4 Jan 2010 19:12:24 -0000 1.1617
+++ src/hg/hgTracks/hgTracks.c 7 Jan 2010 01:35:19 -0000 1.1618
@@ -646,10 +646,9 @@
sr = sqlGetResult(conn, query);
while ((row = sqlNextRow(sr)) != NULL)
{
struct psl *gpsl = pslLoad(row+rowOffset);
- if (sameString(gpsl->tName, chromName) && gpsl->tStart < winEnd &&
- gpsl->tEnd > winStart)
+ if (sameString(gpsl->tName, chromName) && gpsl->tStart < winEnd && gpsl->tEnd > winStart)
{
struct psl *trimmed = pslTrimToQueryRange(gpsl, tpsl->tStart,
tpsl->tEnd);
struct linkedFeatures *lf;
@@ -677,10 +676,9 @@
hFreeConn(&conn);
}
else
for (psl = pslList; psl != NULL; psl = psl->next)
- if (sameString(psl->tName, chromName) && psl->tStart < winEnd &&
- psl->tEnd > winStart)
+ if (sameString(psl->tName, chromName) && psl->tStart < winEnd && psl->tEnd > winStart)
{
struct linkedFeatures *lf =
lfFromPslx(psl, 1, FALSE, FALSE, tg);
lf->name = cloneString("");
@@ -968,10 +966,9 @@
slReverse(&bedList);
if (count < maxCount)
tg->items = bedList;
else
- warn("More than %d items in %s, suppressing display",
- maxCount, tg->shortLabel);
+ warn("More than %d items in %s, suppressing display", maxCount, tg->shortLabel);
}
}
struct track *oligoMatchTg()
@@ -1133,11 +1130,10 @@
labelColor = track->itemLabelColor(track, item, hvg);
/* Do some fancy stuff for sample tracks.
* Draw y-value limits for 'sample' tracks. */
- if(track->subType == lfSubSample )
+ if (track->subType == lfSubSample )
{
-
if( prev == NULL )
newy += itemHeight;
else
newy += sampleUpdateY(name,
@@ -2363,9 +2359,9 @@
hvGfxUnclip(hvg);
}
/* Draw tracks. */
-{
+ {
long lastTime = 0;
y = yAfterRuler;
if (measureTiming)
lastTime = clock1000();
@@ -2422,9 +2418,9 @@
if(yEnd!=y)
warn("Slice height does not add up. Expecting %d != %d actual",yEnd - yStart - 1,y-yStart);
}
y++;
-}
+ }
/* if a track can draw its left labels, now is the time since it
* knows what exactly happened during drawItems
*/
if (withLeftLabels)
@@ -2980,15 +2976,15 @@
char *ctMapItemName(struct track *tg, void *item)
/* Return composite item name for custom tracks. */
{
- char *itemName = tg->itemName(tg, item);
- static char buf[256];
- if (strlen(itemName) > 0)
+char *itemName = tg->itemName(tg, item);
+static char buf[256];
+if (strlen(itemName) > 0)
sprintf(buf, "%s %s", ctFileName, itemName);
- else
+else
sprintf(buf, "%s NoItemName", ctFileName);
- return buf;
+return buf;
}
void coloredExonMethodsFromCt(struct track *tg)
@@ -3309,30 +3305,30 @@
void fr2ScaffoldEnsemblLink(char *archive)
/* print out Ensembl link to appropriate scaffold there */
{
- struct sqlConnection *conn = hAllocConn(database);
- struct sqlResult *sr = NULL;
- char **row = NULL;
- char query[256];
- safef(query, sizeof(query),
+struct sqlConnection *conn = hAllocConn(database);
+struct sqlResult *sr = NULL;
+char **row = NULL;
+char query[256];
+safef(query, sizeof(query),
"select * from chrUn_gold where chrom = '%s' and chromStart<%u and chromEnd>%u",
- chromName, winEnd, winStart);
- sr = sqlGetResult(conn, query);
+chromName, winEnd, winStart);
+sr = sqlGetResult(conn, query);
- int itemCount = 0;
- struct agpFrag *agpItem = NULL;
- while ((row = sqlNextRow(sr)) != NULL)
+int itemCount = 0;
+struct agpFrag *agpItem = NULL;
+while ((row = sqlNextRow(sr)) != NULL)
{
agpFragFree(&agpItem); // if there is a second one
agpItem = agpFragLoad(row+1);
++itemCount;
if (itemCount > 1)
break;
}
- sqlFreeResult(&sr);
- hFreeConn(&conn);
- if (1 == itemCount)
+sqlFreeResult(&sr);
+hFreeConn(&conn);
+if (1 == itemCount)
{ // verify *entirely* within single contig
if ((winEnd <= agpItem->chromEnd) &&
(winStart >= agpItem->chromStart))
{
@@ -3343,9 +3339,9 @@
agpStart, agpEnd);
hPrintf("%s</A></TD>", "Ensembl");
}
}
- agpFragFree(&agpItem); // the one we maybe used
+agpFragFree(&agpItem); // the one we maybe used
}
void hotLinks()
/* Put up the hot links bar. */
@@ -3393,10 +3389,9 @@
cartSessionVarName(),
cartSessionId(cart),
"Table View");
}
-else
-if (hIsGsidServer())
+else if (hIsGsidServer())
{
hPrintf("<TD ALIGN=CENTER><A HREF=\"../cgi-bin/gsidTable?db=%s\" class=\"topbar\">%s</A></TD>",
database, "Table View");
}
@@ -3492,9 +3487,9 @@
struct sqlResult *sr = NULL;
char **row = NULL;
char query[256];
safef(query, sizeof(query),
-"select * from ctgPos where chrom = '%s' and chromStart<%u and chromEnd>%u",
+ "select * from ctgPos where chrom = '%s' and chromStart<%u and chromEnd>%u",
chromName, winEnd, winStart);
sr = sqlGetResult(conn, query);
int itemCount = 0;
@@ -4324,16 +4319,19 @@
organization, browserName, organism, freezeName);
}
else
{
-
if (sameString(organism, "Archaea"))
+ {
hPrintf("%s %s on Archaeon %s Assembly",
organization, browserName, freezeName);
+ }
else
+ {
hPrintf("%s %s on %s %s Assembly (%s)",
organization, browserName, organism, freezeName, database);
}
+ }
hPrintf("</B></FONT><BR>\n");
/* This is a clear submit button that browsers will use by default when enter is pressed in position box. */
hPrintf("<INPUT TYPE=IMAGE BORDER=0 NAME=\"hgt.dummyEnterButton\" src=\"../images/DOT.gif\">");
@@ -4403,14 +4401,11 @@
hButton("hgt.jump", "jump");
hOnClickButton(clearButtonJavascript,"clear");
hPrintf(" size <span id='size'>%s</span> bp. ", buf);
hButton("hgTracksConfigPage", "configure");
-#define SURVEY 1
-#ifdef SURVEY
//hPrintf(" <FONT SIZE=3><A STYLE=\"text-decoration:none; padding:2px; background-color:yellow; border:solid 1px\" HREF=\"http://www.surveymonkey.com/s.asp?u=881163743177\" TARGET=_BLANK><EM><B>Your feedback</EM></B></A></FONT>\n");
if (survey && sameWord(survey, "on"))
hPrintf(" <FONT SIZE=3><A STYLE=\"background-color:yellow;\" HREF=\"http://www.surveymonkey.com/s.asp?u=881163743177\" TARGET=_BLANK><EM><B>Take survey</EM></B></A></FONT>\n");
-#endif
// info for drag selection javascript
hPrintf("<input type='hidden' id='hgt.winStart' name='winStart' value='%d'>\n", winStart);
hPrintf("<input type='hidden' id='hgt.winEnd' name='winEnd' value='%d'>\n", winEnd);
hPrintf("<input type='hidden' id='hgt.chromName' name='chromName' value='%s'>\n", chromName);
@@ -4504,9 +4499,9 @@
hPrintf("<B>Chromosome Color Key:</B><BR> ");
hPrintf("<IMG SRC = \"../images/new_colorchrom.gif\" BORDER=1 WIDTH=596 HEIGHT=18 ><BR>\n");
}
-if (showTrackControls)
+ if (showTrackControls)
{
/* Display viewing options for each track. */
/* Chuck: This is going to be wrapped in a table so that
* the controls don't wrap around randomly */