Skip to content

A free open source IT asset/license management system

fix labelwriter fonts and add scaling

Godfrey M2f3cfb0a4e26
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
index 08f2fb6d27..81d6e88452 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php
@@ -104,10 +104,18 @@ class LabelWriter_11354 extends LabelWriter
foreach ($record->get('fields') as $field) {
static::writeText(
- $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $pdf, $field['label'],
$currentX, $currentY,
- 'freesans', '', self::FIELD_SIZE, 'L',
- $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+ 'freesans', '', self::TITLE_SIZE, 'L',
+ $usableWidth, self::TITLE_SIZE, true, 0
+ );
+ $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+
+ static::writeText(
+ $pdf, $field['value'],
+ $currentX, $currentY,
+ 'freemono', 'B', self::FIELD_SIZE, 'L',
+ $usableWidth, self::FIELD_SIZE, true, 0, 0.5
);
$currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
}
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
index 63c270e865..420a058dc4 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
@@ -91,14 +91,47 @@ class LabelWriter_1933081 extends LabelWriter
$currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
}
- foreach ($record->get('fields') as $field) {
+ $fields = $record->get('fields');
+ // Below rescales the size of the field box to fit, it feels like it could/should be abstracted one class above
+ // to be usable on other labels but im unsure of how to implement that, since it uses a lot of private
+ // constants.
+
+ // Figure out how tall the label fields wants to be
+ $fieldCount = count($fields);
+ $perFieldHeight = (self::LABEL_SIZE + self::LABEL_MARGIN)
+ + (self::FIELD_SIZE + self::FIELD_MARGIN);
+ $usableHeight = $pa->h
+ - self::TAG_SIZE // bottom tag text
+ - self::BARCODE_MARGIN; // gap between fields and 1D
+
+ $baseHeight = $fieldCount * $perFieldHeight;
+ // If it doesn't fit in the available height, scale everything down
+ $scale = 1.0;
+ if ($baseHeight > $usableHeight && $baseHeight > 0) {
+ $scale = $usableHeight / $baseHeight;
+ }
+
+ $labelSize = self::LABEL_SIZE * $scale;
+ $labelMargin = self::LABEL_MARGIN * $scale;
+ $fieldSize = self::FIELD_SIZE * $scale;
+ $fieldMargin = self::FIELD_MARGIN * $scale;
+
+ foreach ($fields as $field) {
+ static::writeText(
+ $pdf, $field['label'],
+ $currentX, $currentY,
+ 'freesans', '', $labelSize, 'L',
+ $usableWidth, $labelSize, true, 0
+ );
+ $currentY += $labelSize + $labelMargin;
+
static::writeText(
- $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $pdf, $field['value'],
$currentX, $currentY,
- 'freesans', '', self::FIELD_SIZE, 'L',
- $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+ 'freemono', 'B', $fieldSize, 'L',
+ $usableWidth, $fieldSize, true, 0, 0.01
);
- $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+ $currentY += $fieldSize + $fieldMargin;
}
if ($record->has('barcode1d')) {
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
index 63701d31a1..99d7ae0947 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
@@ -91,21 +91,47 @@ class LabelWriter_2112283 extends LabelWriter
$currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
}
- foreach ($record->get('fields') as $field) {
+ $fields = $record->get('fields');
+ // Below rescales the size of the field box to fit, it feels like it could/should be abstracted one class above
+ // to be usable on other labels but im unsure of how to implement that, since it uses a lot of private
+ // constants.
+
+ // Figure out how tall the label fields wants to be
+ $fieldCount = count($fields);
+ $perFieldHeight = (self::LABEL_SIZE + self::LABEL_MARGIN)
+ + (self::FIELD_SIZE + self::FIELD_MARGIN);
+ $usableHeight = $pa->h
+ - self::TAG_SIZE // bottom tag text
+ - self::BARCODE_MARGIN; // gap between fields and 1D
+
+ $baseHeight = $fieldCount * $perFieldHeight;
+ // If it doesn't fit in the available height, scale everything down
+ $scale = 1.0;
+ if ($baseHeight > $usableHeight && $baseHeight > 0) {
+ $scale = $usableHeight / $baseHeight;
+ }
+
+ $labelSize = self::LABEL_SIZE * $scale;
+ $labelMargin = self::LABEL_MARGIN * $scale;
+ $fieldSize = self::FIELD_SIZE * $scale;
+ $fieldMargin = self::FIELD_MARGIN * $scale;
+
+ foreach ($fields as $field) {
static::writeText(
- $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $pdf, $field['label'],
$currentX, $currentY,
- 'freesans', '', self::FIELD_SIZE, 'L',
- $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+ 'freesans', '', $labelSize, 'L',
+ $usableWidth, $labelSize, true, 0
);
- $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
- }
+ $currentY += $labelSize + $labelMargin;
- if ($record->has('barcode1d')) {
- static::write1DBarcode(
- $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
- $currentX, $barcodeSize + self::BARCODE_MARGIN, $usableWidth - self::TAG_SIZE, self::TAG_SIZE
+ static::writeText(
+ $pdf, $field['value'],
+ $currentX, $currentY,
+ 'freemono', 'B', $fieldSize, 'L',
+ $usableWidth, $fieldSize, true, 0, 0.01
);
+ $currentY += $fieldSize + $fieldMargin;
}
}