ENH: Restore merge_transformed_page & co + add 'over' parameter #1567

pubpub-zz · 2023-01-21T11:52:38Z

Added the over parameter

Fixes #1426
Fixes #1601

for performance

was not sure it would have worked😉 Co-authored-by: Martin Thoma <info@martin-thoma.de>

fixes py-pdf#1426

pubpub-zz · 2023-01-21T11:52:57Z

still in progress to confirm use cases

codecov · 2023-01-21T12:01:02Z

Codecov Report

Base: 91.90% // Head: 91.94% // Increases project coverage by +0.03% 🎉

Coverage data is based on head (e24367b) compared to base (6ec88ad).
Patch coverage: 86.06% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1567      +/-   ##
==========================================
+ Coverage   91.90%   91.94%   +0.03%     
==========================================
  Files          33       33              
  Lines        6252     6368     +116     
  Branches     1244     1271      +27     
==========================================
+ Hits         5746     5855     +109     
+ Misses        326      325       -1     
- Partials      180      188       +8

Impacted Files	Coverage Δ
pypdf/_writer.py	`84.55% <85.71%> (-0.03%)`	⬇️
pypdf/_page.py	`90.51% <86.08%> (+0.66%)`	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

include new param Over test added

pubpub-zz · 2023-01-29T22:37:55Z

pending a last check but ready for review

MartinThoma · 2023-01-30T23:12:16Z

This includes the (decimal -> float) change, so I suggest we first handle #1563 before we merge this PR.

pubpub-zz · 2023-01-30T23:15:41Z

This includes the (decimal -> float) change, so I suggest we first handle #1563 before we merge this PR.

agree, that was the subject of my comment in #1563, however I needed the fix to complete my tests.

Decimal was replaced by float in order to fix bugs. It might also improve speed in some cases. It is a preparation for #1567 Fixes #1527 Fixes #1376

MartinThoma · 2023-02-04T19:03:55Z

pypdf/_page.py

@@ -315,7 +315,9 @@ def __repr__(self) -> str:
        return f"Transformation(ctm={self.ctm})"

    def apply_on(
-        self, pt: Union[Tuple[Decimal, Decimal], Tuple[float, float], List[float]]
+        self,
+        pt: Union[Tuple[Decimal, Decimal], Tuple[float, float], List[float]],


Is this still Decimal or is it float?

agree Decimal is no more required.

MartinThoma · 2023-02-04T19:04:25Z

pypdf/generic/_base.py

+                value = value.decode()
+            else:
+                value = str_(value)
+            value = float(value)
            return float.__new__(cls, value)
        except Exception as e:
            # If this isn't a valid decimal (happens in malformed PDFs)


I guess this has to be replaced by "float"?

Normally part of the PR on float.

pypdf/_page.py

pubpub-zz · 2023-02-04T21:19:39Z

all good ?

MartinThoma · 2023-02-05T08:08:23Z

Github shows me that there is an update to the git submodule sample-files, but it doesn't show me to which commit it's updated. That is super weird.

Do you happen to know what was changed?

MartinThoma · 2023-02-05T08:20:27Z

Thank you for the PR @pubpub-zz 🤗 I'll release it today

pubpub-zz · 2023-02-05T08:20:55Z

Just a small point for me this

Github shows me that there is an update to the git submodule sample-files, but it doesn't show me to which commit it's updated. That is super weird.

Do you happen to know what was changed?

I have some issues about it saying there is some changes but I'm unable to discard them. I did no change about it.

PS : Should not we consider this PR as an enhancement as there is some new functions ?

MartinThoma · 2023-02-05T08:34:40Z

An enhancement for me is something new the user can do which they couldn't do before. Is there anything like that?

To me it looks like the merging functionality has been fixed, but it did work at some point before (right?)

pubpub-zz · 2023-02-05T08:39:47Z

The merge_transformed_page and code have been hosted from the old names. Also these functions now have the new over parameter

MartinThoma · 2023-02-05T09:39:11Z

By the way: Why did you introduce that parameter? (I should have asked that before)

Aren't those two equivalent?

page1.merge_scaled_page(page2, over=True)
page2.merge_scaled_page(page1, over=False)

pubpub-zz · 2023-02-05T10:51:59Z

By the way: Why did you introduce that parameter? (I should have asked that before)

Aren't those two equivalent?
page1.merge_scaled_page(page2, over=True)
page2.merge_scaled_page(page1, over=False)

No
first the syntax is page1.merge_scaled_page(page2, .5, over=True)
therefore you can not "swap" page_1/page_2

Second, the standard case is to have already added in the page into the writer (I dislike the idea of "modifying" page in readers).
therefore "page_1" can not be easily replaced

MartinThoma · 2023-02-05T11:23:26Z

first the syntax is page1.merge_scaled_page(page2, .5, over=True), therefore you can not "swap" page_1/page_2

Good point! That's something I completely missed 🤦

Yes, in that case I agree that it's actually a new feature / enhancement 👍 Thanks for explaining 🤗

NOTICE: pypdf changed the way it represents numbers parsed from PDF files. pypdf<3.4.0 represented numbers as Decimal, pypdf>=3.4.0 represents them as floats. Several other PDF libraries to this, as well as many PDF viewers. We hope to fix issues with too high precision like this and get a speed boost. In case your PDF documents rely on more than 18 decimals of precision you should check if it still works as expected. To clarify: This does not affect the text shown in PDF documents. It affects numbers, e.g. when graphics are drawn on the PDF or very exact positions are used. Typically, 5 decimals should be enough. New Features (ENH) - Enable merging forms with overlapping names (#1553) - Add 'over' parameter to merge_transformend_page & co (#1567) Bug Fixes (BUG) - Fix getter of the PageObject.rotation property with an indirect object (#1602) - Restore merge_transformed_page & co (#1567) - Replace decimal by float (#1563) Robustness (ROB) - PdfWriter.remove_images: /Contents might not be in page_ref (#1598) Developer Experience (DEV) - Introduce ruff (#1586, #1609) Maintenance (MAINT) - Remove decimal (#1608) [Full Changelog](3.3.0...3.4.0)

pubpub-zz and others added 6 commits January 18, 2023 21:39

replace decimal by float

3d8f610

for performance

flake8

1748193

pytest

08fad9c

mypy

b05e1d4

Update pypdf/generic/_base.py

e3a6ebc

was not sure it would have worked😉 Co-authored-by: Martin Thoma <info@martin-thoma.de>

merge_transformed_page & co

1c0406c

fixes py-pdf#1426

pubpub-zz added 7 commits January 24, 2023 20:36

Merge remote-tracking branch 'py-pdf/main' into merge_trsf_page

1a9467f

Merge remote-tracking branch 'py-pdf/main' into try_float

d98d0e4

removed unused code

205131e

Merge remote-tracking branch 'origin/try_float' into merge_trsf_page

6e257b4

add merge_page with transformation

f306666

include new param Over test added

flake8

a4c1d9b

mypy

fb0de8b

MartinThoma mentioned this pull request Jan 29, 2023

Alternative to add_transformation translate #1426

Closed

pubpub-zz added 3 commits January 29, 2023 22:05

Move Annots + tests

32820e5

Merge branch 'main' into merge_trsf_page

429d84b

mypy

1fcaaae

pubpub-zz added 2 commits January 30, 2023 23:32

fix case with add_blank_page

2b7afd5

missed

5310896

Fix 1601

75b0973

pubpub-zz mentioned this pull request Feb 4, 2023

Page merging broken since #1371 #1601

Closed

MartinThoma mentioned this pull request Feb 4, 2023

BUG: Replace decimal by float #1563

Merged

MartinThoma pushed a commit that referenced this pull request Feb 4, 2023

BUG: Replace decimal by float (#1563)

6ec88ad

Decimal was replaced by float in order to fix bugs. It might also improve speed in some cases. It is a preparation for #1567 Fixes #1527 Fixes #1376

MartinThoma reviewed Feb 4, 2023

View reviewed changes

pypdf/_page.py Show resolved Hide resolved

MartinThoma changed the title ~~merge_transformed_page & co~~ BUG: merge_transformed_page & co Feb 4, 2023

merging PR

30b0ca2

MartinThoma added soon PRs that are almost ready to be merged, issues that get solved pretty soon is-bug From a users perspective, this is a bug - a violation of the expected behavior with a compliant PDF labels Feb 4, 2023

Merge remote-tracking branch 'py-pdf/main' into merge_trsf_page

e24367b

pubpub-zz force-pushed the merge_trsf_page branch from 7cdfed0 to e24367b Compare February 4, 2023 20:59

MartinThoma changed the title ~~BUG: merge_transformed_page & co~~ BUG: Restore merge_transformed_page & co Feb 5, 2023

MartinThoma merged commit 2d60c71 into py-pdf:main Feb 5, 2023

MartinThoma removed the soon PRs that are almost ready to be merged, issues that get solved pretty soon label Feb 5, 2023

MartinThoma changed the title ~~BUG: Restore merge_transformed_page & co~~ ENH: Restore merge_transformed_page & co + add 'over' parameter Feb 5, 2023

pubpub-zz mentioned this pull request Feb 23, 2023

BUG: page.mediabox not updating correctly when merging #636

Closed

pubpub-zz deleted the merge_trsf_page branch June 24, 2023 08:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ENH: Restore merge_transformed_page & co + add 'over' parameter #1567

ENH: Restore merge_transformed_page & co + add 'over' parameter #1567

pubpub-zz commented Jan 21, 2023 •

edited by MartinThoma

Loading

pubpub-zz commented Jan 21, 2023

codecov bot commented Jan 21, 2023 •

edited

Loading

pubpub-zz commented Jan 29, 2023

MartinThoma commented Jan 30, 2023

pubpub-zz commented Jan 30, 2023

MartinThoma Feb 4, 2023

pubpub-zz Feb 4, 2023

MartinThoma Feb 4, 2023

pubpub-zz Feb 4, 2023

pubpub-zz commented Feb 4, 2023

MartinThoma commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

ENH: Restore merge_transformed_page & co + add 'over' parameter #1567

ENH: Restore merge_transformed_page & co + add 'over' parameter #1567

Conversation

pubpub-zz commented Jan 21, 2023 • edited by MartinThoma Loading

pubpub-zz commented Jan 21, 2023

codecov bot commented Jan 21, 2023 • edited Loading

Codecov Report

pubpub-zz commented Jan 29, 2023

MartinThoma commented Jan 30, 2023

pubpub-zz commented Jan 30, 2023

MartinThoma Feb 4, 2023

Choose a reason for hiding this comment

pubpub-zz Feb 4, 2023

Choose a reason for hiding this comment

MartinThoma Feb 4, 2023

Choose a reason for hiding this comment

pubpub-zz Feb 4, 2023

Choose a reason for hiding this comment

pubpub-zz commented Feb 4, 2023

MartinThoma commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Feb 5, 2023

MartinThoma commented Feb 5, 2023

pubpub-zz commented Jan 21, 2023 •

edited by MartinThoma

Loading

codecov bot commented Jan 21, 2023 •

edited

Loading