Skip to content

Commit 17ff5b2

Browse files
author
Mark Williams
committed
LIMS-1818: Print commas on empty lines
1 parent 1801625 commit 17ff5b2

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

api/src/Page/Download.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,9 @@ function _dispensing_csv()
356356
$column = str_pad($wellNumber - ($rowNumber * $plate["WELLPERROW"]) + 1, 2, 0, STR_PAD_LEFT); # pad with a zero if needed
357357
$dropNumber = intval($r["LOCATION"] - ($dropsPerWell * $wellNumber)); # 1 indexed
358358
$drop = $dropNames[$dropNumber-1];
359-
if (!$r["POSX"]) {
360-
print $row . $column . $drop . "\n";
361-
} else {
362-
$xval = round(($r["POSX"] - $width/2) * $r["MICRONSPERPIXELX"]); # integers
363-
$yval = round(($height/2 - $r["POSY"]) * $r["MICRONSPERPIXELY"]); # integers
364-
print $row . $column . $drop . "," . $xval . "," . $yval . "\n";
365-
}
359+
$xval = $r["POSX"] ? round(($r["POSX"] - $width/2) * $r["MICRONSPERPIXELX"]) : ""; # integers
360+
$yval = $r["POSY"] ? round(($height/2 - $r["POSY"]) * $r["MICRONSPERPIXELY"]) : ""; # integers
361+
print $row . $column . $drop . "," . $xval . "," . $yval . "\n";
366362
}
367363
}
368364

0 commit comments

Comments
 (0)