Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added inches to papertype / extended logic for inches

Browse Source
This commit is contained in:
int2001
2023-08-04 04:45:10 +00:00
parent 45e057c261
commit 14cff47f04
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/controllers/Labels.php
View File

@@ -163,6 +163,13 @@ class Labels extends CI_Controller {
$label->font='DejaVuSans'; // Fix font to DejaVuSans
$ptype=$this->labels_model->getPaperType($label->paper_type_id); // fetch papersize out of paper-table
if (($ptype->paper_id ?? '') != '') {
if ($ptype->metric == 'in') { // convert papersize to mm if given in inch
$paper_width=$ptype->width*25.4;
$paper_height=$ptype->height*25.4;
} else {
$paper_width=$ptype->width;
$paper_height=$ptype->height;
}
$pdf = new PDF_Label(array(
'paper-size' => 'custom', // $label->paper_type, // The only Type left is "custom" because A4 and so on are also defined at paper_types
'metric' => $label->metric,
@@ -175,8 +182,8 @@ class Labels extends CI_Controller {
'width' => $label->width,
'height' => $label->height,
'font-size' => $label->font_size,
'pgX' => $ptype->width,
'pgY' => $ptype->height
'pgX' => $paper_width,
'pgY' => $paper_height
));
} else {
if ($jscall) {