OSSForks/faceswap
1
0
Fork 0
mirror of https://github.com/zebrajr/faceswap.git synced 2025-12-06 00:20:09 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI - Configs - Handle "None" options correctly

Browse Source
This commit is contained in:
torzdf 2020-08-20 12:17:03 +01:00
parent 0a25dff896
commit ebf84c59e9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/config.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3
""" Default configurations for faceswap
Extends out configparser funcionality by checking for default config updates
and returning data in it's correct format """
""" Default configurations for faceswap.
Extends out :class:`configparser.ConfigParser` functionality by checking for default
configuration updates and returning data in it's correct format """
import logging
import os
@ -65,8 +65,8 @@ class FaceswapConfig():
@property
def config_dict(self):
""" Collate global options and requested section into a dictionary
with the correct datatypes """
""" Collate global options and requested section into a dictionary with the correct
data types """
conf = dict()
for sect in ("global", self.section):
if sect not in self.config.sections():
@ -134,10 +134,10 @@ class FaceswapConfig():
is_radio is to indicate to the GUI that it should display Radio Buttons rather than
combo boxes for multiple choice options.
The 'fixed' parameter is only for training configs. Training configurations
The 'fixed' parameter is only for training configurations. Training configurations
are set when the model is created, and then reloaded from the state file.
Marking an item as fixed=False indicates that this value can be changed for
existing models, and will overide the value saved in the state file with the
existing models, and will override the value saved in the state file with the
updated value in config.
The 'Group' parameter allows you to assign the config item to a group in the GUI

4
lib/gui/popup_configure.py
View File

@ -102,12 +102,14 @@ class _ConfigurePlugins(tk.Toplevel):
if key == "helptext":
self._plugin_info[section] = val
continue
initial_value = self._config.config_dict[key]
initial_value = "none" if initial_value is None else initial_value
conf[category][section][key] = ControlPanelOption(
title=key,
dtype=val["type"],
group=val["group"],
default=val["default"],
initial_value=self._config.config_dict.get(key, val["default"]),
initial_value=initial_value,
choices=val["choices"],
is_radio=val["gui_radio"],
rounding=val["rounding"],