From ced1cd9559d8437ff7dc8152d6ceb421f5625cf8 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Wed, 18 Jan 2023 19:51:13 +0100 Subject: [PATCH] More tables less text --- test/fixtures/page_generation/page.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/fixtures/page_generation/page.py b/test/fixtures/page_generation/page.py index 5281053..4d41d14 100644 --- a/test/fixtures/page_generation/page.py +++ b/test/fixtures/page_generation/page.py @@ -401,18 +401,19 @@ class ContentGenerator: def __call__(self, boxes: List[Rectangle]) -> Image: random.shuffle(boxes) - char_boxes, text_boxes = lsplit(is_square_like, boxes) + figure_boxes, text_boxes = lsplit(is_square_like, boxes) if self.constrain_layouts: - char_boxes = merge_related_rectangles(char_boxes) - char_boxes = lfilter(is_square_like, char_boxes) + figure_boxes = merge_related_rectangles(figure_boxes) + figure_boxes = lfilter(is_square_like, figure_boxes) text_boxes = merge_related_rectangles(text_boxes) - text_boxes = lmap(generate_recursive_random_table, text_boxes) - plots = lmap(generate_recursive_random_table, every_nth(2, char_boxes)) - tables = lmap(generate_recursive_random_table, every_nth(2, char_boxes[1:])) + text_boxes = lmap(generate_random_text_block, every_nth(2, text_boxes)) + tables_1 = lmap(generate_recursive_random_table, every_nth(2, text_boxes[1:])) + plots = lmap(generate_random_plot, every_nth(2, figure_boxes)) + tables_2 = lmap(generate_recursive_random_table, every_nth(2, figure_boxes[1:])) - boxes = text_boxes + plots + tables + boxes = text_boxes + plots + tables_1 + tables_2 boxes = remove_included(boxes) boxes = remove_overlapping(boxes) @@ -527,7 +528,7 @@ class RecursiveRandomTable(RandomContentRectangle): return generate_random_table(cell) # cell.content = generate_random_table(inner_region).content # return cell - elif choice == "plot" and is_square_like(cell): + elif choice == "plot": # and is_square_like(cell): return generate_random_plot(cell) else: return generate_text_block(cell, f"{choice} {size:.0f} {get_size_class(cell).name}")