AMP: code refactoring, fix preview history

added dumpdflive command
This commit is contained in:
iperov 2021-06-26 10:44:41 +04:00
parent 6d89d7fa4c
commit 5783191849
9 changed files with 143 additions and 144 deletions

View file

@ -232,7 +232,7 @@ class ModelBase(object):
preview_id_counter = 0
while not choosed:
self.sample_for_preview = self.generate_next_samples()
previews = self.get_static_previews()
previews = self.get_history_previews()
io.show_image( wnd_name, ( previews[preview_id_counter % len(previews) ][1] *255).astype(np.uint8) )
@ -258,7 +258,7 @@ class ModelBase(object):
self.sample_for_preview = self.generate_next_samples()
try:
self.get_static_previews()
self.get_history_previews()
except:
self.sample_for_preview = self.generate_next_samples()
@ -347,7 +347,7 @@ class ModelBase(object):
return ( ('loss_src', 0), ('loss_dst', 0) )
#overridable
def onGetPreview(self, sample):
def onGetPreview(self, sample, for_history=False):
#you can return multiple previews
#return [ ('preview_name',preview_rgb), ... ]
return []
@ -377,8 +377,8 @@ class ModelBase(object):
def get_previews(self):
return self.onGetPreview ( self.last_sample )
def get_static_previews(self):
return self.onGetPreview (self.sample_for_preview)
def get_history_previews(self):
return self.onGetPreview (self.sample_for_preview, for_history=True)
def get_preview_history_writer(self):
if self.preview_history_writer is None:
@ -484,7 +484,7 @@ class ModelBase(object):
plist += [ (bgr, self.get_strpath_storage_for_file('preview_%s.jpg' % (name) ) ) ]
if self.write_preview_history:
previews = self.get_static_previews()
previews = self.get_history_previews()
for i in range(len(previews)):
name, bgr = previews[i]
path = self.preview_history_path / name