Changeset 8fb44c2 in flowtimer

Timestamp:

08/22/24 00:02:57 (9 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

59f6e9a

Parents:

1fd7029

Message:

compute progress value from initial_ticks and ticks left

File:

• flowtimer/main.py (modified) (8 diffs)

flowtimer/main.py

@@ -6 +6 @@
 from PIL import Image, ImageTk
 from pathlib import Path
-import math
 import datetime
 
@@ -28 +27 @@
         self.photo = ImageTk.PhotoImage(file=Path(__file__).parent /
                                         'resources' / 'flowtimer_startbg_new.png')
-        print(self.schedule.current_phase)
+        print(self.schedule.current_phase.title)
         self.show_config = self.schedule.current_phase.title
         self.config_state = 'default'
-        print(self.schedule)
 
         self.build_gui()
@@ -77 +75 @@
                                            style="orange.Horizontal.TProgressbar",
                                            orient="horizontal", length=600, mode="determinate")
+        self.progressbar["maximum"] = 59
         self.progressbar.pack(side='top')
 
@@ -104 +103 @@
         self.label_start.pack_forget()
         current_process = self.after(1000, self.tick)
-        self.currentValue = self.currentValue + 1
-
         if self.schedule.state == 'initial':
             self.label_sequence.config(self.start_color(root))
@@ -111 +108 @@
             self.label_duration.config(self.start_color(root))
             self.label_duration.config(text=("noch " +
-                                             str(self.schedule.current_phase.time_left) +
+                                             str(self.schedule.current_phase.ticks_left // 60) +
                                              " Min\n"))
             self.schedule.start()
@@ -117 +114 @@
         else:
             if self.schedule.running():
+                self.schedule.tick(1)
+                self.progressbar["value"] = (self.schedule.current_phase.initial_ticks -
+                                             self.schedule.current_phase.ticks_left) % 60
                 self.progressbar.update()
                 self.label_sequence.configure(self.start_color(root))
@@ -123 +123 @@
                 self.label_duration.config(self.random_color(root))
                 self.label_duration.config(text=("noch " +
-                                                 str(math.ceil(self.schedule.current_phase.time_left))
+                                                 str(self.schedule.current_phase.ticks_left // 60)
                                                  + " Min\n"), bg=self.random_color(self.label_duration))
-                self.label_config_text.config(text=(self.schedule.current_phase.current_phase_number+1,
-                                                    "/", self.schedule.current_phase.current_phase_number),
+                self.label_config_text.config(text=(self.schedule.current_phase.current_phase_number()+1,
+                                                    "/", self.schedule.current_phase.current_phase_number()),
                                               fg='blue',font="Times 48")
 
@@ -196 +196 @@
     def progress(self, currentValue):
         self.progressbar["value"] = self.currentValue
-        self.progressbar["maximum"] = 60
-        if self.currentValue == 60:
-            self.currentValue = 0
 
     def change_config(self):