From 80b6e49581f30e566cfbb003d0033903cb65e763 Mon Sep 17 00:00:00 2001
From: LSaldyt <lucassaldyt@gmail.com>
Date: Thu, 26 Oct 2017 12:52:58 -0700
Subject: [PATCH] WIP

---
 copycat/gui/entry.py     |  1 +
 copycat/gui/gridframe.py |  4 ++--
 copycat/gui/gui.py       | 39 +++++++++++++--------------------------
 copycat/gui/list.py      |  2 +-
 copycat/gui/primary.py   |  9 +++++----
 5 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/copycat/gui/entry.py b/copycat/gui/entry.py
index 7b4a17c..e4112a8 100644
--- a/copycat/gui/entry.py
+++ b/copycat/gui/entry.py
@@ -24,3 +24,4 @@ class Entry(GridFrame):
 
         self.add(self.cLabel, 2, 0)
         self.add(self.c, 2, 1)
+        GridFrame.configure(self)
diff --git a/copycat/gui/gridframe.py b/copycat/gui/gridframe.py
index 45db07d..e083b42 100644
--- a/copycat/gui/gridframe.py
+++ b/copycat/gui/gridframe.py
@@ -7,5 +7,5 @@ class GridFrame(tk.Frame):
 
     def add(self, element, x, y, xspan=1, yspan=1):
         element.grid(column=x, row=y, columnspan=xspan, rowspan=yspan, sticky=tk.N+tk.E+tk.S+tk.W)
-        self.rowconfigure(x, weight=1)
-        self.columnconfigure(y, weight=1)
+        tk.Grid.rowconfigure(self, x, weight=1)
+        tk.Grid.columnconfigure(self, y, weight=1)
diff --git a/copycat/gui/gui.py b/copycat/gui/gui.py
index 1341ae2..7b599bf 100755
--- a/copycat/gui/gui.py
+++ b/copycat/gui/gui.py
@@ -18,15 +18,6 @@ from .style import configure_style
 
 from .plot import plot_imbedded
 
-font1Size = 32
-font2Size = 12
-font1 = ('Helvetica', str(font1Size)) 
-font2 = ('Helvetica', str(font2Size))
-
-style = dict(background='black', 
-             foreground='white',  
-             font=font2)
-
 plt.style.use('dark_background')
 
 class MainApplication(GridFrame):
@@ -36,33 +27,29 @@ class MainApplication(GridFrame):
 
         self.parent = parent
         self.primary = Primary(self, *args, **kwargs)
-        self.add(self.primary, 0, 0, )
+        self.add(self.primary, 0, 0, xspan=2)
         self.create_widgets()
         GridFrame.configure(self)
         
-        self.messages = []
+        #self.messages = []
 
-    def log(self, message):
-        self.messages.append(message)
+    #def log(self, message):
+    #    self.messages.append(message)
 
     def create_widgets(self):
-
-        self.slipList = List(self, 10, **style)
+        self.slipList = List(self, 10)
         self.add(self.slipList, 0, 1)
 
-        self.codeletList = List(self, 10, **style)
+        self.codeletList = List(self, 10)
         self.add(self.codeletList, 1, 1)
 
-        self.objectList = List(self, 10, **style)
+        self.objectList = List(self, 10)
         self.add(self.objectList, 2, 1)
 
-        self.logBox = List(self, 10, **style)
-        self.add(self.logBox, 1, 0)
+        #self.logBox = List(self, 10)
+        #self.add(self.logBox, 1, 0)
 
         self.graph2 = Plot(self, 'Answer Distribution')
-        #self.graph2 = Status()
-        #sframe2 = StatusFrame(self, self.graph2, 'graph 2')
-        #self.add(sframe2, 2, 0)
         self.add(self.graph2, 2, 0)
 
     def update(self, copycat):
@@ -72,11 +59,11 @@ class MainApplication(GridFrame):
         codelets  = copycat.coderack.codelets
         objects   = copycat.workspace.objects
 
-        self.slipList.update(slipnodes, key=lambda s:s.activation, reverse=True,
+        self.slipList.update(slipnodes, key=lambda s:s.activation, 
                 formatter=lambda s : '{}: {}'.format(s.name, round(s.activation, 2)))
-        self.codeletList.update(codelets, key=lambda c:c.urgency, reverse=True, formatter= lambda s : '{}: {}'.format(s.name, round(s.urgency, 2)))
-        self.objectList.update(objects)
-        self.logBox.update(list(reversed(self.messages))[:10])
+        self.codeletList.update(codelets, key=lambda c:c.urgency, formatter= lambda s : '{}: {}'.format(s.name, round(s.urgency, 2)))
+        self.objectList.update(objects, formatter=lambda s : '{}'.format(str(s.descriptions)))
+        #self.logBox.update(list(reversed(self.messages))[:10])
 
     def reset_with_strings(self, initial, modified, target):
         self.primary.reset_with_strings(initial, modified, target)
diff --git a/copycat/gui/list.py b/copycat/gui/list.py
index 0c6ffb0..7768efd 100644
--- a/copycat/gui/list.py
+++ b/copycat/gui/list.py
@@ -7,7 +7,7 @@ from .gridframe import GridFrame
 
 class List(GridFrame):
 
-    def __init__(self, parent, columns, updateInterval=.1, **style):
+    def __init__(self, parent, columns, updateInterval=.1):
         GridFrame.__init__(self, parent)
         self.text = ttk.Label(self, anchor='w', justify=tk.LEFT, width=30)
         self.add(self.text, 0, 0)
diff --git a/copycat/gui/primary.py b/copycat/gui/primary.py
index d552b2a..2e8d094 100644
--- a/copycat/gui/primary.py
+++ b/copycat/gui/primary.py
@@ -41,8 +41,8 @@ def create_main_canvas(root, initial, final, new, guess):
 
     add_sequences([new, guess], x, y)
 
-    canvas['height'] = str(int(canvas['height']) + padding)
-    canvas['width']  = str(int(canvas['width'])  + padding)
+    #canvas['height'] = str(int(canvas['height']) + padding)
+    #canvas['width']  = str(int(canvas['width'])  + padding)
 
     return canvas
 
@@ -59,11 +59,12 @@ class Primary(GridFrame):
         self.add(self.canvas, 0, 0, xspan=2)
         self.control = Control(self)
         self.add(self.control, 0, 2)
+        GridFrame.configure(self)
 
     def update(self, copycat):
         answer = '' if copycat.workspace.rule is None else copycat.workspace.rule.buildTranslatedRule()
-        self.canvas = create_main_canvas(self, self.initial, self.modified, self.target, answer)
-        self.add(self.canvas, 0, 0, xspan=2)
+        #self.canvas = create_main_canvas(self, self.initial, self.modified, self.target, answer)
+        #self.add(self.canvas, 0, 0, xspan=2)
 
     def reset_with_strings(self, initial, modified, target):
         self.initial  = initial