Refactored Color class. Matplotlib color scheme was incorrectly ident…

…ified as tk previously
manna · Jun 18, 2016 · f2e6f3f · f2e6f3f
1 parent 9ce5e4a
commit f2e6f3f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/datk/core/colorizer.py b/datk/core/colorizer.py
@@ -11,17 +11,17 @@ class Color(Enum):
     def toQt(self):
         return self.value
 
-    def toTk(self):
-        tk = {
+    def toMpl(self):
+        mpl = {
             'red': 'r',
             'blue': 'b',
             'green': 'g',
             'black': 'k',
             'yellow': 'y'
         }
-        return tk[self.value]
+        return mpl[self.value]
 
-    def toRealTk(self):
+    def toTk(self):
         return self.value
 
 def Colorizer(algorithm, network, algorithm_type):

diff --git a/datk/core/distalgs.py b/datk/core/distalgs.py
@@ -255,12 +255,12 @@ def setup(network):
             network.setup_canvas(new_fig=new_fig)
 
         def e_draw(network, edge, color=Color.black):
-            color = color.toTk()
+            color = color.toMpl()
             (start_x, start_y), (end_x, end_y) = edge
             network.ax.plot((start_x, end_x), (start_y, end_y), color)
 
         def v_draw(network, vertex, color=Color.black):
-            color = color.toTk()+'o'
+            color = color.toMpl()+'o'
             x,y = vertex
             network.ax.plot( [x], [y], color)
 

diff --git a/datk/core/simulator_mpl.py b/datk/core/simulator_mpl.py
@@ -29,12 +29,12 @@ def setup(network):
             self.setup_fig()
 
         def e_draw(network, edge, color=Color.black):
-            color = color.toTk()
+            color = color.toMpl()
             start, end = edge
             self.ax.plot( (start[0], end[0]), (start[1], end[1]), color)
 
         def v_draw(network, vertex, color=Color.black):
-            color = color.toTk()+'o'
+            color = color.toMpl()+'o'
             x,y = vertex
             self.ax.plot( [x], [y], color)
 

diff --git a/datk/core/simulator_tk.py b/datk/core/simulator_tk.py
@@ -47,7 +47,7 @@ def scale(v):
 
         def v_draw(network, vertex, color=Color.black, radius=5):
             x,y = scale(vertex)
-            color = color.toRealTk()
+            color = color.toTk()
             self.create_oval(
                 x-radius,
                 y-radius,
@@ -61,7 +61,7 @@ def e_draw(network, edge, color=Color.black):
             start, end = scale(start), scale(end)
             x1,y1 = start
             x2,y2 = end
-            color = color.toRealTk()
+            color = color.toTk()
             self.create_line(x1, y1, x2, y2, fill=color)
 
         self.delete(ALL)