Ankle/yolov5_ZWgra
1
0 Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix 2 for Arial.ttf redownloads with hub inference (#4628)

Browse Source
This commit is contained in:
Glenn Jocher authored and GitHub committed 2021-08-31 20:05:17 +02:00
1 parent ba0f80874f
commit a4e8f78c5e
2 files changed
+27 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

utils/__init__.py
+19 -19
View File
@@ -1,19 +1,19 @@
import sys # import sys
from pathlib import Path # from pathlib import Path
#
import torch # import torch
from PIL import ImageFont # from PIL import ImageFont
#
FILE = Path(__file__).absolute() # FILE = Path(__file__).absolute()
ROOT = FILE.parents[1] # yolov5/ dir # ROOT = FILE.parents[1] # yolov5/ dir
if str(ROOT) not in sys.path: # if str(ROOT) not in sys.path:
sys.path.append(str(ROOT)) # add ROOT to PATH # sys.path.append(str(ROOT)) # add ROOT to PATH
#
# Check YOLOv5 Annotator font # # Check YOLOv5 Annotator font
font = 'Arial.ttf' # font = 'Arial.ttf'
try: # try:
ImageFont.truetype(font) # ImageFont.truetype(font)
except Exception as e: # download if missing # except Exception as e: # download if missing
url = "https://ultralytics.com/assets/" + font # url = "https://ultralytics.com/assets/" + font
print(f'Downloading {url} to {ROOT / font}...') # print(f'Downloading {url} to {ROOT / font}...')
torch.hub.download_url_to_file(url, str(ROOT / font)) # torch.hub.download_url_to_file(url, str(ROOT / font))
utils/plots.py
+8 -3
View File
@@ -23,6 +23,9 @@ from utils.metrics import fitness
matplotlib.rc('font', **{'size': 11}) matplotlib.rc('font', **{'size': 11})
matplotlib.use('Agg') # for writing to files only matplotlib.use('Agg') # for writing to files only
FILE = Path(__file__).absolute()
ROOT = FILE.parents[1] # yolov5/ dir
class Colors: class Colors:
# Ultralytics color palette https://ultralytics.com/ # Ultralytics color palette https://ultralytics.com/
@@ -55,12 +58,14 @@ class Annotator:
self.draw = ImageDraw.Draw(self.im) self.draw = ImageDraw.Draw(self.im)
s = sum(self.im.size) / 2 # mean shape s = sum(self.im.size) / 2 # mean shape
f = font_size or max(round(s * 0.035), 12) f = font_size or max(round(s * 0.035), 12)
font = Path(font) # font handling
font = font if font.exists() else (ROOT / font.name)
try: try:
self.font = ImageFont.truetype(font, size=f) self.font = ImageFont.truetype(str(font) if font.exists() else font.name, size=f)
except Exception as e: # download if missing except Exception as e: # download if missing
url = "https://ultralytics.com/assets/" + font url = "https://ultralytics.com/assets/" + font.name
print(f'Downloading {url} to {font}...') print(f'Downloading {url} to {font}...')
torch.hub.download_url_to_file(url, font) torch.hub.download_url_to_file(url, str(font))
self.font = ImageFont.truetype(font, size=f) self.font = ImageFont.truetype(font, size=f)
self.fh = self.font.getsize('a')[1] - 3 # font height self.fh = self.font.getsize('a')[1] - 3 # font height
else: # use cv2 else: # use cv2