src/hg/instinct/hgHeatmap2/hgHeatmap2.c 1.89
1.89 2010/05/26 21:31:25 cszeto
Added microscope toggle support, removed local_url support
Index: src/hg/instinct/hgHeatmap2/hgHeatmap2.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/hgHeatmap2/hgHeatmap2.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -b -B -U 4 -r1.88 -r1.89
--- src/hg/instinct/hgHeatmap2/hgHeatmap2.c 17 Apr 2010 16:26:45 -0000 1.88
+++ src/hg/instinct/hgHeatmap2/hgHeatmap2.c 26 May 2010 21:31:25 -0000 1.89
@@ -1614,9 +1614,9 @@
AllocVar(da);
da->name = cloneString(gh->name);
da->shortLabel = cloneString(gh->shortLabel);
da->longLabel = cloneString(gh->longLabel);
- //da->local_url = cloneString(gh->local_url); // disabled since we have hgDetails now
+ da->microscope = cloneString(gh->microscope);
da->expCount = gh->expCount;
slAddHead(&gr->datasets, da);
}
@@ -1635,9 +1635,9 @@
{
jsonAddString(set, "name", da->name);
jsonAddString(set, "shortLabel", da->shortLabel);
jsonAddString(set, "longLabel", da->longLabel);
- jsonAddString(set, "local_url", da->local_url);
+ jsonAddString(set, "microscope", da->microscope);
jsonAddInt(set, "N", da->expCount);
if (da->next)
set = jsonAddContainerToList(&group);
@@ -1698,9 +1698,9 @@
AllocVar(da);
da->name = cloneString(gh->name);
da->shortLabel = cloneString(gh->shortLabel);
da->longLabel = cloneString(gh->longLabel);
- da->local_url = cloneString(gh->local_url);
+ da->microscope = cloneString(gh->microscope);
da->expCount = gh->expCount;
slAddHead(&gr->datasets, da);
}
slReverse(&groups);
@@ -1720,9 +1720,9 @@
{
jsonAddString(set, "name", da->name);
jsonAddString(set, "shortLabel", da->shortLabel);
jsonAddString(set, "longLabel", da->longLabel);
- jsonAddString(set, "local_url", da->local_url);
+ jsonAddString(set, "microscope", da->microscope);
jsonAddInt(set, "N", da->expCount);
if (da->next)
set = jsonAddContainerToList(&group);