Add files via upload

Author: Akascape

tknodesystem/__init__.py

@@ -5,7 +5,7 @@
 License: MIT
 """
 
-__version__ = '0.6'
+__version__ = '0.7'
 
 from .node_types import NodeValue, NodeOperation, NodeCompile
 from .node_canvas import NodeCanvas

tknodesystem/node_canvas.py

@@ -36,17 +36,17 @@ def __init__(self, master, bg="grey10", width=500, height=500, wire_color="white
 
         if move:
             if sys.platform.startswith("darwin"):
-                self.tag_bind(self.grid, '<ButtonPress-3>', lambda e: self.getpos(e, 1))
-                self.tag_bind(self.grid, '<ButtonRelease-3>', lambda e: self.getpos(e, 0))
+                self.tag_bind(self.grid_bg, '<ButtonPress-3>', lambda e: self.getpos(e, 1))
+                self.tag_bind(self.grid_bg, '<ButtonRelease-3>', lambda e: self.getpos(e, 0))
             else:
-                self.tag_bind(self.grid, '<ButtonPress-2>', lambda e: self.getpos(e, 1))
-                self.tag_bind(self.grid, '<ButtonRelease-2>', lambda e: self.getpos(e, 0))
-            self.tag_bind(self.grid, "<B2-Motion>", self.move_grid)
+                self.tag_bind(self.grid_bg, '<ButtonPress-2>', lambda e: self.getpos(e, 1))
+                self.tag_bind(self.grid_bg, '<ButtonRelease-2>', lambda e: self.getpos(e, 0))
+            self.tag_bind(self.grid_bg, "<B2-Motion>", self.move_grid)
 
         if zoom:
             self.bind("<MouseWheel>", self.do_zoom)
-            self.tag_bind(self.grid, "<Button-4>", lambda e: self.do_zoom(e, 120))
-            self.tag_bind(self.grid, "<Button-5>", lambda e: self.do_zoom(e, -120))
+            self.tag_bind(self.grid_bg, "<Button-4>", lambda e: self.do_zoom(e, 120))
+            self.tag_bind(self.grid_bg, "<Button-5>", lambda e: self.do_zoom(e, -120))
 
     def set_grid_image(self, grid_image):
         """ set the grid image for the canvas """
@@ -64,10 +64,10 @@ def set_grid_image(self, grid_image):
 
         self.image = self.image.subsample(1,1)
         try:
-            self.delete(self.grid)
+            self.delete(self.grid_bg)
         except: None
-        self.grid = self.create_image(self.image.width()/2, self.image.height()/2, image = self.image)   
-        self.tag_lower(self.grid)
+        self.grid_bg = self.create_image(self.image.width()/2, self.image.height()/2, image = self.image)   
+        self.tag_lower(self.grid_bg)
 
     def getpos(self, event, cursor):
         """ get the mouse position and change cursor style """
@@ -83,7 +83,7 @@ def move_grid(self, event):
         """ move the contents of the canvas except the grid image """
 
         self.all_items = list(self.find_all())
-        self.all_items.pop(self.all_items.index(self.grid))
+        self.all_items.pop(self.all_items.index(self.grid_bg))
 
         for i in self.all_items:
             self.move(i, event.x-self.xy_set[0], event.y-self.xy_set[1])        
@@ -96,7 +96,7 @@ def do_zoom(self, event, delta=None):
         """ zoom in/out the canvas by changing the coordinates of all canvas items """
 
         self.all_items = list(self.find_all())
-        self.all_items.pop(self.all_items.index(self.grid))
+        self.all_items.pop(self.all_items.index(self.grid_bg))
 
         if not delta:
             delta = event.delta
@@ -133,7 +133,7 @@ def clear(self):
         """ clear the canvas except the grid image """
 
         self.all_items = list(self.find_all())
-        self.all_items.pop(self.all_items.index(self.grid))
+        self.all_items.pop(self.all_items.index(self.grid_bg))
 
         for i in self.all_items:
             self.delete(i)

tknodesystem/node_socket.py

@@ -73,7 +73,7 @@ def connect_wire(self):
         self.wireID = self.canvas.create_line(self.x1, self.y1, self.x2, self.y2, dash=self.canvas.dash,
                                               width=self.canvas.wire_width, fill=self.canvas.wire_color)
         self.canvas.tag_lower(self.wireID)
-        self.canvas.tag_lower(self.canvas.grid)
+        self.canvas.tag_lower(self.canvas.grid_bg)
         self.canvas.tag_bind(self.ID, "<ButtonPress>", lambda e: self.mouse_move(), add="+")
         self.canvas.tag_bind(self.wireID, "<Button-1>", lambda e: self.delete_wire(), add="+")
         if self.canvas.connect_wire: self.mouse_move()

tknodesystem/node_wire.py

@@ -48,7 +48,7 @@ def create(self):
         self.ID = self.canvas.create_line(self.x1, self.y1, self.x2, self.y2, dash=self.dash, width=self.wire_width,
                                           activefill=self.hover_color, fill=self.wire_color, activewidth=self.wire_width)
         self.canvas.tag_lower(self.ID)
-        self.canvas.tag_lower(self.canvas.grid)
+        self.canvas.tag_lower(self.canvas.grid_bg)
         self.inputs = self.canvas.IDc
         self.canvas.tag_bind(self.ID, "<Double-Button-1>", lambda e: self.delete_line(self.inputs))