From 2d129223dbdc666a6e7ceb28cd804d1df26a66c5 Mon Sep 17 00:00:00 2001 From: chinapandaman Date: Mon, 17 Jul 2023 16:47:32 -0500 Subject: [PATCH] PPF-374: removed --- PyPDFForm/core/utils.py | 3 -- PyPDFForm/core/watermark.py | 12 ++--- PyPDFForm/middleware/constants.py | 2 - PyPDFForm/middleware/template.py | 2 - PyPDFForm/middleware/text.py | 2 - PyPDFForm/wrapper.py | 12 ----- docs/examples.md | 41 -------------- .../sample_filled_customized_elements.pdf | Bin 653649 -> 653647 bytes pdf_samples/sample_pdf_with_drawn_text.pdf | Bin 625059 -> 625059 bytes tests/test_functional.py | 50 ------------------ 10 files changed, 6 insertions(+), 118 deletions(-) diff --git a/PyPDFForm/core/utils.py b/PyPDFForm/core/utils.py index 681be95e..360b314b 100644 --- a/PyPDFForm/core/utils.py +++ b/PyPDFForm/core/utils.py @@ -138,9 +138,6 @@ def checkbox_radio_to_draw( new_element.font = "Helvetica" new_element.font_size = font_size new_element.font_color = (0, 0, 0) - new_element.text_x_offset = 0 - new_element.text_y_offset = 0 - new_element.text_wrap_length = 100 if isinstance(element, Checkbox): new_element.value = constants.CHECKBOX_TO_DRAW diff --git a/PyPDFForm/core/watermark.py b/PyPDFForm/core/watermark.py index 15d317ac..111672b6 100644 --- a/PyPDFForm/core/watermark.py +++ b/PyPDFForm/core/watermark.py @@ -44,16 +44,16 @@ def draw_text( if element.comb is True: for i, char in enumerate(text_to_draw): canv.drawString( - coordinate_x + element.character_paddings[i] + element.text_x_offset, - coordinate_y + element.text_y_offset, + coordinate_x + element.character_paddings[i], + coordinate_y, char, ) elif ( element.text_wrap_length is None or len(text_to_draw) < element.text_wrap_length ): canv.drawString( - coordinate_x + element.text_x_offset, - coordinate_y + element.text_y_offset, + coordinate_x, + coordinate_y, text_to_draw, ) else: @@ -76,8 +76,8 @@ def draw_text( canv.saveState() canv.translate( - coordinate_x + element.text_x_offset, - coordinate_y + element.text_y_offset, + coordinate_x, + coordinate_y, ) canv.drawText(text_obj) canv.restoreState() diff --git a/PyPDFForm/middleware/constants.py b/PyPDFForm/middleware/constants.py index 24aa9149..be4cb0df 100644 --- a/PyPDFForm/middleware/constants.py +++ b/PyPDFForm/middleware/constants.py @@ -11,7 +11,5 @@ GLOBAL_FONT = "Helvetica" GLOBAL_FONT_SIZE = 12 GLOBAL_FONT_COLOR = (0, 0, 0) -GLOBAL_TEXT_X_OFFSET = 0 -GLOBAL_TEXT_Y_OFFSET = 0 ELEMENT_TYPES = Union[Text, Checkbox, Radio, Dropdown] diff --git a/PyPDFForm/middleware/template.py b/PyPDFForm/middleware/template.py index 663ae96c..0b51b5a9 100644 --- a/PyPDFForm/middleware/template.py +++ b/PyPDFForm/middleware/template.py @@ -69,8 +69,6 @@ def dropdown_to_text(dropdown: Dropdown) -> Text: result.font = constants.GLOBAL_FONT result.font_color = constants.GLOBAL_FONT_COLOR - result.text_x_offset = constants.GLOBAL_TEXT_X_OFFSET - result.text_y_offset = constants.GLOBAL_TEXT_Y_OFFSET if dropdown.value is not None: result.value = ( diff --git a/PyPDFForm/middleware/text.py b/PyPDFForm/middleware/text.py index b401ebee..9ac7fa80 100644 --- a/PyPDFForm/middleware/text.py +++ b/PyPDFForm/middleware/text.py @@ -19,8 +19,6 @@ def __init__( self.font = None self.font_size = None self.font_color = None - self.text_x_offset = None - self.text_y_offset = None self.text_wrap_length = None self.max_length = None self.comb = None diff --git a/PyPDFForm/wrapper.py b/PyPDFForm/wrapper.py index 0cbe6992..638741d2 100644 --- a/PyPDFForm/wrapper.py +++ b/PyPDFForm/wrapper.py @@ -37,12 +37,6 @@ def __init__( each.font_color = kwargs.get( "global_font_color", constants.GLOBAL_FONT_COLOR ) - each.text_x_offset = kwargs.get( - "global_text_x_offset", constants.GLOBAL_TEXT_X_OFFSET - ) - each.text_y_offset = kwargs.get( - "global_text_y_offset", constants.GLOBAL_TEXT_Y_OFFSET - ) def read(self) -> bytes: """Reads the file stream of a PDF form.""" @@ -102,12 +96,6 @@ def draw_text( new_element.font = kwargs.get("font", constants.GLOBAL_FONT) new_element.font_size = kwargs.get("font_size", constants.GLOBAL_FONT_SIZE) new_element.font_color = kwargs.get("font_color", constants.GLOBAL_FONT_COLOR) - new_element.text_x_offset = kwargs.get( - "text_x_offset", constants.GLOBAL_TEXT_X_OFFSET - ) - new_element.text_y_offset = kwargs.get( - "text_y_offset", constants.GLOBAL_TEXT_Y_OFFSET - ) watermarks = watermark_core.create_watermarks_and_draw( self.stream, diff --git a/docs/examples.md b/docs/examples.md index 2df1442a..d68b5cc6 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -131,45 +131,6 @@ with open(PATH_TO_FILLED_PDF_FORM, "wb+") as output: ) ``` -## Offset texts globally - -This example offsets all texts printed on the PDF form by 100 horizontally -and -100 vertically. - -```python -import os - -from PyPDFForm import PyPDFForm - -PATH_TO_DOWNLOADED_SAMPLE_PDF_FORM = os.path.join( - os.path.expanduser("~/Downloads"), "sample_template.pdf" -) # Change this to where you downloaded the sample PDF form - -PATH_TO_FILLED_PDF_FORM = os.path.join( - os.path.expanduser("~"), "output.pdf" -) # Change this to where you wish to put your filled PDF form - -with open(PATH_TO_FILLED_PDF_FORM, "wb+") as output: - output.write( - PyPDFForm( - PATH_TO_DOWNLOADED_SAMPLE_PDF_FORM, - global_text_x_offset=100, - global_text_y_offset=-100, - ) - .fill( - { - "test": "test_1", - "check": True, - "test_2": "test_2", - "check_2": False, - "test_3": "test_3", - "check_3": True, - }, - ) - .read() - ) -``` - ## Fill with customized elements A lot of times you may want one or more elements' details like font size and @@ -200,8 +161,6 @@ with open(PATH_TO_FILLED_PDF_FORM, "wb+") as output: pdf_form.elements["test"].font_size = 20 pdf_form.elements["test"].font_color = (1, 0, 0) - pdf_form.elements["test_2"].text_x_offset = 50 - pdf_form.elements["test_2"].text_y_offset = -50 pdf_form.elements["test_2"].font_color = (0, 1, 0) pdf_form.elements["test_3"].font = "LiberationSerif-Italic" pdf_form.elements["test_3"].font_color = (0, 0, 1) diff --git a/pdf_samples/sample_filled_customized_elements.pdf b/pdf_samples/sample_filled_customized_elements.pdf index 305c9f34ba80e778b1bae578f36e5458450ebe21..9c817774b16aa5add7fe4f505b4fc50f45091c7c 100644 GIT binary patch delta 1398 zcmZvbOKVd>6vv5HZ2}4+xN*}2lDnwF%$diTX_^FWn-pVgePC0x4XI7vP1Ak=gLKig zbTQJbTn9uK;#L=~#gE`eu=wcGxi+@to(vqg{O6qC{hz~`Z->Fx!{FW9gBa|8x^aE~ z%R!?(S6>|2%w*NrFk5^wpPF2`Tbe6ZGL2<@r&w#1Hm0-1>0GUvdu)>vayz-23G%61 z%dMqyYixF^P)~0@Tngr^nFkAIE1$17%EOR+R=htRnDIyJFk?s7N^3hC3zh6>;oi<< z8Y-%}B@2ya?PhiL>GK!)-EL>E+ll!&=i|JO0UsB9T=a3t$Kc0qC;nlkjYBLvL(R*H ze;>jcYa*KTH=1e~t(A;RS_|BgTCnU`OP%~!GNCz1lmcArXZ%`QkSm3fXj&?wA*bHa zP@hKkJe{#*1swCPoQj+=>E3uxIl|?A`sV`=+)DsFIo=`}x+;)hF z4ibfh=z~DXF*+HP{W>p`7JrzfV0iN6=fGv5FJ delta 1579 zcmZux&uddb5GMX?1Kz}QK$6fvlbPMwo!t^hY)q-OBuGhHnqUJprA=cITF(#h;2+RK zr8$W=59-ZB&Ys18r6-SWef70) zb$Z_IFGFvxvtMe=Hya!6&idwKvv^n;%r#f5ySu%$+FN>(+pCo4%iS$k+3sh#J?P{X zmzOFlPwSh-oGzcd`||MpX!v0?Oog}=;&zBTA?}8_7vg@1nIEI!?B|WdXW-(=96m^2 zzG&~m*EB}q(@BiuS^_k(Rw)#<%Bw3ZnGh3bt3@Jd5|{xaF}4D;!~$cS7LouEu$Nss zd)?uG4SLxO0tjLRo+b$#c!M*jluF_bQF);lwUs2KC5b^H1dS6y(3&wvGM+mjD@np$ zk~o$mo&<>k9Ft5q6u5{Z0aE0|+?4_OLt_M{gSD}P8mySRR#xU&#!Q%hc>c{;vli;K z(_+&NV59`dfR}mNh&+ol$xE(}9p7+t7>yud#U^%(mAe7+Vn2d3(O|+_i4IwZZHR1T zZ8^4|wO8>`WI`7^$V3#oz~nFpx%7WxKO117&X5+xhQ)rc1v{~I?5fpDVs?D_1m5=5 lt;g1zc+>g9n%D(4PGX)!ty8E@zx|p0IOEdUY`wXZ{tH9eNL>H` diff --git a/pdf_samples/sample_pdf_with_drawn_text.pdf b/pdf_samples/sample_pdf_with_drawn_text.pdf index a57508d4d3411edb7c32360511fc48ad1e2efebe..3520ce2ae8045623c1ce4296e668cee0679fe084 100644 GIT binary patch delta 73 zcmZ2HS#9xTwGCk#xKs^YiwyiU5{m;TCu~q)cS^R(F{-nhoUlfudG?0(*&7&vm