Merge branch 'master' of ssh://gitlab.justprojects.de:4724/hochschule/lern-tracking-system

raspberry-pi/gui/Popup.py

@@ -0,0 +1,33 @@
+import tkinter as tk
+import tkinter.messagebox
+import time
+import queue
+
+
+class CalibrationPopUp(tk.Frame):
+  def __init__(self, root, up_queue, down_queue,calibration_state):
+    self.root = root
+    self.calibration_state = calibration_state
+    self.down_queue = down_queue
+    self.up_queue = up_queue
+    tk.Frame.__init__(self, root)
+
+    self.csString = tk.StringVar()
+    self.instruction_string = tk.StringVar()
+    self.instruction_string.set("start Calibration!")
+    self.csString.set(self.calibration_state.state_clearname())
+    cs = tk.Label(self,textvariable=self.csString, anchor="c")
+    cs.pack(side="top", fill="both", expand=True)
+    dummy = tk.Label(self,text="dummy im a dummy", anchor="c")
+    dummy.pack(side="top", fill="both", expand=True)
+    instruction = tk.Label(self,textvariable=self.instruction_string, anchor="c")
+    instruction.pack(side="top", fill="both", expand=True)
+    button = tk.Button(self,text="OK", command=self.calibration_state.next_state_gui, anchor="c")
+    button.pack(side="top", fill="both", expand=True)
+  
+  def update(self):
+    self.csString.set(self.calibration_state.state_clearname())
+    if self.calibration_state.get_state() == self.calibration_state.WAITING_POS_1:
+        self.instruction_string.set("Move gondola to far left corner!")
+    if self.calibration_state.get_state() == self.calibration_state.WAITING_POS_2:
+        self.instruction_string.set("Move gondole to far right corner!")

raspberry-pi/gui/mainWindow.py

@@ -2,11 +2,13 @@ import tkinter as tk
 import time
 import queue
 
+import gui.Popup as Popup
 import gui.graph as Graph
 
 class MainWindow(tk.Frame):
   def __init__(self, root, up_queue, down_queue,calibration_state):
     self.root = root
+    self.popup = None
     self.calibration_state = calibration_state
     self.down_queue = down_queue
     self.up_queue = up_queue
@@ -22,12 +24,6 @@ class MainWindow(tk.Frame):
     l.pack(side="top", fill="both", expand=True)
     calibrate_button = tk.Button(self.controls,text="calibrate",command=self.calibrate)
     calibrate_button.pack(side="top")
-    calibrate_button_next = tk.Button(self.controls,text="calibrate_next",command=self.calibration_state.next_state_gui)
-    calibrate_button_next.pack(side="top")
-
-    self.csString = tk.StringVar()
-    cs = tk.Label(self.controls, textvariable=self.csString, anchor="c")
-    cs.pack(side="top", fill="both", expand=True)
 
   def update(self):
     ac_data = []
@@ -35,14 +31,20 @@ class MainWindow(tk.Frame):
       name, data = self.up_queue.get()
       if name == "ac_data":
         ac_data.append(data)
-
     self.graph.update([ac_data])
-    self.csString.set(self.calibration_state.state_clearname())
+
+    if self.popup:
+      self.popup.update()
     self.root.after(30, self.update)
 
   def calibrate(self):
     self.down_queue.put("calibrate")
-
+    pu_root = tk.Tk()
+    pu_root.title("Calibration")
+    self.popup = Popup.CalibrationPopUp(pu_root,self.up_queue,self.down_queue,self.calibration_state)
+    self.popup.pack(side="top", fill="both", expand=True)
+    
+    
 if __name__ == "__main__":
   root = tk.Tk()
   up_queue = queue.Queue()

raspberry-pi/main.py

@@ -44,6 +44,7 @@ class CalibrationStateMashine():
       print(self.state_clearname())
 
   def next_state_gui(self):
+    print("next_state_gui",self.state)
     if self.state == self.WAITING_POS_1 or self.state == self.WAITING_POS_2:
       self.next_state()