Menu
▾
▴
[basedb-cvs] basedb/www gene_explore.phtml,1.72,1.73 hyb_edit.phtml,1.53,1.54 hyb_result.phtml,1.73,1.74 raw_makeimages.phtml,1.3,1.4 raw_table.phtml,1.3,1.4 test.phtml,1.61,1.62
Update of /cvsroot/basedb/basedb/www
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/www
Modified Files:
gene_explore.phtml hyb_edit.phtml hyb_result.phtml
raw_makeimages.phtml raw_table.phtml test.phtml
Log Message:
Fixes soon after 1.2.0RC2...
Index: gene_explore.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/gene_explore.phtml,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** gene_explore.phtml 11 Feb 2003 14:43:57 -0000 1.72
--- gene_explore.phtml 13 Feb 2003 22:29:37 -0000 1.73
***************
*** 151,154 ****
--- 151,159 ----
?>&oldlocation=<?= urlencode($location) ?>&i_filt="+filt;
}
+ function exploreGene()
+ {
+ document.ff.i_gsearch.value=0;
+ document.ff.submit();
+ }
</script>
<?
Index: hyb_edit.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/hyb_edit.phtml,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** hyb_edit.phtml 13 Feb 2003 08:47:47 -0000 1.53
--- hyb_edit.phtml 13 Feb 2003 22:29:37 -0000 1.54
***************
*** 189,193 ****
// New labeled extracts to associate?
! for($ch = 1; $ch < $maxch && $err == ""; $ch++)
{
if(!isset($i_lext[$ch]))
--- 189,193 ----
// New labeled extracts to associate?
! for($ch = 1; $ch <= $maxch && $err == ""; $ch++)
{
if(!isset($i_lext[$ch]))
Index: hyb_result.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/hyb_result.phtml,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** hyb_result.phtml 2 Feb 2003 15:31:52 -0000 1.73
--- hyb_result.phtml 13 Feb 2003 22:29:38 -0000 1.74
***************
*** 411,414 ****
--- 411,415 ----
}
$rep = new Reporter();
+ $arr[$rawcolcnt] = $rid; // For the prefix
$rep->setAllFromArray($arr, $rawcolcnt);
if(!$rep->write())
***************
*** 446,449 ****
--- 447,458 ----
$atid = 0;
$atmaptype = 0;
+
+ if(!$noarray)
+ {
+ $arr = ArraySlide::getBriefForHyb($hyb->getId(), $curUser);
+ if(!$arr)
+ $noarray = true;
+ }
+
if(!$noarray)
{
Index: raw_makeimages.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw_makeimages.phtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** raw_makeimages.phtml 13 Feb 2003 11:36:53 -0000 1.3
--- raw_makeimages.phtml 13 Feb 2003 22:29:38 -0000 1.4
***************
*** 73,82 ****
$spi = new SpotImage($raw);
// States: need to clear, need to choose images, set parameters, done
$state = 2;
if($raw->getHasSpotImages() == 1)
$state = 0;
! else if(!$acq->canCreateJpegImage())
$state = 1;
--- 73,85 ----
$spi = new SpotImage($raw);
+ $skiptiffs = isset($i_skiptiffs) ? (int)$i_skiptiffs : 0;
+
// States: need to clear, need to choose images, set parameters, done
$state = 2;
+ $tifftype = 0;
if($raw->getHasSpotImages() == 1)
$state = 0;
! else if(!($tifftype = $acq->canCreateJpegImage()))
$state = 1;
***************
*** 85,89 ****
if(!$spi->removeSpotImages())
$err = "Unable to remove existing spot images";
! else if(!$acq->canCreateJpegImage())
$state = 1;
else
--- 88,92 ----
if(!$spi->removeSpotImages())
$err = "Unable to remove existing spot images";
! else if(!($tifftype = $acq->canCreateJpegImage()))
$state = 1;
else
***************
*** 123,126 ****
--- 126,134 ----
$header = $raw->getFileHeader();
$spi->updateSpotInfoFromHeader($header, false);
+ if($tifftype == 2)
+ {
+ if(strpos($header, "Scanner=GenePix 4000A") !== false)
+ $skiptiffs = 2;
+ }
}
}
***************
*** 195,199 ****
ob_implicit_flush(1);
echo "<br><pre>\n";
! $err = $spi->createSpotImages();
ob_implicit_flush(0);
echo "</pre><p><table $cellpad>\n";
--- 203,207 ----
ob_implicit_flush(1);
echo "<br><pre>\n";
! $err = $spi->createSpotImages($skiptiffs);
ob_implicit_flush(0);
echo "</pre><p><table $cellpad>\n";
***************
*** 224,227 ****
--- 232,246 ----
<td><input type=text size=8 name=i_imgoffy value="<?=
$raw->getSpotImageOffsetY() ?>"> units</td></tr>
+ <?
+ if($tifftype == 2)
+ {
+ ?>
+ <tr><th>Skip preview TIFFs</th>
+ <td><input type=text size=8 name=i_skiptiffs value="<?=
+ $skiptiffs ?>"> first parts of multi-image TIFF will be
+ skipped</td></tr>
+ <?
+ }
+ ?>
<tr><td colspan=2><input type=submit name=i_useheader
value="Get data from header">
Index: raw_table.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/raw_table.phtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** raw_table.phtml 3 Feb 2003 08:55:47 -0000 1.3
--- raw_table.phtml 13 Feb 2003 22:29:38 -0000 1.4
***************
*** 183,187 ****
{
$cols[] = array("spots", false, array("Sp", $spots),
! 0, "renderSpot", 0, "w" => 1);
}
--- 183,187 ----
{
$cols[] = array("spots", false, array("Sp", $spots),
! 0, "renderSpots", 0, "w" => 1);
}
***************
*** 207,214 ****
function renderSpots(&$row)
{
! global $cbRaw;
$pos = $row["rawPosition"];
! $s *= 1;
echo "<td><img width=$s height=$s ".
"src='raw_spot.phtml/spot_${cbRaw}_${pos}_$s.png'></td>\n";
--- 207,214 ----
function renderSpots(&$row)
{
! global $cbRaw, $raw;
$pos = $row["rawPosition"];
! $s = $raw->getSpotImagePixels() * 1;
echo "<td><img width=$s height=$s ".
"src='raw_spot.phtml/spot_${cbRaw}_${pos}_$s.png'></td>\n";
Index: test.phtml
===================================================================
RCS file: /cvsroot/basedb/basedb/www/test.phtml,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** test.phtml 13 Feb 2003 11:36:53 -0000 1.61
--- test.phtml 13 Feb 2003 22:29:38 -0000 1.62
***************
*** 25,28 ****
--- 25,30 ----
//require_once("init.inc.php");
+ echo ("-1" == -1)."\n\n";
+
$arr = array(-1 => "a", 0 => "b", 1 => "c");
$arr["-1"] = "e";
|
