Skip to content

Commit

Permalink
Improved Settings class for GUI mode
Browse files Browse the repository at this point in the history
  • Loading branch information
nikkonrom committed Dec 1, 2017
1 parent 48b439b commit c8d4a6e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
1 change: 0 additions & 1 deletion face_recognition_.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
class FaceRecognition(Operation):
@staticmethod
def execute(input_image, settings):
settings = namedtuple("settings", settings.keys())(*settings.values())
colors = settings.face_settings[0]
width = settings.face_settings[1]
img = np.array(input_image)
Expand Down
3 changes: 0 additions & 3 deletions imager.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ def export_settings(self):
messagebox.exec_()





if __name__ == "__main__":
parser = createParser()
namespace = parser.parse_args()
Expand Down
15 changes: 14 additions & 1 deletion serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ def default(self, o):
return o.__dict__

class Settings(object):
boundaries_settings = None
segmentation_settings = None
saliency_settings = None
face_settings = None

def __init__(self, dict):
self.boundaries_settings = dict.get('boundaries_settings')
self.segmentation_settings = dict.get('segmentation_settings')
self.saliency_settings = dict.get('saliency_settings')
self.face_settings = dict.get('face_settings')

def __init__(self, boundaries_settings, segmentation_settings, saliency_settings, face_settngs):
self.boundaries_settings = boundaries_settings
self.segmentation_settings = segmentation_settings
Expand All @@ -21,5 +32,7 @@ def serialize(settings):

def deserialize():
filename = 'settings.json'
return json.load(fp=open(filename, mode='r'))
dict = json.load(fp=open(filename, mode='r'))
settings = Settings(dict)
return settings

2 changes: 1 addition & 1 deletion settings.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"boundaries_settings": [1], "segmentation_settings": [], "saliency_settings": [], "face_settings": [[255, 0, 0], 3]}
{"boundaries_settings": [1], "segmentation_settings": [], "saliency_settings": [], "face_settings": [[255, 0, 0], 0]}

0 comments on commit c8d4a6e

Please sign in to comment.