From fd57fe99b77cbfe61ce97c5a19ebd2c8c47c10fa Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Wed, 18 Jan 2023 16:56:14 +0100 Subject: [PATCH] Tweak content selecton logic --- test/fixtures/page_generation/page.py | 37 +++++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/test/fixtures/page_generation/page.py b/test/fixtures/page_generation/page.py index 9ac1615..2c8befb 100644 --- a/test/fixtures/page_generation/page.py +++ b/test/fixtures/page_generation/page.py @@ -460,9 +460,9 @@ class RandomContentRectangle(ContentRectangle): class Size(Enum): - SMALL = 1000 - MEDIUM = 5000 - LARGE = 10000 + SMALL = sqrt(100**2) + MEDIUM = sqrt((100*5)**2) + LARGE = sqrt((100*10)**2) def get_size_class(rectangle: Rectangle): @@ -504,26 +504,29 @@ class RecursiveRandomTable(RandomContentRectangle): def inner(cell): inner_region = shrink_rectangle(cell, 0.1) - choice = random.choice(["text", "plot", "recurse", "plain_table"]) + choice = random.choice(["text", "plot", "recurse", "plain_table", "blank"]) size = get_size(inner_region) - if size <= Size.LARGE.value: - if choice == "recurse": - return generate_recursive_random_table(cell, border_width=0) - elif choice == "plot" and is_square_like(cell): - return generate_random_plot(cell) - else: - return generate_random_table(cell) + if size <= Size.SMALL.value: + return generate_random_text_block(inner_region) + elif size <= Size.MEDIUM.value: if choice == "plain_table": return generate_random_table(cell) - elif choice == "text": - return generate_random_text_block(inner_region) + elif choice == "plot": + return generate_random_plot(cell) else: - return generate_random_text_block(inner_region) - elif size <= Size.SMALL.value: - if choice == "text": - return generate_random_text_block(inner_region) + return cell + + elif size <= Size.LARGE.value: + if choice == "plot" and is_square_like(cell): + return generate_random_plot(cell) + # elif choice == "plain_table": + # return generate_random_table(cell) + elif choice == "blank": + return cell + else: + return generate_recursive_random_table(cell, border_width=0) return cell cell.content = inner(cell).content