Merge pull request #297 from chinapandaman/PPF-296

PPF-296: fix x coordinate math for checkbox and radio button

Author: chinapandaman

PyPDFForm/__init__.py

@@ -7,4 +7,4 @@
 PyPDFForm = Wrapper
 PyPDFForm2 = WrapperV2
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"

PyPDFForm/core/filler.py

@@ -233,17 +233,17 @@ def fill_v2(
                 if elements[key].type == ElementType.checkbox:
                     if elements[key].value:
                         font_size = Utils().checkbox_radio_font_size(_element)
+                        _to_draw = Utils().checkbox_radio_to_draw(
+                            elements[key], font_size
+                        )
+                        x, y = TemplateCore().get_draw_checkbox_radio_coordinates_v2(
+                            _element, _to_draw
+                        )
                         texts_to_draw[page].append(
                             [
-                                Utils().checkbox_radio_to_draw(
-                                    elements[key], font_size
-                                ),
-                                TemplateCore().get_draw_checkbox_radio_coordinates_v2(
-                                    _element, font_size
-                                )[0],
-                                TemplateCore().get_draw_checkbox_radio_coordinates_v2(
-                                    _element, font_size
-                                )[1],
+                                _to_draw,
+                                x,
+                                y,
                             ]
                         )
                 elif elements[key].type == ElementType.radio:
@@ -253,17 +253,17 @@ def fill_v2(
 
                     if elements[key].value == radio_button_tracker[key] - 1:
                         font_size = Utils().checkbox_radio_font_size(_element)
+                        _to_draw = Utils().checkbox_radio_to_draw(
+                            elements[key], font_size
+                        )
+                        x, y = TemplateCore().get_draw_checkbox_radio_coordinates_v2(
+                            _element, _to_draw
+                        )
                         texts_to_draw[page].append(
                             [
-                                Utils().checkbox_radio_to_draw(
-                                    elements[key], font_size
-                                ),
-                                TemplateCore().get_draw_checkbox_radio_coordinates_v2(
-                                    _element, font_size
-                                )[0],
-                                TemplateCore().get_draw_checkbox_radio_coordinates_v2(
-                                    _element, font_size
-                                )[1],
+                                _to_draw,
+                                x,
+                                y,
                             ]
                         )
                 else:

PyPDFForm/core/template.py

@@ -275,23 +275,25 @@ def get_draw_checkbox_radio_coordinates(
     @staticmethod
     def get_draw_checkbox_radio_coordinates_v2(
         element: "pdfrw.PdfDict",
-        font_size: Union[float, int],
+        element_middleware: "ElementMiddleware",
     ) -> Tuple[Union[float, int], Union[float, int]]:
         """Returns coordinates to draw at given a PDF form checkbox/radio element."""
 
-        side = font_size * 96 / 72
-        c_half_width = (
+        string_height = element_middleware.font_size * 96 / 72
+        width_mid_point = (
             float(element[TemplateCoreConstants().annotation_rectangle_key][0])
             + float(element[TemplateCoreConstants().annotation_rectangle_key][2])
         ) / 2
-        c_half_height = (
+        height_mid_point = (
             float(element[TemplateCoreConstants().annotation_rectangle_key][1])
             + float(element[TemplateCoreConstants().annotation_rectangle_key][3])
         ) / 2
 
         return (
-            (c_half_width - side / 2 + c_half_width) / 2,
-            (c_half_height - side / 2 + c_half_height) / 2,
+            width_mid_point - stringWidth(
+                element_middleware.value, element_middleware.font, element_middleware.font_size
+            ) / 2,
+            (height_mid_point - string_height / 2 + height_mid_point) / 2,
         )
 
     @staticmethod

pdf_samples/max_length_text_field_related/comb_text_field_all_chars.pdf

@@ -692,20 +692,6 @@ def test_find_pattern_match_sejda(sejda_template, sejda_data):
         assert check
 
 
-def test_get_draw_checkbox_radio_coordinates_v2():
-    element = pdfrw.PdfDict(
-        **{
-            TemplateCoreConstants().annotation_rectangle_key.replace("/", ""): [
-                0,
-                0,
-                16,
-                16,
-            ]
-        }
-    )
-    assert TemplateCore().get_draw_checkbox_radio_coordinates_v2(element, 12) == (4, 4)
-
-
 def test_get_text_field_max_length(sample_template_with_max_length_text_field):
     for _page, elements in (
         TemplateCore()