Update of /cvsroot/basedb/basedb/include/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv4457/include/classes
Modified Files:
acquisition.inc.php image.inc.php spotimage.inc.php
Log Message:
Fixes soon after 1.2.0RC2...
Index: acquisition.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/acquisition.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** acquisition.inc.php 13 Feb 2003 11:36:52 -0000 1.14
--- acquisition.inc.php 13 Feb 2003 22:29:35 -0000 1.15
***************
*** 178,183 ****
}
! // Returns true if this acquisition has what it takes for a spot JPEG
! // to be created.
function canCreateJpegImage()
{
--- 178,184 ----
}
! // Returns non-0 if this acquisition has what it takes for a spot JPEG
! // to be created. 1 means that there are two tiffs, 2 that there is one
! // with both channels
function canCreateJpegImage()
{
***************
*** 192,198 ****
$arr[] = $row[0];
if(count($arr) == 1 && $arr[0] == IMAGE_CHANNEL_BOTH)
! return true;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
! return true;
return false;
}
--- 193,199 ----
$arr[] = $row[0];
if(count($arr) == 1 && $arr[0] == IMAGE_CHANNEL_BOTH)
! return 2;
if(count($arr) == 2 && $arr[0] == 1 && $arr[1] == 2)
! return 1;
return false;
}
Index: image.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/image.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** image.inc.php 13 Feb 2003 11:36:52 -0000 1.15
--- image.inc.php 13 Feb 2003 22:29:35 -0000 1.16
***************
*** 200,207 ****
function takeOverUseForJpeg()
{
! if($this->channels == -3)
$andchan = "";
else if($this->channels == 1 || $this->channels == 2)
! $andchan = "AND channels = $this->channels";
else
return false;
--- 200,207 ----
function takeOverUseForJpeg()
{
! if($this->channels == IMAGE_CHANNEL_BOTH)
$andchan = "";
else if($this->channels == 1 || $this->channels == 2)
! $andchan = "AND channels <> ".(3 - $this->channels);
else
return false;
Index: spotimage.inc.php
===================================================================
RCS file: /cvsroot/basedb/basedb/include/classes/spotimage.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** spotimage.inc.php 13 Feb 2003 11:36:52 -0000 1.10
--- spotimage.inc.php 13 Feb 2003 22:29:35 -0000 1.11
***************
*** 24,27 ****
--- 24,28 ----
require_once("raw.inc.php");
require_once("image.inc.php");
+ require_once("plate.inc.php");
***************
*** 99,103 ****
// $imgs is an array with either two images (keys 1 and 2) or one image
// (key IMAGE_CHANNEL_BOTH).
[...65 lines suppressed...]
global $BC;
--- 179,183 ----
// Returns an error message
! function createSpotImages($skiptiffs = 0)
{
global $BC;
***************
*** 203,207 ****
$err = "Spot image directory error";
else
! $err = $this->runSpotImageChopper($dir, $imgs);
if($err != "")
--- 207,211 ----
$err = "Spot image directory error";
else
! $err = $this->runSpotImageChopper($dir, $imgs, $skiptiffs);
if($err != "")
|
