diff options
| -rw-r--r-- | modules/images.py | 6 | ||||
| -rw-r--r-- | modules/shared.py | 12 | ||||
| -rw-r--r-- | requirements_versions.txt | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/modules/images.py b/modules/images.py index 064849d3..41d1e6ef 100644 --- a/modules/images.py +++ b/modules/images.py @@ -5,6 +5,7 @@ import re import numpy as np
from PIL import Image, ImageFont, ImageDraw, PngImagePlugin
+from fonts.ttf import Roboto
import modules.shared
from modules.shared import opts
@@ -132,7 +133,10 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts): fontsize = (width + height) // 25
line_spacing = fontsize // 2
- fnt = ImageFont.truetype(opts.font, fontsize)
+ if not opts.font:
+ fnt = ImageFont.truetype(Roboto, fontsize)
+ else:
+ fnt = ImageFont.truetype(opts.font, fontsize)
color_active = (0, 0, 0)
color_inactive = (153, 153, 153)
diff --git a/modules/shared.py b/modules/shared.py index 5985d09e..83deeb15 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -80,16 +80,6 @@ prompt_styles = modules.styles.load_styles(styles_filename) face_restorers = []
-def find_any_font():
- fonts = ['/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf']
-
- for font in fonts:
- if os.path.exists(font):
- return font
-
- return "Arial.TTF"
-
-
class Options:
class OptionInfo:
def __init__(self, default=None, label="", component=None, component_args=None):
@@ -121,7 +111,7 @@ class Options: "jpeg_quality": OptionInfo(80, "Quality for saved jpeg images", gr.Slider, {"minimum": 1, "maximum": 100, "step": 1}),
"export_for_4chan": OptionInfo(True, "If PNG image is larger than 4MB or any dimension is larger than 4000, downscale and save copy as JPG"),
"enable_pnginfo": OptionInfo(True, "Save text information about generation parameters as chunks to png files"),
- "font": OptionInfo(find_any_font(), "Font for image grids that have text"),
+ "font": OptionInfo("", "Font for image grids that have text"),
"enable_emphasis": OptionInfo(True, "Use (text) to make model pay more attention to text text and [text] to make it pay less attention"),
"save_txt": OptionInfo(False, "Create a text file next to every image with generation parameters."),
"ESRGAN_tile": OptionInfo(192, "Tile size for upscaling. 0 = no tiling.", gr.Slider, {"minimum": 0, "maximum": 512, "step": 16}),
diff --git a/requirements_versions.txt b/requirements_versions.txt index e8a7470c..47e4e846 100644 --- a/requirements_versions.txt +++ b/requirements_versions.txt @@ -9,3 +9,5 @@ transformers==4.19.2 omegaconf==2.1.1
pytorch_lightning==1.7.2
scikit-image==0.19.2
+fonts
+font-roboto
|