Update of /cvsroot/basedb/basedb/include/web
In directory sc8-pr-cvs1:/tmp/cvs-serv7133/web
Modified Files:
assay_common.inc.php experiment_common.inc.php
gene_common.inc.php
Log Message:
Added import and display of extra bioassayset float columns
Index: assay_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/assay_common.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** assay_common.inc.php 1 Feb 2003 23:04:15 -0000 1.2
--- assay_common.inc.php 11 Feb 2003 14:43:12 -0000 1.3
***************
*** 49,53 ****
return "[<a ".href("assay_table.phtml?i_a=$id", 2).">Table</a>] ".
"[<a class=popup href='assay_plotter.phtml?i_a=$id' ".
! "target='assayPlotter_$id'>HTML Plot tool</a>]".
"[<a class=popup href='plotapplet/plot_assay.phtml?i_a=$id' ".
"target='assayJavaPlot_$id'>Java Plot tool</a>]";
--- 49,53 ----
return "[<a ".href("assay_table.phtml?i_a=$id", 2).">Table</a>] ".
"[<a class=popup href='assay_plotter.phtml?i_a=$id' ".
! "target='assayPlotter_$id'>HTML Plot tool</a>] ".
"[<a class=popup href='plotapplet/plot_assay.phtml?i_a=$id' ".
"target='assayJavaPlot_$id'>Java Plot tool</a>]";
Index: experiment_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/experiment_common.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** experiment_common.inc.php 10 Feb 2003 08:40:46 -0000 1.24
--- experiment_common.inc.php 11 Feb 2003 14:43:12 -0000 1.25
***************
*** 500,503 ****
--- 500,505 ----
<tr><th>Total # of values</th><td><?= $set->getSpotCount() ?></td></tr>
<tr><th>Total # of reporters</th><td><?= $set->getGeneCount() ?></td></tr>
+ <tr><th>Extra columns</th><td><?= $set->getHasExtraColumns() ? "Yes" : "No"
+ ?></td></tr>
<tr><td colspan=2 class=large><a <?=
href("gene_explore.phtml?i_set=$setid", 2) ?>
Index: gene_common.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/web/gene_common.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gene_common.inc.php 4 Feb 2003 21:51:11 -0000 1.9
--- gene_common.inc.php 11 Feb 2003 14:43:12 -0000 1.10
***************
*** 158,161 ****
--- 158,172 ----
}
+ function addExtraDataColumnsToColumns(&$cols, $setid, $show = 1)
+ {
+ $xc = ExtraDataColumn::getBriefForSet($setid);
+ for(reset($xc); list($id, $arr) = each($xc); )
+ {
+ $name = $arr["name"];
+ $cols[] = array("_xc_".printable($name), false, html($name), 1,
+ "renderExploreIntensity", $show);
+ }
+ }
+
?>
|
