Implemented custom parameters option
This commit is contained in:
@@ -62,6 +62,7 @@ DEFAULT_DATA = {
|
|||||||
'modelStackedLabel': '',
|
'modelStackedLabel': '',
|
||||||
'aiModel': 'v4',
|
'aiModel': 'v4',
|
||||||
'resType': 'Kaiser Fast',
|
'resType': 'Kaiser Fast',
|
||||||
|
'manType': False,
|
||||||
|
|
||||||
'useModel': 'instrumental',
|
'useModel': 'instrumental',
|
||||||
'lastDir': None,
|
'lastDir': None,
|
||||||
@@ -247,7 +248,7 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
PROGRESS_HEIGHT = 26
|
PROGRESS_HEIGHT = 26
|
||||||
PADDING = 10
|
PADDING = 10
|
||||||
|
|
||||||
COL1_ROWS = 9
|
COL1_ROWS = 9.5
|
||||||
COL2_ROWS = 8.1
|
COL2_ROWS = 8.1
|
||||||
COL3_ROWS = 5.5
|
COL3_ROWS = 5.5
|
||||||
|
|
||||||
@@ -306,6 +307,7 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
self.hopValue_var = tk.StringVar(value=data['hop_length'])
|
self.hopValue_var = tk.StringVar(value=data['hop_length'])
|
||||||
self.winSize_var = tk.StringVar(value=data['window_size'])
|
self.winSize_var = tk.StringVar(value=data['window_size'])
|
||||||
self.nfft_var = tk.StringVar(value=data['n_fft'])
|
self.nfft_var = tk.StringVar(value=data['n_fft'])
|
||||||
|
self.manType_var = tk.BooleanVar(value=data['manType'])
|
||||||
# AI model
|
# AI model
|
||||||
self.aiModel_var = tk.StringVar(value=data['aiModel'])
|
self.aiModel_var = tk.StringVar(value=data['aiModel'])
|
||||||
self.resType_var = tk.StringVar(value=data['resType'])
|
self.resType_var = tk.StringVar(value=data['resType'])
|
||||||
@@ -468,6 +470,11 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
text='Model Test Mode',
|
text='Model Test Mode',
|
||||||
variable=self.modelFolder_var,
|
variable=self.modelFolder_var,
|
||||||
)
|
)
|
||||||
|
# Manual Constants
|
||||||
|
self.options_manType_Checkbutton = ttk.Checkbutton(master=self.options_Frame,
|
||||||
|
text='Custom parameters',
|
||||||
|
variable=self.manType_var,
|
||||||
|
)
|
||||||
# -Column 2-
|
# -Column 2-
|
||||||
# SR
|
# SR
|
||||||
self.options_sr_Entry = ttk.Entry(master=self.options_Frame,
|
self.options_sr_Entry = ttk.Entry(master=self.options_Frame,
|
||||||
@@ -550,6 +557,9 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
# Model Folder
|
# Model Folder
|
||||||
self.options_modelFolder_Checkbutton.place(x=0, y=0, width=0, height=0,
|
self.options_modelFolder_Checkbutton.place(x=0, y=0, width=0, height=0,
|
||||||
relx=0, rely=7/self.COL1_ROWS, relwidth=1/3, relheight=1/self.COL1_ROWS)
|
relx=0, rely=7/self.COL1_ROWS, relwidth=1/3, relheight=1/self.COL1_ROWS)
|
||||||
|
# Manual Constants
|
||||||
|
self.options_manType_Checkbutton.place(x=0, y=0, width=0, height=0,
|
||||||
|
relx=0, rely=8/self.COL1_ROWS, relwidth=1/3, relheight=1/self.COL1_ROWS)
|
||||||
# -Column 2-
|
# -Column 2-
|
||||||
# SR
|
# SR
|
||||||
self.options_sr_Label.place(x=5, y=4, width=5, height=-8,
|
self.options_sr_Label.place(x=5, y=4, width=5, height=-8,
|
||||||
@@ -605,6 +615,8 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
lambda *args: self.decode_modelNames())
|
lambda *args: self.decode_modelNames())
|
||||||
self.stackedModel_var.trace_add('write',
|
self.stackedModel_var.trace_add('write',
|
||||||
lambda *args: self.decode_modelNames())
|
lambda *args: self.decode_modelNames())
|
||||||
|
self.manType_var.trace_add('write',
|
||||||
|
lambda *args: self.decode_modelNames())
|
||||||
# Model deselect
|
# Model deselect
|
||||||
self.aiModel_var.trace_add('write',
|
self.aiModel_var.trace_add('write',
|
||||||
lambda *args: self.deselect_models())
|
lambda *args: self.deselect_models())
|
||||||
@@ -776,7 +788,12 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
|
|
||||||
# Loop through each constant (key) and its widgets
|
# Loop through each constant (key) and its widgets
|
||||||
for key, (widget, var) in widgetsVars.items():
|
for key, (widget, var) in widgetsVars.items():
|
||||||
if stacked_selectable:
|
if self.manType_var.get():
|
||||||
|
if str(widget.cget('state')) != 'normal':
|
||||||
|
# Manual typing and widget not enabled
|
||||||
|
widget.configure(state=tk.NORMAL)
|
||||||
|
continue
|
||||||
|
elif stacked_selectable:
|
||||||
if instrumental_selectable:
|
if instrumental_selectable:
|
||||||
if (key in instrumental.keys() and
|
if (key in instrumental.keys() and
|
||||||
key in stacked.keys()):
|
key in stacked.keys()):
|
||||||
@@ -784,19 +801,17 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
widget.configure(state=tk.DISABLED)
|
widget.configure(state=tk.DISABLED)
|
||||||
var.set('%d/%d' % (instrumental[key], stacked[key]))
|
var.set('%d/%d' % (instrumental[key], stacked[key]))
|
||||||
continue
|
continue
|
||||||
else:
|
elif key in stacked.keys():
|
||||||
if key in stacked.keys():
|
# Only stacked selectable
|
||||||
# Only stacked selectable
|
|
||||||
widget.configure(state=tk.DISABLED)
|
|
||||||
var.set(stacked[key])
|
|
||||||
continue
|
|
||||||
else:
|
|
||||||
# Stacked model can not be selected
|
|
||||||
if (key in instrumental.keys() and
|
|
||||||
instrumental_selectable):
|
|
||||||
widget.configure(state=tk.DISABLED)
|
widget.configure(state=tk.DISABLED)
|
||||||
var.set(instrumental[key])
|
var.set(stacked[key])
|
||||||
continue
|
continue
|
||||||
|
elif (key in instrumental.keys() and
|
||||||
|
instrumental_selectable):
|
||||||
|
# Stacked model can not be selected
|
||||||
|
widget.configure(state=tk.DISABLED)
|
||||||
|
var.set(instrumental[key])
|
||||||
|
continue
|
||||||
|
|
||||||
# If widget is already enabled, no need to reset the value
|
# If widget is already enabled, no need to reset the value
|
||||||
if str(widget.cget('state')) != 'normal':
|
if str(widget.cget('state')) != 'normal':
|
||||||
@@ -993,6 +1008,7 @@ class MainWindow(TkinterDnD.Tk):
|
|||||||
'modelStackedLabel': self.stackedModel_var.get(),
|
'modelStackedLabel': self.stackedModel_var.get(),
|
||||||
'aiModel': self.aiModel_var.get(),
|
'aiModel': self.aiModel_var.get(),
|
||||||
'resType': self.resType_var.get(),
|
'resType': self.resType_var.get(),
|
||||||
|
'manType': self.manType_var.get(),
|
||||||
})
|
})
|
||||||
|
|
||||||
self.destroy()
|
self.destroy()
|
||||||
|
|||||||
Reference in New Issue
Block a user