From b63bcb0379ef563f58f8c1471deb1957d8c1d87b Mon Sep 17 00:00:00 2001
From: Martin Zietz <zietz@ksat-stuttgart.de>
Date: Wed, 20 Jan 2021 15:20:42 +0100
Subject: [PATCH] Basic GUI framework

---
 .gitignore                           |   1 +
 User_Interface.py                    |  45 ++++++++++++++++++++++-----
 __pycache__/cage_func.cpython-37.pyc | Bin 4056 -> 0 bytes
 __pycache__/globals.cpython-37.pyc   | Bin 196 -> 0 bytes
 globals.py                           |   2 +-
 main.py                              |   3 +-
 6 files changed, 40 insertions(+), 11 deletions(-)
 delete mode 100644 __pycache__/cage_func.cpython-37.pyc
 delete mode 100644 __pycache__/globals.cpython-37.pyc

diff --git a/.gitignore b/.gitignore
index 6609df1..51044e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@ ENV/
 
 # VScode
 .vscode/
+*.pyc
diff --git a/User_Interface.py b/User_Interface.py
index 79426a2..d95d3f1 100644
--- a/User_Interface.py
+++ b/User_Interface.py
@@ -1,11 +1,41 @@
 from tkinter import *
 
 
-class EmptyFrame:
+class HelmholtzGUI(Tk):
 
-    def __init__(self, window):
-        frame = Frame(window, width=1000, height=600)
-        frame.pack()
+    def __init__(self):
+        Tk.__init__(self)
+
+        self.Menu = TopMenu(self)  # displays menu bar at the top
+
+        mainArea = Frame(self)
+        mainArea.pack(fill="both", expand=True)
+
+        # mainArea.grid_rowconfigure(0, weight=1)
+        # mainArea.grid_columnconfigure(0, weight=1)
+
+        self.frames = {}  # dictionary for storing all pages
+
+        frame = EmptyFrame(mainArea)
+
+        self.frames[EmptyFrame] = frame
+
+        # frame.grid(row=0, column=0, sticky="nsew")
+
+        self.show_frame(EmptyFrame)
+
+    def show_frame(self, key):
+        frame = self.frames[key]  # gets correct page from the dictionary
+        frame.tkraise()  # brings this frame to the front
+
+
+class EmptyFrame(Frame):
+
+    def __init__(self, parent):
+        Frame.__init__(self, parent)
+
+        frame = Frame(parent, width=1000, height=600)
+        frame.pack(padx=50, pady=50)
 
         one = Label(frame, text="One", bg="red")
         one.pack(fill=X)
@@ -21,8 +51,7 @@ class TopMenu:
 
         ModeSelector = Menu(menu)
         menu.add_cascade(label="Mode", menu=ModeSelector)
-        ModeSelector.add_command(label="Full Manual", command=self.manual_mode(window))
+        ModeSelector.add_command(label="Full Manual", command=self.manual_mode)
 
-    def manual_mode(self, window):
-        print("Switching to manual mode")
-        window.delete(ALL)
+    def manual_mode(self):
+        print("Switching to manual mode")
\ No newline at end of file
diff --git a/__pycache__/cage_func.cpython-37.pyc b/__pycache__/cage_func.cpython-37.pyc
deleted file mode 100644
index f1aaeae70ca7c063982edd88d5ba17664faa1f9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4056
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

diff --git a/__pycache__/globals.cpython-37.pyc b/__pycache__/globals.cpython-37.pyc
deleted file mode 100644
index 18c683c11c6b4f3006357e76a9b27b6d69b511cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 196
zcmZ?b<>g`kf<-*<<L5ClFgylvV1OCOZ~)?BJ|L08kiwY4l+GN*kis0ypvm$QsG8v=
z6Nmt*^V4LE;tF#0ag2-)@bn8_$xy@s6a^E%yj`qfd=raGGV@}BOG;BROLJqK5|cAh
zbMlK4i;_|^OJW@Jic3;UQ;SOT(t#?|^HNLFQgc#DQj1H9OA_-^V$yT+lM-`^^$IF)
UaoFVMr<CTT+KB?qF9u=;038-HY5)KL

diff --git a/globals.py b/globals.py
index 7181e66..2846827 100644
--- a/globals.py
+++ b/globals.py
@@ -18,5 +18,5 @@ global MAX_VOLTS
 
 global ARDUINO
 
-RELAY_PINS = [1, 2, 3]  # digital pin on the Arduino for switching relay of each axis [x,y,z]
+RELAY_PINS = [15, 16, 17]  # pin on the Arduino for switching relay of each axis [x,y,z]
 
diff --git a/main.py b/main.py
index 20169d0..3aea811 100644
--- a/main.py
+++ b/main.py
@@ -24,8 +24,7 @@ g.Z_PORT = "COM2"
 # Code starts here------------------------------------------
 g.MAX_AMPS = np.sqrt(g.MAX_WATTS / g.RESISTANCES)  # calculate maximum currents in each axis
 
-mainWindow = Tk()
-MainFrame = ui.EmptyFrame(mainWindow)
+mainWindow = ui.HelmholtzGUI()
 Menu = ui.TopMenu(mainWindow)
 
 mainWindow.mainloop()