github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-08-22 22:34:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scaling

Browse source
This commit is contained in:
jh 2019-09-12 11:14:36 -07:00
commit e4e9c963d2
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mainscripts/Trainer.py
View file

@ -224,29 +224,27 @@ class Zoom(Enum):
def scale_previews(previews, zoom=Zoom.ZOOM_100): def scale_previews(previews, zoom=Zoom.ZOOM_100):
# Zoom previews scaled = []
for preview in previews[:]: for preview in previews:
preview_name, preview_rgb = preview preview_name, preview_rgb = preview
h, w, c = preview_rgb.shape scale_factor = zoom.scale
scale_factor = zoom.scale * float(h)
if scale_factor < 1: if scale_factor < 1:
previews.remove(preview) scaled.append((preview_name, cv2.resize(preview_rgb, (0, 0),
previews.append((preview_name, cv2.resize(preview_rgb, (0, 0),
fx=scale_factor, fx=scale_factor,
fy=scale_factor, fy=scale_factor,
interpolation=cv2.INTER_AREA))) interpolation=cv2.INTER_AREA)))
elif scale_factor > 1: elif scale_factor > 1:
previews.remove(preview) scaled.append((preview_name, cv2.resize(preview_rgb, (0, 0),
previews.append((preview_name, cv2.resize(preview_rgb, (0, 0),
fx=scale_factor, fx=scale_factor,
fy=scale_factor, fy=scale_factor,
interpolation=cv2.INTER_AREA))) interpolation=cv2.INTER_LANCZOS4)))
return previews else:
scaled.append((preview_name, preview_rgb))
return scaled
def create_preview_pane_image(previews, selected_preview, loss_history, def create_preview_pane_image(previews, selected_preview, loss_history,
show_last_history_iters_count, iteration, batch_size, zoom=Zoom.ZOOM_100): show_last_history_iters_count, iteration, batch_size, zoom=Zoom.ZOOM_100):
previews = scale_previews(previews, zoom)
selected_preview_name = previews[selected_preview][0] selected_preview_name = previews[selected_preview][0]
selected_preview_rgb = previews[selected_preview][1] selected_preview_rgb = previews[selected_preview][1]
h, w, c = selected_preview_rgb.shape h, w, c = selected_preview_rgb.shape
@ -255,7 +253,7 @@ def create_preview_pane_image(previews, selected_preview, loss_history,
head_lines = [ head_lines = [
'[s]:save [enter]:exit [-/+]:zoom: %s' % zoom.label, '[s]:save [enter]:exit [-/+]:zoom: %s' % zoom.label,
'[p]:update [space]:next preview [l]:change history range', '[p]:update [space]:next preview [l]:change history range',
'Preview: "%s" [%d/%d]' % (selected_preview_name,selected_preview+1, len(previews) ) 'Preview: "%s" [%d/%d]' % (selected_preview_name,selected_preview+1, len(previews))
] ]
head_line_height = int(15 * zoom.scale) head_line_height = int(15 * zoom.scale)
head_height = len(head_lines) * head_line_height head_height = len(head_lines) * head_line_height
@ -335,6 +333,7 @@ def main(args, device_args):
iteration = input['iter'] if 'iter' in input.keys() else 0 iteration = input['iter'] if 'iter' in input.keys() else 0
#batch_size = input['batch_size'] if 'iter' in input.keys() else 1 #batch_size = input['batch_size'] if 'iter' in input.keys() else 1
if previews is not None: if previews is not None:
previews = scale_previews(previews, zoom)
update_preview = True update_preview = True
elif op == 'close': elif op == 'close':
break break