diff --git a/Objet/__pycache__/ui.cpython-311.pyc b/Objet/__pycache__/ui.cpython-311.pyc index e3232c7ef51cdc8bc2cefe21d73785579693ed16..85483b74d7c90215b7d944e0ec46495fae475754 100644 Binary files a/Objet/__pycache__/ui.cpython-311.pyc and b/Objet/__pycache__/ui.cpython-311.pyc differ diff --git a/Objet/main.py b/Objet/main.py index 4b2704847e4c1d4792e2911579044ac53d25fd00..108f4c8f2f17b569a3cd858e194e0bfce1d47d0d 100644 --- a/Objet/main.py +++ b/Objet/main.py @@ -60,9 +60,9 @@ class Main: darken_factor = 0.5 self.display.frame = (self.display.frame * darken_factor).astype(np.uint8) - if self.ui.is_mouse_moving(): - self.display.draw_shape(self.ui.brightness) - self.display.draw_all_points(self.ui.brightness) + + self.display.draw_shape(self.ui.brightness) + self.display.draw_all_points(self.ui.brightness) self.display.draw_traj() self.display.display() diff --git a/Objet/ui.py b/Objet/ui.py index aad02a27cc04009437f670ea8d8a80eecad29acc..f79a3ae531720c067f1bac5c2643335c7a0c7c14 100644 --- a/Objet/ui.py +++ b/Objet/ui.py @@ -78,7 +78,7 @@ class UI: elif self.phase == 'mov': if self.point_near: self.last_mouse_move = time.time() - if time.time() - self.last_mouse_move >= 0.4: + if time.time() - self.last_mouse_move >= 1: self.phase = 'down' self.time_phase = time.time() self.brightness = 1 @@ -86,12 +86,10 @@ class UI: if time.time() - self.last_mouse_move <= 0.1: self.phase = 'mov' self.time_phase = time.time() - elif time.time() - self.time_phase <= 0.2: - self.brightness = 1 - (time.time() - self.time_phase)*5 - else: + self.brightness = 1 - (time.time() - self.time_phase)*5 + if time.time() - self.time_phase >= 0.2: self.phase = 'imm' self.brightness = 0 - print(self.phase, round(self.brightness, 3)) def get_brightness(self):