Misc fixes

This commit is contained in:
Matthias Bisping 2023-02-15 19:50:14 +01:00
parent 66c65ce900
commit f9019d6625
4 changed files with 9 additions and 6 deletions

View File

@ -44,7 +44,7 @@ class StructuralFormulaImageGenerator:
pass
@debug_log()
@retry(10, errors=ValueError)
@retry(100, errors=ValueError)
def __generate_images_for_functional_group(self, smiles: Iterable[str], functional_group: str):
AllChem.Compute2DCoords(self.templates[functional_group])

View File

@ -40,7 +40,7 @@ class RandomPlot(RandomContentRectangle):
self.generate_random_histogram,
self.generate_random_pie_chart,
self.generate_random_heat_map,
self.generate_random_structural_formula
self.generate_random_structural_formula,
]
)
elif is_wide(rectangle):
@ -49,6 +49,7 @@ class RandomPlot(RandomContentRectangle):
self.generate_random_line_plot,
self.generate_random_histogram,
self.generate_random_bar_plot,
self.generate_random_structural_formula,
]
)
elif is_tall(rectangle):
@ -56,6 +57,7 @@ class RandomPlot(RandomContentRectangle):
[
self.generate_random_bar_plot,
self.generate_random_histogram,
self.generate_random_structural_formula,
]
)
else:
@ -145,7 +147,8 @@ class RandomPlot(RandomContentRectangle):
def generate_random_structural_formula(self, rectangle: Rectangle):
image = generate_image_of_structural_formula(size=rectangle.size)
self.content = image if not self.content else superimpose(self.content, image)
if image:
self.content = image if not self.content else superimpose(self.content, image)
def generate_plot_kwargs(self, keywords=None):

View File

@ -80,11 +80,11 @@ def generate_random_text_block(rectangle: Rectangle, n_sentences=None) -> Conten
def generate_random_image_caption(rectangle: Rectangle) -> ContentRectangle:
return generate_random_caption(rectangle, f"Fig {rnd.randint(1, 20)}")
return generate_random_caption(rectangle, f"Fig. {rnd.randint(1, 20)}")
def generate_random_table_caption(rectangle: Rectangle) -> ContentRectangle:
return generate_random_caption(rectangle, f"Tabl {rnd.randint(1, 20)}")
return generate_random_caption(rectangle, f"Tabl. {rnd.randint(1, 20)}")
def generate_random_caption(rectangle: Rectangle, caption_start, n_sentences=None) -> ContentRectangle:

View File

@ -17,6 +17,6 @@ class CaptionGenerator(TextBlockGenerator):
def generate_paragraph(self, rectangle, n_sentences):
lines = generate_random_text_lines(rectangle, self.line_formatter, n_sentences)
first_line_modified = f"{self.caption_start}.: {first(lines)}"
first_line_modified = f"{self.caption_start}: {first(lines)}"
lines = conj(first_line_modified, rest(lines))
return lines