Merge pull request pklaus#16 from DL6ER/new/highres

Add high-res printing mode

Author: DL6ER

app/labeldesigner/label.py

@@ -61,6 +61,8 @@ def _ensure_pil_image(self, img) -> Image.Image:
         except Exception:
             pass
         raise TypeError("Unsupported image type for resizing. Please provide a PIL.Image.Image or compatible object.")
+
+
     qr_correction_mapping = {
         'M': constants.ERROR_CORRECT_M,
         'L': constants.ERROR_CORRECT_L,
@@ -326,6 +328,7 @@ def generate(self, rotate = False):
         text_offset = horizontal_offset_text, vertical_offset_text
         image_offset = horizontal_offset_image, vertical_offset_image
 
+        logger.debug(f"Image resolution: {int(width)} x {int(height)} px")
         imgResult = Image.new('RGB', (int(width), int(height)), 'white')
 
         if img is not None:

app/labeldesigner/printer.py

@@ -45,13 +45,14 @@ def label_size(self):
     def label_size(self, value):
         self._label_size = value
 
-    def add_label_to_queue(self, label, count, cut_once=False):
+    def add_label_to_queue(self, label, count, cut_once=False, high_res: bool = False):
         for cnt in range(0, count):
             cut = (cut_once == False) or (cut_once and cnt == count-1)
 
             self._printQueue.append(
                 {'label': label,
-                 'cut': cut
+                 'cut': cut,
+                 'high_res': high_res
                  })
 
     def process_queue(self) -> bool:
@@ -80,6 +81,7 @@ def process_queue(self) -> bool:
                 red='red' in self.label_size,
                 dither=dither,
                 cut=queue_entry['cut'],
+                dpi_600=queue_entry['high_res'],
                 rotate=rotate)
 
         self._printQueue.clear()

app/labeldesigner/routes.py

@@ -120,13 +120,14 @@ def print_label():
         if print_count < 1:
             raise ValueError("print_count must be greater than 0")
         cut_once = int(request.values.get('cut_once', 0)) == 1
+        high_res = int(request.values.get('high_res', 0)) != 0
     except Exception as e:
         return_dict['message'] = str(e)
         current_app.logger.exception(e)
         # Generate error 400 response
         return make_response(jsonify(return_dict), 400)
 
-    printer.add_label_to_queue(label, print_count, cut_once)
+    printer.add_label_to_queue(label, print_count, cut_once, high_res)
 
     try:
         status = printer.process_queue()
@@ -184,12 +185,16 @@ def create_label_from_request(request):
         'image_bw_threshold': int(d.get('image_bw_threshold', 70)),
         'image_fit': int(d.get('image_fit', 1)) > 0,
         'print_color': d.get('print_color', 'black'),
-        'timestamp': int(d.get('timestamp', 0))
+        'timestamp': int(d.get('timestamp', 0)),
+        'high_res': int(d.get('high_res', 0)) != 0
     }
 
-    def get_label_dimensions(label_size):
+    def get_label_dimensions(label_size, high_res: bool = False):
         try:
-            return [label.dots_printable for label in ALL_LABELS if label.identifier == label_size][0]
+            dimensions = [label.dots_printable for label in ALL_LABELS if label.identifier == label_size][0]
+            if high_res:
+                return [2*dimensions[0], 2*dimensions[1]]
+            return dimensions
         except KeyError:
             raise LookupError("Unknown label_size")
 
@@ -254,7 +259,7 @@ def get_uploaded_image(image):
     else:
         label_type = LabelType.ROUND_DIE_CUT_LABEL
 
-    width, height = get_label_dimensions(context['label_size'])
+    width, height = get_label_dimensions(context['label_size'], context['high_res'])
     if height > width:
         width, height = height, width
     if label_orientation == LabelOrientation.ROTATED:

app/labeldesigner/templates/labeldesigner.html

@@ -38,7 +38,7 @@
                             <div id="labelMismatch" class="form-text text-danger" style="display: none;">Label size mismatch detected!</div>
 
                             <label for="orientation" class="control-label input-group" style="margin-top: 10px; margin-bottom: 0">Label Orientation:</label>
-                            <div class="btn-group btn-group-toggle btn-block" data-toggle="buttons">
+                            <div class="btn-group btn-group-toggle btn-block mb-2" data-toggle="buttons">
                                 <label class="btn btn-secondary {% if default_orientation == 'standard' %}active{% endif %}" id="orientation_standard">
                                     <input type="radio" name="orientation" onchange="preview()" value="standard" aria-label="Standard" {% if
                                         default_orientation=='standard' %}checked data-default="1" {% endif %}>
@@ -50,6 +50,12 @@
                                     <span class="fas fa-ruler-vertical" aria-hidden="true"> Rotated
                                 </label>
                             </div>
+                            <div class="form-check mb-2">
+                                <input class="form-check-input" type="checkbox" onchange="preview()" id="highResolutionCheckbox" data-default="0">
+                                <label class="form-check-label" for="highResolutionCheckbox">
+                                    High-resolution printing (600 dpi)
+                                </label>
+                            </div>
                         </div>
                         <!-- class="card-body" -->
                     </div>

app/static/js/main.js

@@ -163,6 +163,7 @@ function formData(cut_once = false) {
         border_roundness: $('#borderRoundness').val(),
         border_distance_x: $('#borderDistanceX').val(),
         border_distance_y: $('#borderDistanceY').val(),
+        high_res: $('#highResolutionCheckbox').is(':checked') ? 1 : 0
     }
 
     if (printer_status['red_support']) {
@@ -173,13 +174,17 @@ function formData(cut_once = false) {
     return data;
 }
 
+function get_dpi() {
+    return $('#highResolutionCheckbox').is(':checked') ? 600 : 300;
+}
+
 function updatePreview(data) {
     setStatus({ 'preview': true });
     $('#previewImg').attr('src', 'data:image/png;base64,' + data);
     var img = $('#previewImg')[0];
     img.onload = function () {
-        $('#labelWidth').html((img.naturalWidth / default_dpi * 2.54).toFixed(1));
-        $('#labelHeight').html((img.naturalHeight / default_dpi * 2.54).toFixed(1));
+        $('#labelWidth').html((img.naturalWidth / get_dpi() * 2.54).toFixed(1));
+        $('#labelHeight').html((img.naturalHeight / get_dpi() * 2.54).toFixed(1));
     };
 }
 

tests/_demo_image_highres.jpg

@@ -106,6 +106,34 @@ def test_generate_preview(client):
     verify_image(response.data, 'tests/simple.png')
 
 
+def test_generate_preview_high_res(client):
+    data = EXAMPLE_FORMDATA.copy()
+    data['high_res'] = 1
+    data['text'] = json.dumps([
+        {
+            'family': 'DejaVu Sans',
+            'style': 'Book',
+            'text': 'Left',
+            'size': '60',
+            'align': 'left'
+        },
+        {
+            'family': 'Droid Sans Mono',
+            'style': 'Regular',
+            'text': '-- LONG MONO TEXT --',
+            'size': '50',
+            'align': 'center'
+        }
+    ])
+
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 200
+    assert response.content_type in ['image/png']
+
+    # Check image
+    verify_image(response.data, 'tests/simple_high_res.png')
+
+
 def test_generate_preview_inverted(client):
     data = EXAMPLE_FORMDATA.copy()
     data['text'] = json.dumps([
@@ -260,8 +288,13 @@ def test_generate_qr(client):
     verify_image(response.data, 'tests/qr.png')
 
 
-def image_test(client, image_path: str = "tests/_demo_image.jpg", rotated: bool = False, fit: bool = False, text: bool = False, image_mode: str = "grayscale"):
+def image_test(client, image_path: str|None = None, rotated: bool = False, fit: bool = False, text: bool = False, image_mode: str = "grayscale", high_res: bool = False):
     data = EXAMPLE_FORMDATA.copy()
+    if image_path is None:
+        if high_res:
+            image_path = "tests/_demo_image_highres.jpg"
+        else:
+            image_path = "tests/_demo_image.jpg"
     my_file = FileStorage(
         stream=open(image_path, "rb"),
         filename=os.path.basename(image_path),
@@ -270,6 +303,7 @@ def image_test(client, image_path: str = "tests/_demo_image.jpg", rotated: bool
     data['print_type'] = 'image'
     data['image'] = my_file
     data['image_mode'] = image_mode
+    data['high_res'] = 1 if high_res else 0
 
     if image_mode == "black":
         data['image_bw_threshold'] = '128'
@@ -287,7 +321,7 @@ def image_test(client, image_path: str = "tests/_demo_image.jpg", rotated: bool
             }
         ])
 
-    expected_img_path = "tests/image" + ("_rotated" if rotated else "") + ("_fit" if fit else "") + ("_text" if text else "") + "_" + image_mode + ".png"
+    expected_img_path = "tests/image" + ("_rotated" if rotated else "") + ("_fit" if fit else "") + ("_text" if text else "") + ("_highres" if high_res else "") + "_" + image_mode + ".png"
 
     response = client.post('/labeldesigner/api/preview', data=data)
     assert response.status_code == 200
@@ -341,6 +375,14 @@ def test_image_black_fit(client):
     image_test(client, image_mode="black", fit=True)
 
 
+def test_image_highres(client):
+    image_test(client, high_res=True)
+
+
+def test_image_highres_fit(client):
+    image_test(client, high_res=True, fit=True)
+
+
 def test_generate_template(client):
     data = EXAMPLE_FORMDATA.copy()
     # Mock current datetime.now