From af72289ee52f716688de0b7507e657678c61e759 Mon Sep 17 00:00:00 2001
From: LSaldyt <lucassaldyt@gmail.com>
Date: Wed, 1 Nov 2017 10:41:39 -0700
Subject: [PATCH] Improves descriptor log

---
 copycat/gui/gui.py             | 5 ++++-
 copycat/gui/workspacecanvas.py | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/copycat/gui/gui.py b/copycat/gui/gui.py
index 576ece1..d1d38fd 100644
--- a/copycat/gui/gui.py
+++ b/copycat/gui/gui.py
@@ -55,7 +55,9 @@ class MainApplication(GridFrame):
         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, formatter= lambda s : '{}: {}'.format(s.name, round(s.urgency, 2)))
-        self.objectList.update(objects, formatter=lambda s : '{}'.format(', '.join(map(str, s.descriptions))))
+        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:
@@ -64,6 +66,7 @@ class MainApplication(GridFrame):
                     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)
diff --git a/copycat/gui/workspacecanvas.py b/copycat/gui/workspacecanvas.py
index af134c8..843e0b0 100644
--- a/copycat/gui/workspacecanvas.py
+++ b/copycat/gui/workspacecanvas.py
@@ -3,7 +3,7 @@ import tkinter.ttk as ttk
 
 from .gridframe import GridFrame
 
-font1Size = 16
+font1Size = 32
 font1 = ('Helvetica', font1Size)
 
 class WorkspaceCanvas(GridFrame):
@@ -11,6 +11,8 @@ class WorkspaceCanvas(GridFrame):
     def __init__(self, parent, *args, **kwargs):
         GridFrame.__init__(self, parent, *args, **kwargs)
 
+        self.chars    = []
+
         self.initial  = ''
         self.modified = ''
         self.target   = ''
@@ -20,6 +22,7 @@ class WorkspaceCanvas(GridFrame):
 
         self.canvas = tk.Canvas(self, background='black')
         self.add(self.canvas, 0, 0)
+
         GridFrame.configure(self)
 
     def update(self, copycat):
@@ -29,6 +32,7 @@ class WorkspaceCanvas(GridFrame):
 
         if self.changed:
             self.canvas.delete('all')
+            del self.chars[:]
             self.add_text()
 
     def add_text(self):
@@ -40,6 +44,7 @@ class WorkspaceCanvas(GridFrame):
                 if sequence is None:
                     sequence = ''
                 for char in sequence:
+                    self.chars.append((char, (x, y)))
                     self.canvas.create_text(x, y, text=char, anchor=tk.NW, font=font1, fill='white')
                     x += font1Size
             return x, y