From 25841db648deed155ebb637a21dd6a6c7091eb2b Mon Sep 17 00:00:00 2001 From: LSaldyt Date: Fri, 3 Nov 2017 12:56:44 -0700 Subject: [PATCH] Fixes graph updates --- .gitignore | 1 + copycat/gui/control.py | 3 +++ copycat/gui/gui.py | 12 ++---------- copycat/gui/primary.py | 1 + 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index aba1538..fc96e13 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ pip-log.txt .*.swp output +copycat.log diff --git a/copycat/gui/control.py b/copycat/gui/control.py index 04dc43d..e74023d 100644 --- a/copycat/gui/control.py +++ b/copycat/gui/control.py @@ -54,3 +54,6 @@ class Control(GridFrame): def get_vars(self): return self.entry.a.get(), self.entry.b.get(), self.entry.c.get() + + def reset(self): + self.go = False diff --git a/copycat/gui/gui.py b/copycat/gui/gui.py index d1d38fd..2cd42cc 100644 --- a/copycat/gui/gui.py +++ b/copycat/gui/gui.py @@ -57,16 +57,6 @@ class MainApplication(GridFrame): self.codeletList.update(codelets, key=lambda c:c.urgency, formatter= lambda s : '{}: {}'.format(s.name, round(s.urgency, 2))) get_descriptors = lambda s : ', '.join('({}={})'.format(d.descriptionType.name, d.descriptor.name) for d in s.descriptions) self.objectList.update(objects, formatter=lambda s : '{}: {}'.format(s, get_descriptors(s))) - ''' - if len(objects) > 0: - print('Descriptions:') - for obj in objects: - print(obj) - for description in obj.descriptions: - print(' {}:'.format(description)) - print(' {}'.format(description.descriptionType.name)) - print(' {}'.format(description.descriptor.name)) - ''' def reset_with_strings(self, initial, modified, target): self.primary.reset_with_strings(initial, modified, target) @@ -84,6 +74,8 @@ class GUI(object): def add_answers(self, answers): def modifier(status): + print('Here') + print(answers) with plt.style.context(('dark_background')): plot_imbedded(answers, status) self.app.graph2.status.modifier = modifier diff --git a/copycat/gui/primary.py b/copycat/gui/primary.py index ee55532..03011eb 100644 --- a/copycat/gui/primary.py +++ b/copycat/gui/primary.py @@ -27,3 +27,4 @@ class Primary(GridFrame): def reset_with_strings(self, initial, modified, target): self.canvas.reset_with_strings(initial, modified, target) + self.control.reset()