Refactoring

This commit is contained in:
Matthias Bisping 2023-02-01 16:39:39 +01:00
parent 56c10490b9
commit 845d169194

View File

@ -1330,33 +1330,32 @@ def prepared_texture(texture, texture_fn):
return texture
@pytest.fixture
def content_boxes(boxes):
content_generator = ContentGenerator()
content_boxes = content_generator(boxes)
return content_boxes
@pytest.fixture
def page_with_opaque_content(
blank_page, tinted_blank_page, prepared_texture, boxes
blank_page, tinted_blank_page, prepared_texture, content_boxes
) -> Tuple[np.ndarray, Iterable[Rectangle]]:
"""Creates a page with content"""
page = paste_contents(prepared_texture, content_boxes)
content_generator = ContentGenerator()
boxes = content_generator(boxes)
page = paste_contents(prepared_texture, boxes)
return page, boxes
return page, content_boxes
@pytest.fixture
def page_with_translucent_content(
blank_page, tinted_blank_page, prepared_texture, boxes
blank_page, tinted_blank_page, prepared_texture, content_boxes
) -> Tuple[np.ndarray, List[Rectangle]]:
"""Creates a page with content"""
content_generator = ContentGenerator()
boxes = content_generator(boxes)
page_content = paste_contents(blank_page, boxes)
page_content = paste_contents(blank_page, content_boxes)
page = blend_by_multiply(page_content, prepared_texture)
return page, boxes
return page, content_boxes
def blend_by_multiply(page_content, texture):