Changeset 01c3cce in flowtimer

Timestamp:

08/25/24 23:56:18 (9 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

406938d

Parents:

d310de3

Message:

remove debug code

Files:

• flowtimer/RecurringPhaseSequence.py (modified) (2 diffs)
• flowtimer/main.py (modified) (6 diffs)
• tests/test_schedule.py (modified) (1 diff)

flowtimer/RecurringPhaseSequence.py

@@ -92 +92 @@
             return
         else:
-            print("Sequence finished")
             if self.passes_left == 0:
                 self.abort()
@@ -117 +116 @@
 
     def tick(self, ticks):
-        print("Before tick")
-        print(self.current_phase)
-        print("Tick:", ticks)
         if not self.completed():
             result = self.current_phase.tick(ticks)
-            print("Result", result, "\n")
             if self.current_phase.completed():
-                print(self.current_phase.title, "Phase Completed")
                 self.advance_to_next_phase()
-                print("Advanced to", self.current_phase, "\n")
                 result = self.tick(abs(result))
                 return
-        if self.completed():
-            self.advance_to_next_phase()
-        print("Passes left:", self.passes_left)
+#        if self.completed():
+#            self.advance_to_next_phase()
 
     def unrolled(self):

flowtimer/main.py

@@ -59 +59 @@
         self.label_start.pack(side='left', fill='both', expand=True)
 
-        self.label_sequence = tk.Label(self.center_frame)
+        self.label_sequence = tk.Label(self.center_frame, bg='red')
         self.label_sequence.pack(side='top', fill='both', expand=True)
 
@@ -67 +67 @@
         self.progressbar["maximum"] = 59
         self.progressbar.pack(side='top')
-
-        self.label_duration = tk.Label(self.center_frame)
+        self.label_duration = tk.Label(self.center_frame, bg='green')
         self.label_duration.pack(side='top', fill='both', expand=True)
 
@@ -107 +106 @@
     def current_config(self):
         if self.schedule.current_block.is_sequence():
-            return f"{self.schedule.current_block.title} / {self.schedule.current_block.current_phase.title} / {self.schedule.current_block.current_phase_number()+1} of {len(self.schedule.current_block.phase_list)} ({self.schedule.current_block.passes_left})"
+            return f"{self.schedule.current_block.title} / {self.schedule.current_block.current_phase.title} / {self.schedule.current_block.current_phase_number()+1} of {len(self.schedule.current_block.phases)} ({self.schedule.current_block.passes_left})"
 
     def current_time_status(self):
@@ -117 +116 @@
     def tick(self):
 
-        if self.schedule.paused():
+        if not self.schedule.running():
             return
         self.label_start.pack_forget()
         current_process = self.after(1000, self.tick)
         if self.schedule.state == 'initial':
-            self.label_sequence.config(self.start_color(root))
             self.label_sequence.config(text=("\n" + str(self.schedule.current_block.title) + "..."))
-            self.label_duration.config(self.start_color(root))
             self.label_duration.config(text=self.current_time_status())
             self.schedule.start()
@@ -134 +131 @@
                                              self.schedule.current_block.ticks_left) % 60
                 self.progressbar.update()
-                self.label_sequence.configure(self.start_color(root))
-                self.center_frame.config(bg=self.start_color(root))
-                self.label_sequence.config(bg=self.random_color(self.label_sequence))
-                self.label_duration.config(self.random_color(root))
-                self.label_duration.config(text=self.current_time_status(), bg=self.random_color(self.label_duration))
-                self.label_config_text.config(text=self.current_config(), fg='blue', font="Times 48")
+                self.label_duration.config(text=self.current_time_status())
+                self.label_config_text.config(text=self.current_config())
             else:
-                self.label_sequence.configure(self.time_out_color(root))
                 self.label_sequence.config(text=("\n" + "\nTime over !"), bg="red", fg="white")
                 self.label_duration.config(text="", bg="red", fg="white")
@@ -179 +171 @@
         self.parent.destroy()
 
-    def random_color(self, widget):
-        # FIXME: Do not hardcode this
-        if self.schedule.current_block.title == "Huddle":
-            widget.configure(bg="blue")
-            self.label_sequence.config(text=("\n" + "Besprechung"))
-            self.center_frame.configure(bg="blue")
-        if self.schedule.current_block.title == "Tasking":
-            widget.configure(bg="green")
-            self.label_sequence.config(text=("\n" + "Intensivphase"))
-            self.center_frame.configure(bg="green")
-        if self.schedule.current_block.title == "Work":
-            widget.configure(bg="gold")
-            self.label_sequence.config(text=("\n" + "Synchronisation"))
-            self.center_frame.configure(bg="gold")
-            self.label_sequence.configure(fg="blue")
-            self.label_duration.configure(fg="blue")
-
-    def start_color(self, widget):
-        self.label_sequence.configure(fg="white", font="times 72")
-        self.label_duration.configure(fg="white", font="times 72")
-        self.center_frame.configure(bg="blue")
-        widget.configure(bg="blue")
-
-    def time_out_color(self, widget):
-        widget.configure(bg="red")
-
     def change_config(self, json_string):
         self.schedule = Schedule.from_json(json_string)

tests/test_schedule.py

@@ -74 +74 @@
         schedule.tick(phase1.initial_ticks)  # Complete phase1
         schedule.tick(sequence.initial_ticks)  # Complete sequence
-        print(schedule.current_block)
         assert schedule.completed() is True
         assert schedule.state == "completed"