From bbb8be6655cd37646be8b964d5941b6ec2f817e5 Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Wed, 4 Dec 2019 09:28:16 -0800
Subject: [PATCH] shape configuration, replace tunntel tool image

---
 coretk/coretk/data/icons/tunnel.png           | Bin 0 -> 2256 bytes
 .../data/{icons => oldicons}/tunnel.gif       | Bin
 coretk/coretk/dialogs/shapemod.py             |  31 ++++++++----------
 coretk/coretk/graph.py                        |   8 ++++-
 coretk/coretk/nodedelete.py                   |   2 +-
 coretk/coretk/shape.py                        |   7 +++-
 6 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 coretk/coretk/data/icons/tunnel.png
 rename coretk/coretk/data/{icons => oldicons}/tunnel.gif (100%)

diff --git a/coretk/coretk/data/icons/tunnel.png b/coretk/coretk/data/icons/tunnel.png
new file mode 100644
index 0000000000000000000000000000000000000000..2871b74f01e8f4080a3a88e30cabaed82a182b3a
GIT binary patch
literal 2256
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

literal 0
HcmV?d00001

diff --git a/coretk/coretk/data/icons/tunnel.gif b/coretk/coretk/data/oldicons/tunnel.gif
similarity index 100%
rename from coretk/coretk/data/icons/tunnel.gif
rename to coretk/coretk/data/oldicons/tunnel.gif
diff --git a/coretk/coretk/dialogs/shapemod.py b/coretk/coretk/dialogs/shapemod.py
index c00a9649..005ad000 100644
--- a/coretk/coretk/dialogs/shapemod.py
+++ b/coretk/coretk/dialogs/shapemod.py
@@ -26,24 +26,8 @@ class ShapeDialog(Dialog):
         self.bold = tk.IntVar(value=data.bold)
         self.italic = tk.IntVar(value=data.italic)
         self.underline = tk.IntVar(value=data.underline)
-
-        # else:
-        #     self.fill_color = self.canvas.itemcget(self.id, "fill")
-        #     self.shape_text = tk.StringVar(value="")
-        #     self.font = tk.StringVar(value="Arial")
-        #     self.font_size = tk.IntVar(value=12)
-        #     self.text_color = "#000000"
-        #     # self.fill_color = "#CFCFFF"
-        #     self.border_color = "black"
-        #     self.border_width = tk.IntVar(value=0)
-        #     self.bold = tk.IntVar(value=0)
-        #     self.italic = tk.IntVar(value=0)
-        #     self.underline = tk.IntVar(value=0)
-        #     print(self.fill_color)
-
         self.fill = None
         self.border = None
-
         self.top.columnconfigure(0, weight=1)
         self.draw()
 
@@ -91,7 +75,7 @@ class ShapeDialog(Dialog):
         frame.columnconfigure(2, weight=1)
         label = ttk.Label(frame, text="Fill color")
         label.grid(row=0, column=0, sticky="nsew")
-        self.fill = ttk.Label(frame, text=self.fill_color, background="#CFCFFF")
+        self.fill = ttk.Label(frame, text=self.fill_color, background=self.fill_color)
         self.fill.grid(row=0, column=1, sticky="nsew", padx=3)
         button = ttk.Button(frame, text="Color", command=self.choose_fill_color)
         button.grid(row=0, column=2, sticky="nsew")
@@ -173,7 +157,7 @@ class ShapeDialog(Dialog):
         if self.underline.get() == 1:
             f.append("underline")
         if shape.text_id is None:
-            shape.text = self.canvas.create_text(
+            shape.text_id = self.canvas.create_text(
                 text_x, text_y, text=shape_text, fill=self.text_color, font=f
             )
             self.canvas.shapes[self.id].created = True
@@ -181,4 +165,15 @@ class ShapeDialog(Dialog):
             self.canvas.itemconfig(
                 shape.text_id, text=shape_text, fill=self.text_color, font=f
             )
+        data = self.canvas.shapes[self.id].shape_data
+        data.text = shape_text
+        data.font = self.font.get()
+        data.font_size = int(self.font_size.get())
+        data.text_color = self.text_color
+        data.fill_color = self.fill_color
+        data.border_color = self.border_color
+        data.border_width = int(self.border_width.get())
+        data.bold = self.bold.get()
+        data.italic = self.italic.get()
+        data.underline = self.underline.get()
         self.destroy()
diff --git a/coretk/coretk/graph.py b/coretk/coretk/graph.py
index 7389be52..6f75e78c 100644
--- a/coretk/coretk/graph.py
+++ b/coretk/coretk/graph.py
@@ -361,6 +361,9 @@ class CanvasGraph(tk.Canvas):
         :return: nothing
         """
         logging.debug(f"click press: {event}")
+        self.delete(self.find_withtag("selectednodes"))
+        self.canvas_management.selected.clear()
+
         selected = self.get_selected(event)
         is_node = selected in self.find_withtag("node")
         if self.mode == GraphMode.EDGE and is_node:
@@ -447,7 +450,7 @@ class CanvasGraph(tk.Canvas):
         selected = self.get_selected(event)
         if selected is not None and "shape" in self.gettags(selected):
             s = ShapeDialog(self.app, self.app, self.shapes[selected])
-            print(s)
+            s.show()
 
     def add_node(self, x, y):
         if self.selected is None or "shape" in self.gettags(self.selected):
@@ -763,6 +766,9 @@ class CanvasNode:
             return
         x, y = self.canvas.canvas_xy(event)
         self.move(x, y)
+        # for nid, bboxid in self.canvas.canvas_management.selected.items():
+        #     if nid in self.canvas.nodes:
+        #         self.canvas.nodes[nid].motion(event)
 
     def select_multiple(self, event):
         self.canvas.canvas_management.node_select(self, True)
diff --git a/coretk/coretk/nodedelete.py b/coretk/coretk/nodedelete.py
index 8ea1500e..e30415c6 100644
--- a/coretk/coretk/nodedelete.py
+++ b/coretk/coretk/nodedelete.py
@@ -87,7 +87,7 @@ class CanvasComponentManagement:
         for shape_id in self.selected:
             if "shape" in self.canvas.gettags(shape_id):
                 bbox_id = self.selected[node_id]
-                self.canvas.delete(shape_id)
+                self.canvas.shapes[shape_id].delete()
                 self.canvas.delete(bbox_id)
                 self.canvas.shapes.pop(shape_id)
 
diff --git a/coretk/coretk/shape.py b/coretk/coretk/shape.py
index 2bb7b516..d60beaef 100644
--- a/coretk/coretk/shape.py
+++ b/coretk/coretk/shape.py
@@ -46,7 +46,6 @@ class Shape:
                 top_x, top_y, top_x, top_y, tags="shape", dash="-"
             )
         self.canvas.tag_bind(self.id, "<ButtonRelease-1>", self.click_release)
-        # self.canvas.tag_bind(self.id, "<B1-Motion>", self.motion)
 
     def shape_motion(self, x1, y1):
         self.canvas.coords(self.id, self.x0, self.y0, x1, y1)
@@ -69,5 +68,11 @@ class Shape:
             self.id, x0 + delta_x, y0 + delta_y, x1 + delta_x, y1 + delta_y
         )
         self.canvas.canvas_management.node_drag(self, delta_x, delta_y)
+        if self.text_id is not None:
+            self.canvas.move(self.text_id, delta_x, delta_y)
         self.cursor_x = event.x
         self.cursor_y = event.y
+
+    def delete(self):
+        self.canvas.delete(self.id)
+        self.canvas.delete(self.text_id)