added sumbmodules

This commit is contained in:
leno3003 2022-03-30 12:33:35 +02:00
parent 05850a227c
commit dc39e72fb9
2 changed files with 20 additions and 24 deletions

View file

@ -219,23 +219,16 @@ class InteractBase(object):
self.key_events[wnd_name] = [] self.key_events[wnd_name] = []
return ar return ar
def input(self, s, def_ans=" "): def input(self, s, answer_key):
#f = open("/home/deepfake/interact.txt", "a")
#f.write(s + def_ans + "\n")
#f.close()
print("La stringa è: |", s.strip(), "|")
if "WARNING " in s: if "WARNING " in s:
return "\n" return "\n"
res = dict(filter(lambda item: s in item[0], self.default_answers.items())) if answer_key in self.default_answers:
key = list(res.keys())[0] return self.default_answers[answer_key]
if key in self.default_answers:
return list(res.values())[0]
return input(s) return input(s)
def input_number(self, s, default_value, valid_list=None, show_default_value=True, add_info=None, help_message=None): def input_number(self, s, default_value, valid_list=None, show_default_value=True, add_info=None, help_message=None, answer_key=None):
s_base = s answer_key = answer_key if answer_key is not None else s
if show_default_value and default_value is not None: if show_default_value and default_value is not None:
s = f"[{default_value}] {s}" s = f"[{default_value}] {s}"
@ -256,7 +249,7 @@ class InteractBase(object):
while True: while True:
try: try:
inp = self.input(s_base, str(default_value)) inp = self.input(s, answer_key)
if len(inp) == 0: if len(inp) == 0:
result = default_value result = default_value
break break
@ -278,7 +271,8 @@ class InteractBase(object):
print(result) print(result)
return result return result
def input_int(self, s, default_value, valid_range=None, valid_list=None, add_info=None, show_default_value=True, help_message=None): def input_int(self, s, default_value, valid_range=None, valid_list=None, add_info=None, show_default_value=True, help_message=None, answer_key=None):
answer_key = answer_key if answer_key is not None else s
if show_default_value: if show_default_value:
if len(s) != 0: if len(s) != 0:
s_base = s s_base = s
@ -309,7 +303,7 @@ class InteractBase(object):
while True: while True:
try: try:
inp = self.input(s_base, str(default_value)) inp = self.input(s, answer_key)
if len(inp) == 0: if len(inp) == 0:
raise ValueError("") raise ValueError("")
@ -332,7 +326,8 @@ class InteractBase(object):
print (result) print (result)
return result return result
def input_bool(self, s, default_value, help_message=None): def input_bool(self, s, default_value, help_message=None, answer_key=None):
answer_key = answer_key if answer_key is not None else s
s_base = s s_base = s
s = f"[{yn_str[default_value]}] {s} ( y/n" s = f"[{yn_str[default_value]}] {s} ( y/n"
@ -342,7 +337,7 @@ class InteractBase(object):
while True: while True:
try: try:
inp = self.input(s_base, str(default_value)) inp = self.input(s_base, answer_key)
if len(inp) == 0: if len(inp) == 0:
raise ValueError("") raise ValueError("")
@ -355,7 +350,8 @@ class InteractBase(object):
print ( "y" if default_value else "n" ) print ( "y" if default_value else "n" )
return default_value return default_value
def input_str(self, s, default_value, valid_list=None, show_default_value=True, help_message=None): def input_str(self, s, default_value, valid_list=None, show_default_value=True, help_message=None, answer_key=None):
answer_key = answer_key if answer_key is not None else s
s_base = s s_base = s
if show_default_value and default_value is not None: if show_default_value and default_value is not None:
s = f"[{default_value}] {s}" s = f"[{default_value}] {s}"
@ -377,10 +373,9 @@ class InteractBase(object):
s += " : " s += " : "
print("Stringa costruita: |", s, "|")
while True: while True:
try: try:
inp = self.input(s_base, default_value) inp = self.input(s_base, answer_key)
if len(inp) == 0: if len(inp) == 0:
if default_value is None: if default_value is None:
@ -419,7 +414,8 @@ class InteractBase(object):
except: except:
sq.put (False) sq.put (False)
def input_in_time (self, str, max_time_sec): def input_in_time (self, str, max_time_sec, answer_key=None):
answer_key = answer_key if answer_key is not None else s
sq = multiprocessing.Queue() sq = multiprocessing.Queue()
p = multiprocessing.Process(target=self.input_process, args=( sys.stdin.fileno(), sq, str)) p = multiprocessing.Process(target=self.input_process, args=( sys.stdin.fileno(), sq, str))
p.daemon = True p.daemon = True

View file

@ -36,7 +36,7 @@ class MergerConfig(object):
for key in self.sharpen_dict.keys(): for key in self.sharpen_dict.keys():
s += f"""({key}) {self.sharpen_dict[key]}\n""" s += f"""({key}) {self.sharpen_dict[key]}\n"""
io.log_info(s) io.log_info(s)
self.sharpen_mode = io.input_int ("1", 0, valid_list=self.sharpen_dict.keys(), help_message="Enhance details by applying sharpen filter.") self.sharpen_mode = io.input_int ("", 0, valid_list=self.sharpen_dict.keys(), help_message="Enhance details by applying sharpen filter.", "1")
if self.sharpen_mode != 0: if self.sharpen_mode != 0:
self.blursharpen_amount = np.clip ( io.input_int ("Choose blur/sharpen amount", 0, add_info="-100..100"), -100, 100 ) self.blursharpen_amount = np.clip ( io.input_int ("Choose blur/sharpen amount", 0, add_info="-100..100"), -100, 100 )
@ -193,7 +193,7 @@ class MergerConfigMasked(MergerConfig):
for key in mode_dict.keys(): for key in mode_dict.keys():
s += f"""({key}) {mode_dict[key]}\n""" s += f"""({key}) {mode_dict[key]}\n"""
io.log_info(s) io.log_info(s)
mode = io.input_int ("2", mode_str_dict.get(self.default_mode, 1) ) mode = io.input_int ("", mode_str_dict.get(self.default_mode, 1) , "2")
self.mode = mode_dict.get (mode, self.default_mode ) self.mode = mode_dict.get (mode, self.default_mode )
@ -208,7 +208,7 @@ class MergerConfigMasked(MergerConfig):
for key in mask_mode_dict.keys(): for key in mask_mode_dict.keys():
s += f"""({key}) {mask_mode_dict[key]}\n""" s += f"""({key}) {mask_mode_dict[key]}\n"""
io.log_info(s) io.log_info(s)
self.mask_mode = io.input_int ("3", 1, valid_list=mask_mode_dict.keys() ) self.mask_mode = io.input_int ("", 1, valid_list=mask_mode_dict.keys(), "3" )
if 'raw' not in self.mode: if 'raw' not in self.mode:
self.erode_mask_modifier = np.clip ( io.input_int ("Choose erode mask modifier", 0, add_info="-400..400"), -400, 400) self.erode_mask_modifier = np.clip ( io.input_int ("Choose erode mask modifier", 0, add_info="-400..400"), -400, 400)