From 005c2d5597a0cbc08a9d17b5f679818c5266220e Mon Sep 17 00:00:00 2001 From: nnh12 Date: Sat, 10 Oct 2020 17:22:39 -0400 Subject: [PATCH 1/3] This is the code for the buttons panel. glease enter the commit message for your changes. Lines starting --- main_Window.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ rov-vision | 1 + 2 files changed, 49 insertions(+) create mode 100644 main_Window.py create mode 160000 rov-vision diff --git a/main_Window.py b/main_Window.py new file mode 100644 index 0000000..32e752a --- /dev/null +++ b/main_Window.py @@ -0,0 +1,48 @@ +from tkinter import* + +# creating button for autonomous mapping +window = Tk() +window.title("welcome") +window.geometry('600x600') +lbl = Label(window, text = "Autonomous Mapping") +lbl.grid(column=0, row=0) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=0) + +# creating button for non-autonomous mapping +lbl = Label(window, text = "Non-autonomous Mapping") +lbl.grid(column=0, row=2) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=2) + +# creating a button for Before coral photo +lbl = Label(window, text = "Before Coral Photo") +lbl.grid(column=0, row=3) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=3) + +# creating a button for After Coral Photo +lbl = Label(window, text = "After Coral Photo") +lbl.grid(column=0, row=4) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=4) + +# creating a button for Capture Subway Car +lbl = Label(window, text = "Capture Subway Car") +lbl.grid(column=0, row=5) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=5) + +# creating a button for Stitch Subway Car +lbl = Label(window, text = "Stitch Subway Car") +lbl.grid(column=0, row=6) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=6) + +# creating a button for Switch Camera +lbl = Label(window, text = "Switch Camera") +lbl.grid(column=0, row=7) +btn = Button(window, text='Click Me') +btn.grid(column=1, row=7) + +window.mainloop() \ No newline at end of file diff --git a/rov-vision b/rov-vision new file mode 160000 index 0000000..302409e --- /dev/null +++ b/rov-vision @@ -0,0 +1 @@ +Subproject commit 302409e7bc84dee4c157b48354d6b4c4d9112387 From 7070f6f65701304b328e8d34c55d60132a2f6341 Mon Sep 17 00:00:00 2001 From: nnh12 Date: Sun, 8 Nov 2020 15:12:50 -0500 Subject: [PATCH 2/3] This is the buttons panel with revisions --- main_Window.py | 111 +++++++++++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 46 deletions(-) diff --git a/main_Window.py b/main_Window.py index 32e752a..c33b140 100644 --- a/main_Window.py +++ b/main_Window.py @@ -1,48 +1,67 @@ from tkinter import* -# creating button for autonomous mapping -window = Tk() -window.title("welcome") -window.geometry('600x600') -lbl = Label(window, text = "Autonomous Mapping") -lbl.grid(column=0, row=0) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=0) - -# creating button for non-autonomous mapping -lbl = Label(window, text = "Non-autonomous Mapping") -lbl.grid(column=0, row=2) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=2) - -# creating a button for Before coral photo -lbl = Label(window, text = "Before Coral Photo") -lbl.grid(column=0, row=3) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=3) - -# creating a button for After Coral Photo -lbl = Label(window, text = "After Coral Photo") -lbl.grid(column=0, row=4) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=4) - -# creating a button for Capture Subway Car -lbl = Label(window, text = "Capture Subway Car") -lbl.grid(column=0, row=5) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=5) - -# creating a button for Stitch Subway Car -lbl = Label(window, text = "Stitch Subway Car") -lbl.grid(column=0, row=6) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=6) - -# creating a button for Switch Camera -lbl = Label(window, text = "Switch Camera") -lbl.grid(column=0, row=7) -btn = Button(window, text='Click Me') -btn.grid(column=1, row=7) - -window.mainloop() \ No newline at end of file +def run(stream): + + window = Tk() + window.title("welcome") + window.geometry('600x600') + window.configure(width =50,height = 50, bg='blue') + + #creating butoon for autonomous mapping + add_label(window, text = "Autonomous Mapping", bg = 'red', fg ='white', column =0, row =7) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg ='red', command = clicked, column=1, row=0 ) + + # creating button for non-autonomous mapping + add_label(window, text = "Non-autonomous Mapping", bg = 'white', fg ='red',column=0, row=2 ) + def clicked(): + pass + add_button(window, text='Click Me', bg = "red", fg = "white", command= clicked,column=1, row=2 ) + + # creating a button for Before coral photo + add_label(window, text = "Before Coral Photo", bg = 'red', fg ='white',column=0, row=3 ) + def clicked(): + pass + add_button( window, text='Click Me', bg = "white", fg = "red", command= clicked,column=1, row=3) + + # creating a button for After Coral Photo + add_label(window, text = "After Coral Photo", bg = 'white', fg ='red',column=0, row=4 ) + def clicked(): + pass + add_button(window, text='Click Me', bg= "red",fg = "white", command = clicked, column=1, row=4) + + # creating a button for Capture Subway Car + add_label(window, text = "Capture Subway Car", bg = 'red', fg ='white', column=0, row=5) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg = 'red', command= clicked, column=1, row=5) + + # creating a button for Stitch Subway Car + add_label(window, text = "Stitch Subway Car", bg = 'white', fg ='red', column=0, row=6) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'red', fg = 'white', command= clicked, column=1, row=6) + + # creating a button for Switch Camera + add_label(window, text = "Switch Camera", bg = 'red', fg ='white', column=0, row=7) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg ='red', command = clicked, column=1, row=7) + + window.mainloop() + +def add_button(window, text, bg, fg, command, column, row): + btn = Button(window, text, bg, fg, command) + btn.grid(column, row) +def add_label(window, text , bg , fg, row, column ): + lbl = Label(window, text , bg , fg ) + lbl.grid(row,column) + + + + + + + + From 16e1a2f0e98775f342544dbed0f1b0867eb2185c Mon Sep 17 00:00:00 2001 From: nnh12 Date: Thu, 17 Dec 2020 22:03:06 -0500 Subject: [PATCH 3/3] button panel --- vision/ui/main_window.py | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 vision/ui/main_window.py diff --git a/vision/ui/main_window.py b/vision/ui/main_window.py new file mode 100644 index 0000000..c33b140 --- /dev/null +++ b/vision/ui/main_window.py @@ -0,0 +1,67 @@ +from tkinter import* + +def run(stream): + + window = Tk() + window.title("welcome") + window.geometry('600x600') + window.configure(width =50,height = 50, bg='blue') + + #creating butoon for autonomous mapping + add_label(window, text = "Autonomous Mapping", bg = 'red', fg ='white', column =0, row =7) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg ='red', command = clicked, column=1, row=0 ) + + # creating button for non-autonomous mapping + add_label(window, text = "Non-autonomous Mapping", bg = 'white', fg ='red',column=0, row=2 ) + def clicked(): + pass + add_button(window, text='Click Me', bg = "red", fg = "white", command= clicked,column=1, row=2 ) + + # creating a button for Before coral photo + add_label(window, text = "Before Coral Photo", bg = 'red', fg ='white',column=0, row=3 ) + def clicked(): + pass + add_button( window, text='Click Me', bg = "white", fg = "red", command= clicked,column=1, row=3) + + # creating a button for After Coral Photo + add_label(window, text = "After Coral Photo", bg = 'white', fg ='red',column=0, row=4 ) + def clicked(): + pass + add_button(window, text='Click Me', bg= "red",fg = "white", command = clicked, column=1, row=4) + + # creating a button for Capture Subway Car + add_label(window, text = "Capture Subway Car", bg = 'red', fg ='white', column=0, row=5) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg = 'red', command= clicked, column=1, row=5) + + # creating a button for Stitch Subway Car + add_label(window, text = "Stitch Subway Car", bg = 'white', fg ='red', column=0, row=6) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'red', fg = 'white', command= clicked, column=1, row=6) + + # creating a button for Switch Camera + add_label(window, text = "Switch Camera", bg = 'red', fg ='white', column=0, row=7) + def clicked(): + pass + add_button(window, text='Click Me', bg = 'white', fg ='red', command = clicked, column=1, row=7) + + window.mainloop() + +def add_button(window, text, bg, fg, command, column, row): + btn = Button(window, text, bg, fg, command) + btn.grid(column, row) +def add_label(window, text , bg , fg, row, column ): + lbl = Label(window, text , bg , fg ) + lbl.grid(row,column) + + + + + + + +