Merge pull request devarshi16#3 from devarshi16/dev

Create Rectangle Feature

Author: devarshi16

.draw_rect.py.swp

@@ -1,9 +1,11 @@
+#WINDOW DIMENSIONS
 INIT_WIDTH = 1366
 INIT_HEIGHT = 768
 TOP_FRAME_HEIGHT = 20
 BOTTOM_FRAME_HEIGHT = INIT_HEIGHT - TOP_FRAME_HEIGHT
 BUTTON_WIDTH = 20
-RADIUS = 5
+
+#TOOL MODIFIABLES
 SUPPORTED_FORMATS = ["jpg","png","jpeg","JPEG","tiff"]
 TYPE_CHOICES = ["None", 
     "Printed Key", "Written Key", 
@@ -17,6 +19,25 @@
 LOGGING = True
 DEBUGGING = True
 ALLOWED_DEBUG_LEVEL = 3
+
+#POINTS DIMENSIONS
+RADIUS = 5
 SMALL_RADIUS = 1
 BIG_RADIUS = 5
 
+#BUTTON POSITIONS
+OPEN_FOLDER_ROW,OPEN_FOLDER_COL = 0,0
+PREV_ROW,PREV_COL = 1,0
+NEXT_ROW,NEXT_COL = 1,1
+SAVE_ROW,SAVE_COL = 2,0
+DEL_SELECTED_ROW,DEL_SELECTED_COL = 3,0
+DROP_DOWN_ROW,DROP_DOWN_COL = 4,0
+SAVE_TYPE_ROW,SAVE_TYPE_COL = 4,1
+DESELECT_ALL_ROW,DESELECT_ALL_COL = 5,0
+SELECT_ALL_ROW, SELECT_ALL_COL = 6,0
+DRAW_POLY_ROW, DRAW_POLY_COL = 7,0
+DRAW_RECT_ROW, DRAW_RECT_COL = 8,0
+DELETE_ALL_ROW, DELETE_ALL_COL = 9,0
+SHOW_TYPE_ROW,SHOW_TYPE_COL = 10,0
+HIDE_TYPE_ROW,HIDE_TYPE_COL = 10,1
+

config.py

@@ -11,6 +11,7 @@ def __init__(self,root,canvas,img_on_cnv,radius = 4):
        self.img_on_cnv = img_on_cnv
        self.points = []
        self.pt_coords = []
+       self.polygon = None
        self.radius = SMALL_RADIUS
        self.canvas.update()       
        self.canvas.bind('<ButtonRelease-1>',self.draw_point)
@@ -52,3 +53,11 @@ def chkup_rmb_point(self,event):
         self.canvas.delete(pt)
         self.points.pop(index_pt)
         self.pt_coords.pop(index_pt)
+
+    def delete_self(self):
+        #self.canvas.delete(self.polygon)
+        for pt in self.points:
+            self.canvas.delete(pt)
+        self.pt_coords = []
+        self.polygon = None
+        self.canvas.update()

draw_poly.py

@@ -0,0 +1,76 @@
+from tkinter import Tk,Canvas
+import tkinter as tk
+from config import *
+from log_debug import *
+import os
+
+class DrawRect():
+    def __init__(self,root,canvas,img_on_cnv,radius = 4):
+        self.root = root
+        self.canvas = canvas
+        self.img_on_cnv = img_on_cnv
+        self.points = []
+        self.pt_coords = []
+        self.radius = SMALL_RADIUS
+        self.polygon = None
+        self.canvas.update()       
+        self.canvas.bind("<ButtonPress-1>",self.lmb_down)
+        self.canvas.bind("<ButtonRelease-1>",self.lmb_up)
+
+    def lmb_down(self,event):
+        x,y = event.x,event.y
+        
+        self.create_point(x,y)
+        self.create_point(x,y)
+        self.create_point(x,y)
+        self.create_point(x,y)
+        self.polygon = self.canvas.create_polygon(
+            *self.flatten(),
+            outline = 'blue',
+            fill = '',
+            tag = 'Rect')
+        self.canvas.bind('<Motion>',self.mouse_motion)
+        
+    def mouse_motion(self,event):
+        x,y = event.x, event.y
+        self.update_point(self.points[3],x,self.pt_coords[0][1])
+        self.update_point(self.points[1],self.pt_coords[0][0],y)        
+        self.update_point(self.points[2],x,y)
+        self.canvas.coords(self.polygon,*self.flatten())
+        self.canvas.update()
+
+    def lmb_up(self,event):
+        self.canvas.unbind('<Motion>')
+        self.canvas.unbind('<ButtonRelease-1>')
+        self.canvas.unbind('<ButtonPress-1>')
+
+    def flatten(self):
+        l = self.pt_coords[:]
+        return [item for sublist in l for item in sublist]
+
+    def create_point(self,x,y):
+        self.pt_coords.append([x,y])
+        self.points.append(
+            self.canvas.create_oval(
+                x-self.radius,y-self.radius,
+                x+self.radius,y+self.radius,
+                fill = "green",
+                tag = "Point"
+                )
+            )
+
+    def update_point(self,point_id,x,y):
+        self.canvas.coords(
+            point_id,
+            x-self.radius,y-self.radius,
+            x+self.radius,y+self.radius
+        )
+        self.pt_coords[self.points.index(point_id)] = [x,y]
+
+    def delete_self(self):
+        self.canvas.delete(self.polygon)
+        for pt in self.points:
+            self.canvas.delete(pt)
+        self.pt_coords = []
+        self.polygon = None
+        self.canvas.update()

draw_rect.py

@@ -9,6 +9,7 @@
 import os
 from canvas import ImageOnCanvas
 from draw_poly import DrawPoly
+from draw_rect import DrawRect
 from PIL import Image,ImageTk
 from log_debug import logger,debug
 
@@ -32,51 +33,58 @@ def __init__(self):
         self.bottom_frame = Frame(self.root,width = INIT_WIDTH - BUTTON_WIDTH)
 
         self.load_image_directory_button = Button(self.top_frame1,text = 'Open Folder',command=self.load_directory,width = int(BUTTON_WIDTH), style ="Bold.TButton")
-        self.load_image_directory_button.grid(row = 0,columnspan = 2,sticky = tk.W+tk.E)
+        self.load_image_directory_button.grid(row = OPEN_FOLDER_ROW,columnspan = 2,sticky = tk.W+tk.E)
 
         self.prev_img_button = Button(self.top_frame1,text = '← Prev',command=self.previous_img,state = tk.DISABLED,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
-        self.prev_img_button.grid(row= 1, column = 0,sticky = tk.W+tk.E)
+        self.prev_img_button.grid(row= PREV_ROW, column = 0,sticky = tk.W+tk.E)
 
         self.next_img_button = Button(self.top_frame1,text = 'Next → ',command=self.next_img,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
-        self.next_img_button.grid(row=1,column=1,sticky = tk.W+tk.E)
+        self.next_img_button.grid(row=NEXT_COL,column=1,sticky = tk.W+tk.E)
 
         self.save_image_button = Button(self.top_frame1, text = 'Save ', command = self.saver,width = int(BUTTON_WIDTH), style ="Bold.TButton")
-        self.save_image_button.grid(row = 2, columnspan = 2,sticky = tk.W+tk.E)
+        self.save_image_button.grid(row = SAVE_ROW, columnspan = 2,sticky = tk.W+tk.E)
 
         self.delete_poly_button = Button(self.top_frame,text = 'Delete Selected',command = self.delete_selected,width = int(BUTTON_WIDTH), style ="Bold.TButton")
-        self.delete_poly_button.grid(row=0,columnspan =2,sticky = tk.W+tk.E)
+        self.delete_poly_button.grid(row=DEL_SELECTED_ROW,columnspan =2,sticky = tk.W+tk.E)
 
         self.type_choices = TYPE_CHOICES
         self.variable = StringVar(self.top_frame)
         self.variable.set(self.type_choices[0])
         self.type_options = OptionMenu(self.top_frame,self.variable,*self.type_choices,style ="Bold.TButton")
         self.type_options.config(width = int(BUTTON_WIDTH/2))
-        self.type_options.grid(row = 1,column = 0)
+        self.type_options.grid(row = DROP_DOWN_ROW,column = 0)
 
         self.save_type_button = Button(self.top_frame, text = 'Save Type', command = self.save_type,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
-        self.save_type_button.grid(row = 1, column = 1,sticky = tk.W+tk.E)
+        self.save_type_button.grid(row = SAVE_TYPE_ROW, column = 1,sticky = tk.W+tk.E)
 
         self.deselect_all_button = Button(self.top_frame,text = 'Deselect All',command = self.deselect_all,width = BUTTON_WIDTH, style ="Bold.TButton")
-        self.deselect_all_button.grid(row = 2,columnspan = 2,sticky = tk.W+tk.E)
+        self.deselect_all_button.grid(row = DESELECT_ALL_ROW,columnspan = 2,sticky = tk.W+tk.E)
 
         self.select_all_button = Button(self.top_frame,text = 'Select All', command = self.select_all, width = BUTTON_WIDTH, style ="Bold.TButton")
-        self.select_all_button.grid(row = 3,columnspan = 2,sticky = tk.W+tk.E)
+        self.select_all_button.grid(row = SELECT_ALL_ROW,columnspan = 2,sticky = tk.W+tk.E)
 
         self.draw_poly_button = Button(self.top_frame,text = 'Draw Poly',command = self.draw_poly_func,width = BUTTON_WIDTH, style ="Bold.TButton")
-        self.draw_poly_button.grid(row = 4,columnspan = 2,sticky = tk.W+tk.E)
+        self.draw_poly_button.grid(row = DRAW_POLY_ROW,columnspan = 2,sticky = tk.W+tk.E)
+
+        self.draw_rect_button = Button(self.top_frame,text = 'Draw Rectangle',command = self.draw_rect_func,width = BUTTON_WIDTH, style ="Bold.TButton")
+        self.draw_rect_button.grid(row = DRAW_RECT_ROW,columnspan = 2,sticky = tk.W+tk.E)
 
         self.delete_all_button = Button(self.top_frame,text = 'Delete All',command = self.delete_all,width = BUTTON_WIDTH, style ="Bold.TButton")
-        self.delete_all_button.grid(row = 5,columnspan = 2,sticky = tk.W+tk.E)   
+        self.delete_all_button.grid(row = DELETE_ALL_ROW,columnspan = 2,sticky = tk.W+tk.E)   
 
         self.save_poly_button = Button(self.top_frame,text = 'Save Poly',command = self.save_drawing,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
 
         self.discard_poly_button = Button(self.top_frame,text = 'Discard Poly',command = self.discard_drawing,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
 
+        self.save_rect_button = Button(self.top_frame,text = 'Save Rect',command = self.save_drawing,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
+
+        self.discard_rect_button = Button(self.top_frame,text = 'Discard Rect',command = self.discard_drawing,width = int(BUTTON_WIDTH/2), style ="Bold.TButton")
+
         self.show_type_button = Button(self.top_frame, text = 'Show Type', command = self.show_type, width = int(BUTTON_WIDTH/2), style = "Bold.TButton")
-        self.show_type_button.grid(row = 6, column =0, columnspan = 1, sticky = tk.W+tk.E)
+        self.show_type_button.grid(row = SHOW_TYPE_ROW, column =0, columnspan = 1, sticky = tk.W+tk.E)
 
         self.hide_type_button = Button(self.top_frame, text = 'Hide Type', command = self.hide_type, width = int(BUTTON_WIDTH/2), style = "Bold.TButton")
-        self.hide_type_button.grid(row = 6, columnspan = 1, column = 1, sticky = tk.W+tk.E)
+        self.hide_type_button.grid(row = HIDE_TYPE_ROW, columnspan = 1, column = 1, sticky = tk.W+tk.E)
 
         self.canvas = Canvas(self.bottom_frame,width = INIT_WIDTH - BUTTON_WIDTH, height = INIT_HEIGHT, borderwidth = 1)
         self.image_name = None
@@ -126,6 +134,8 @@ def show_buttons(self):
         self.delete_all_button.config(state = "normal")
         self.show_type_button.config(state = "normal")
         self.hide_type_button.config(state = "normal")
+        self.draw_poly_button.config(state = "normal")
+        self.draw_rect_button.config(state = "normal")
 
     def select_all(self):
         for poly in self.img_cnv.polygons:
@@ -167,12 +177,12 @@ def load_new_img(self):
         self.img_cnv = None
         path = os.path.join(self.image_dir, self.image_name)
         self.img_cnv = ImageOnCanvas(self.root,self.canvas,path)
-        logger("LOADING: "+self.img_cnv.image_path)
+        logger("LOADED: "+self.img_cnv.image_path)
 
     def load_directory(self):
         while True:
             selection = filedialog.askdirectory()
-            if selection == ():
+            if selection == () or selection == '':
                 return
             self.root.directory = selection
             self.image_dir = self.root.directory
@@ -246,11 +256,22 @@ def draw_poly_func(self):
         self.deselect_all()
         self.img_cnv.drawing_polygon = True
         self.draw_poly_button.grid_forget()
-        self.save_poly_button.grid(row = 4, column = 0,sticky = tk.W+tk.E)
-        self.discard_poly_button.grid(row = 4, column = 1,sticky = tk.W+tk.E)
+        self.save_poly_button.grid(row = DRAW_POLY_ROW, column = 0,sticky = tk.W+tk.E)
+        self.discard_poly_button.grid(row = DRAW_POLY_ROW, column = 1,sticky = tk.W+tk.E)
         self.hide_buttons()
+        self.draw_rect_button.config(state=tk.DISABLED)
         self.drawing_obj = DrawPoly(self.bottom_frame,self.canvas,self.img_cnv,RADIUS)
 
+    def draw_rect_func(self):
+        self.deselect_all()
+        self.img_cnv.drawing_polygon = True
+        self.draw_rect_button.grid_forget()
+        self.save_rect_button.grid(row = DRAW_RECT_ROW, column = 0,sticky = tk.W+tk.E)
+        self.discard_rect_button.grid(row = DRAW_RECT_ROW, column = 1,sticky = tk.W+tk.E)
+        self.hide_buttons()
+        self.draw_poly_button.config(state=tk.DISABLED)
+        self.drawing_obj = DrawRect(self.bottom_frame,self.canvas,self.img_cnv,RADIUS)
+
     def save_drawing(self):
         self.show_buttons()
         self.img_cnv.drawing_polygon = False
@@ -265,21 +286,33 @@ def save_drawing(self):
         self.img_cnv.add_poly(new_poly_pts)
         #self.img_cnv.bbs.append(new_poly_pts)
         #self.img_cnv.draw_bbs([self.img_cnv.bbs[-1]])
-        
+        #debug (1, str(type(self.drawing_obj))) 
+        if isinstance(self.drawing_obj,DrawRect):
+            self.save_rect_button.grid_forget()
+            self.discard_rect_button.grid_forget()
+            self.draw_rect_button.grid(row = DRAW_RECT_ROW, columnspan = 2, sticky = tk.W + tk.E)
+        elif isinstance(self.drawing_obj,DrawPoly):
+            self.save_poly_button.grid_forget()
+            self.discard_poly_button.grid_forget()
+            self.draw_poly_button.grid(row = DRAW_POLY_ROW, columnspan = 2, sticky = tk.W + tk.E)
+        self.drawing_obj.delete_self()        
         self.drawing_obj = None
-        self.save_poly_button.grid_forget()
-        self.discard_poly_button.grid_forget()
-        self.draw_poly_button.grid(row = 4,columnspan = 2,sticky = tk.W+tk.E)
 
     def discard_drawing(self):
         self.show_buttons()
         self.img_cnv.drawing_polygon = False
-        for pt in self.drawing_obj.points:
-            self.canvas.delete(pt)
+        #for pt in self.drawing_obj.points:
+        #    self.canvas.delete(pt)
+        self.drawing_obj.delete_self()
+        if isinstance(self.drawing_obj,DrawRect):
+            self.save_rect_button.grid_forget()
+            self.discard_rect_button.grid_forget()
+            self.draw_rect_button.grid(row = DRAW_RECT_ROW, columnspan = 2, sticky = tk.W + tk.E)
+        elif isinstance(self.drawing_obj,DrawPoly):
+            self.save_poly_button.grid_forget()
+            self.discard_poly_button.grid_forget()
+            self.draw_poly_button.grid(row = DRAW_POLY_ROW, columnspan = 2, sticky = tk.W + tk.E)
         self.drawing_obj = None
-        self.save_poly_button.grid_forget()
-        self.discard_poly_button.grid_forget()
-        self.draw_poly_button.grid(row = 4,columnspan = 2, sticky = tk.W+tk.E)
 
 
 gui = GUI()

gui.py

@@ -47,19 +47,19 @@
         {
             "poly_points": [
                 [
-                    1001,
+                    1000,
                     1307
                 ],
                 [
                     3017,
                     1328
                 ],
                 [
-                    2965,
-                    1146
+                    2979,
+                    1201
                 ],
                 [
-                    1001,
+                    1000,
                     1146
                 ]
             ],
@@ -69,20 +69,20 @@
         {
             "poly_points": [
                 [
-                    2644,
-                    2113
+                    2650,
+                    2133
                 ],
                 [
-                    3609,
-                    2113
+                    3620,
+                    2063
                 ],
                 [
-                    3609,
-                    1975
+                    3597,
+                    1963
                 ],
                 [
-                    2644,
-                    1975
+                    2620,
+                    2013
                 ]
             ],
             "id": "3",
@@ -113,20 +113,20 @@
         {
             "poly_points": [
                 [
-                    2367,
-                    1969
+                    2372,
+                    2009
                 ],
                 [
-                    3567,
-                    1969
+                    3570,
+                    1932
                 ],
                 [
                     3567,
                     1819
                 ],
                 [
-                    2367,
-                    1819
+                    2361,
+                    1870
                 ]
             ],
             "id": "5",
@@ -169,8 +169,8 @@
                     648
                 ],
                 [
-                    555,
-                    648
+                    560,
+                    610
                 ]
             ],
             "id": "7",