From 5f018b8627e4e497c502f2544e44d5dfddf11476 Mon Sep 17 00:00:00 2001
From: jeje <jeremy.rioux@student-cs.fr>
Date: Tue, 25 Mar 2025 11:10:12 +0100
Subject: [PATCH] mouvement souris fluide
---
Objet/__pycache__/ui.cpython-311.pyc | Bin 28401 -> 28295 bytes
Objet/main.py | 6 +++---
Objet/ui.py | 8 +++-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Objet/__pycache__/ui.cpython-311.pyc b/Objet/__pycache__/ui.cpython-311.pyc
index e3232c7ef51cdc8bc2cefe21d73785579693ed16..85483b74d7c90215b7d944e0ec46495fae475754 100644
GIT binary patch
delta 1924
zcmZ{k3rtgI6vz9ua(S(mme&}iJm)Ond@&U43J8=}wY+AGQ7hQmqNUYKE8??>PB25n
z9SjqO&VeuD3(I^!P~3bio6as<G&PuP$&w{Y7R<IRduHGHE-=9DCjH&hbN=Vt`<?H6
z_xT8E93j%vQfZKgUi;kNS~~iql>ubEr#hf00D>a}#RC$!64EonB&ra>T6u?H{3+MJ
zf}WkCjhM(Tlm8|$8vF*RR@@hKsi74l7Tlp)_&Zb&FDqt2hg|OO$7Bl7hbd=bmGPfC
z2yTR>i`5+b5vGESkPuiD9!=VzB3vhFGBiO)c$TD9)(XCGCA<F`z8cCRG%KH|Vo#>^
zWSm&iv*c1(f2=n#dpO>kkn2_DHsv)NMr5JQ4F`5K?|85BeWO>FdP(x7Y~dr>!Y45a
ztuxw!o+KpFn~c_#jmktb6CO$9M}tHmX;k6)EuvmbjGiq~oP;<$+mr?|Sq1l1dgAhg
z$KDi^y`Hb*y9qhuX-EwAkF3VUFQBNyKE%2CG<4XYGdYDEfqTjQ!JE;+BkEv(%DNOA
zHJNx_oFKMP$M(>-ie7hZHdQ&zMpvDgH`drUINCh&)XQ?^Cd{oJ&zg7yX2rrcx(J2E
z>@;q6)YzRpsI*hSuyzHk(H4?Za7ybU`$3tN5qJip2ZU%eG-PSHCiJ`mLs@T-Uic~N
zN-$duz98QS{n>@&Jp7gYw)7x%sKq=B9)?3XCFCMJ&ACfj;d-_ThL^s|UB;AmVNIC|
zN^=%WNoc1DN-*Wl<@!-{1diseR<Meav5M$!2md@RxeB_x-BYqV!JAh=1|TZ`OiUFO
zo+W$+-XuOhdsVG@zHnPW8~!YRF&TnLU3c(tEcgN91l-YOayQXD3AYN&u(9AJDTZm8
zd_l0cU@>=VT(CvRJu8IXEX?FS84szzU8IKFg|nuV|D`aK+<|#T$ESFGMH=oNCSIfu
zot8LOyRA5r`*gCzFy+zu5)Jp65N;_sruY!eZVF+!3+ZyTdINa?E&7M#8mw7X%zc59
zK{&t6q-4$Y<0q2%>lhnA+<-aDb;JwK<y}+ufDKL`BpUL_S70@CMShIx$-8tK9Tz}Z
zsw0nKeQB5C1w}7BEQ^5IWpg<nYH!nNFutfd2P#7x{8*;W7(o?lQ#x7>#1;x4S7mn^
zt8KjN-#<L>#PC)`J(QM5aof;r07rS$p6zH(I%W7bjG~g4qZvw}=J<JNS0m;lUPIt0
zu|ZHP*%{_r(9woCis(WNBiJ0=MT_kk+Z$HQCNfYb>t8R1S)b0K)rh!&@F4mSA0dRD
zK&umR7}1UxJB}+VG^E=D6*-E?|2g{bgLyW$o6r<Hw3Mh|(S{-QRjj}kG=vr#?`zbm
z!w+v<T%3FC(=-e*mQ><~VvBLlM9*2Tr}vPxydI0OzOxBqZGVKm1_W#UL$thz&k+wO
z)KcLE*!xV|nq4T`jR1``P|NQ?b0=aC!c9T93qPqs>+vOhK{yjubB)F7^aY|_U*j}c
z={ay%lgTbmhxMsMU5+WM5ZQ=4gcV^y<RX?L4#F{;l6((?wsKjtU(%>(0vd>^y+<11
zyV|6r$5iT*@Gd($20WY5H0t|3KvU~5xol=F{|x5X*UnqXk@=&d|K@Y%|9NtBD-7Dx
F{{hz$3@HEr
delta 1965
zcmZ{le@s(X6vul@`>2*ei&PY_c7Q)h7k@*PArvUT5fn)lH)4ggD%w8mr5y-nFgK$x
zjkrT}PEi@CIEgEJsL^R~>eOwSQgzF$Bf9<Pk|mlgOJ>Zrdu{>2xtI2n^UnF6bKg7n
z$J;(co(vJqagAo8j9uFLU)DY9)0C@7wp67mP^m+iGlczrS190&wp-Cg#BH!z_c0nN
z@Jv@6!;J7PvJIHcFMH@lIU3XfRgpL3;vtwbX=RAf9tv7rnp`Z0LG3JfHhn^P0~^t<
z+(@{17F?QCEEmI}Fe(muV#3U0OL`)BWe(<7jNI8L9%DnDgn_WBf?c*!W>SMEDkYR^
zn82ih-Y7$OK)H!li=Kdz)_6rbd=q6RUGQgAE@^=beFoVB@9N_ikLWAlZ+)t>En-Ng
zZ=bp+wmtSE&%q|YZjLYEwk~;4m;7UV!ckB6=FZ0MMqhcq%|FX}snS0)&mW)Hrf837
zi+DIKo*5IF4DW|jnjQ9?8#-njQFKT6bpDuycVia%Rg3Pb77dR4q_)X*a#AU&rV1g%
zEk(qY%1H&-48^2Q>NO0=$u`OPN*5t}ByEB^G}_KyiY{QN#r7JT=^}K9upr4y_QC3;
zel<mh2jPWj<~5NbGr4$;F(|Hv-R3D|uhe7yTo>&^Va<r-c|G^iMBy05Ho<|Voumhr
zrhCZ_kkXe3pQ8H%<~D#fBVB04+g(tekxY7_HRFt$KO&AwTcF62Pd<Zo%Qnq!<}k@A
z4+1>Mii51oxug$h<~8ymEVmfo^{g2}Kc=<Aylg!ft*?zs+Ru`Tgfl4E#{?CTykf|3
zMRf0nL)q!%91LZ@GcL0O)?4$)1@KvW$Xl=~Czgod%~?za;8aeRx)W1BL3BYyZmRGl
zn#bW_u3Lkl6NKgjgE4uFg)1XL2VBex3+A2-hVSO33SW(c4bW0(f;aPLjw`=2Kb2gE
z>-mSrdEEtR!q=GC#|C{Nak#d*Fje?=tfX|@(C&iC@K@nX;k%&3=P-b`xGuJyE@6%n
zO4^P7qYMG1Sm|;sWb5VoqEd1TW)$Bf=OIuO50jV87W^o?2tJ1%RxK-y<NY0zOuxYR
z1;iz|x-6I60d+~oxM|=kMuPJtR`LV<Q_>NA71d)W>I6D`AeH8ld+@aMC5m2DoP|@%
zEy7P|UK?Hw6TnttnL__l@f3<q!-f^srUz*9R;HlkM$|F{gi6t4t8&u1=QotTjp2I4
zW^}9SsztlaX>$c83|m!{Hek3B!$BuyRfd(+=Av6LJi6iJY{$(lizRj_Dx2QahOxbf
z1Bk<j%Lu+mZlJ}dlusJp7JSd}7V;kOR`IuML9q{U8X+OhB7&2FRtEwQ`w^`&1>-LG
ztt^ckm6BFwM*i<k-|CnxG_&KE?R1~xzUdsM<GP^(2)_2uGpkm~U^E(=hmV}g(7*Oo
zvK4+_Yik;9G;i?phEOk-;C;px2b;}T8Sm?D^kH*@eH=vV4&o-_7K2F>d;tDDqkRsR
zZ9-8qLU<4PKJ=}N4mSz>bPRUd4Zp6#%`U7@B2Ci#_4h+^%TZc^upq1m{A$r^L^dJ|
zfoqngAou|*poLJef9)eEbCzkRDU%<|Mqwc!Ij^%1N~0?=@g7qJLa0}Kq0UoPnybd{
gbvn}NL%8BvJ?{;H%zrF<IiGO<A7i5putH4v7rv|-j{pDw
diff --git a/Objet/main.py b/Objet/main.py
index 4b27048..108f4c8 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 aad02a2..f79a3ae 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):
--
GitLab