From 575c80b972033028d817104654254521ebea0c16 Mon Sep 17 00:00:00 2001
From: jeje <jeremy.rioux@student-cs.fr>
Date: Wed, 12 Mar 2025 14:37:41 +0100
Subject: [PATCH] trajectoire pour Paul svp
---
.../gestion_clavier.cpython-311.pyc | Bin 1341 -> 1341 bytes
Objet/__pycache__/parameters.cpython-311.pyc | Bin 7615 -> 7615 bytes
Objet/__pycache__/ui.cpython-311.pyc | Bin 21240 -> 22281 bytes
Objet/parameters.py | 4 +--
Objet/ui.py | 31 +++++++++++++-----
5 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/Objet/__pycache__/gestion_clavier.cpython-311.pyc b/Objet/__pycache__/gestion_clavier.cpython-311.pyc
index 2ca9ead3ec6065097d9c5ada09bf14ebe9b235a1..eaade919f0cdd4c1a5940f4904e68c0949242617 100644
GIT binary patch
delta 19
ZcmdnXwU>))IWI340}wpm*vMtf3IH%01U~=(
delta 19
ZcmdnXwU>))IWI340}!OKZ{#v&1pqBN1H=FT
diff --git a/Objet/__pycache__/parameters.cpython-311.pyc b/Objet/__pycache__/parameters.cpython-311.pyc
index 8f49743d82bc9d6ff302d10b690c7442891f5810..54fc99c8041bc2f125d44304fa6dc4616d08d1ea 100644
GIT binary patch
delta 43
wcmdmQz2BO9IWI340}#0KoZrZ8!6V29WZ&W}&&*4SFN#kpdda>ygeO}N0QTAp8UO$Q
delta 43
wcmdmQz2BO9IWI340}$|kIJc48f=7@Y$iBr{o|%^tUlgBI^pb6J2v4>k0190U#{d8T
diff --git a/Objet/__pycache__/ui.cpython-311.pyc b/Objet/__pycache__/ui.cpython-311.pyc
index 5c5313efcff79b4537e56608588effa95da0c2bf..e884539f6ffa50148a0334d979e402cca22dce3e 100644
GIT binary patch
delta 3530
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
D$!YD{
delta 2888
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
F{{X314i5kT
diff --git a/Objet/parameters.py b/Objet/parameters.py
index 5d0c43b..dea29ba 100644
--- a/Objet/parameters.py
+++ b/Objet/parameters.py
@@ -19,8 +19,8 @@ class Parameters:
Point_param("ant_tl", self.width / 5, 2 * self.height / 5, (0, 0, 255)),
Point_param("wind_l_tl", self.width * 3 / 10, 2 * self.height / 5, (0, 255, 0)),
Point_param("wind_l_br", self.width * 4 / 10, self.height * 12 / 25, (0, 255, 0)),
- Point_param("wind_r_tl", self.width * 7 / 10, 2 * self.height / 5, (0, 255, 0)),
- Point_param("wind_r_br", self.width * 6 / 10, self.height * 12 / 25, (0, 255, 0)),
+ Point_param("wind_r_tl", self.width * 6 / 10, 2 * self.height / 5, (0, 255, 0)),
+ Point_param("wind_r_br", self.width * 7 / 10, self.height * 12 / 25, (0, 255, 0)),
Point_param("set_height", self.width/2, self.height / 4,(255, 255, 255)),
Point_param("set_margin_over", self.width/2, self.height * 3 / 16, (200, 200, 200)),
Point_param("set_margin_under", self.width/2, self.height * 5 / 16, (200, 200, 200))
diff --git a/Objet/ui.py b/Objet/ui.py
index 1438be3..2cd5596 100644
--- a/Objet/ui.py
+++ b/Objet/ui.py
@@ -95,17 +95,17 @@ class UI:
def update_user_info(self):
def get_point(name):
return self.param.get_point(name)
- self.set_heigth = (get_point("net").y - get_point("set_height").y) / (get_point("ant_bl").y - get_point("ant_tl").y)
- self.set_margin_over = (get_point("set_height").y - get_point("set_margin_over").y) / (get_point("ant_bl").y - get_point("ant_tl").y)
- self.set_margin_under = (get_point("set_margin_under").y - get_point("set_height").y) / (get_point("ant_bl").y - get_point("ant_tl").y)
+ self.set_height = (get_point("net").y - get_point("set_height").y) / (get_point("net").y - get_point("ant_tl").y)
+ self.set_margin_over = (get_point("net").y - get_point("set_margin_over").y) / (get_point("net").y - get_point("ant_tl").y)
+ self.set_margin_under = (get_point("net").y - get_point("set_margin_under").y) / (get_point("net").y - get_point("ant_tl").y)
self.wind_l_l = (get_point("wind_l_tl").x - get_point("ant_tl").x) / (get_point("ant_tr").x - get_point("ant_tl").x)
self.wind_l_r = (get_point("wind_l_tr").x - get_point("ant_tl").x) / (get_point("ant_tr").x - get_point("ant_tl").x)
- self.wind_l_t = (get_point("net").y - get_point("wind_l_tl").y) / (get_point("ant_bl").y - get_point("ant_tl").y)
- self.wind_l_b = (get_point("net").y - get_point("wind_l_bl").y) / (get_point("ant_bl").y - get_point("ant_tl").y)
+ self.wind_l_t = (get_point("net").y - get_point("wind_l_tl").y) / (get_point("net").y - get_point("ant_tl").y)
+ self.wind_l_b = (get_point("net").y - get_point("wind_l_bl").y) / (get_point("net").y - get_point("ant_tl").y)
self.wind_r_l = (get_point("ant_tr").x - get_point("wind_r_tl").x) / (get_point("ant_tr").x - get_point("ant_tl").x)
self.wind_r_r = (get_point("ant_tr").x - get_point("wind_r_tr").x) / (get_point("ant_tr").x - get_point("ant_tl").x)
- self.wind_r_t = (get_point("net").y - get_point("wind_r_tr").y) / (get_point("ant_br").y - get_point("ant_tr").y)
- self.wind_r_b = (get_point("net").y - get_point("wind_r_br").y) / (get_point("ant_br").y - get_point("ant_tr").y)
+ self.wind_r_t = (get_point("net").y - get_point("wind_r_tr").y) / (get_point("net").y - get_point("ant_tr").y)
+ self.wind_r_b = (get_point("net").y - get_point("wind_r_br").y) / (get_point("net").y - get_point("ant_tr").y)
def actu_para(self):
def get_point(name):
@@ -300,11 +300,26 @@ class UI:
valid_to_right("bar_point_right")
update_x()
else:
+ net = get_point("net")
+ ant_height = net.y - get_point("ant_tl").y
if name == "ant_tl":
valid_to_down("ant_bl")
valid_to_right("ant_tr")
update_y()
- get_point("set_height").y = get_point(name).y - self.set_heigth * (get_point("ant_bl").y - get_point("ant_tl").y)
+ get_point("set_height").y = net.y - self.set_height * ant_height
+ get_point("set_margin_over").y = net.y - self.set_margin_over * ant_height
+ get_point("set_margin_under").y = net.y - self.set_margin_under * ant_height
+ get_point("wind_l_tl").y = net.y - self.wind_l_t * ant_height
+ get_point("wind_l_bl").y = net.y - self.wind_l_b * ant_height
+ get_point("wind_l_tr").y = net.y - self.wind_l_t * ant_height
+ get_point("wind_l_br").y = net.y - self.wind_l_b * ant_height
+ update_center("wind_l_m", "wind_l_tl", "wind_l_br")
+ get_point("wind_r_tl").y = net.y - self.wind_r_t * ant_height
+ get_point("wind_r_bl").y = net.y - self.wind_r_b * ant_height
+ get_point("wind_r_tr").y = net.y - self.wind_r_t * ant_height
+ get_point("wind_r_br").y = net.y - self.wind_r_b * ant_height
+ update_center("wind_r_m", "wind_r_tl", "wind_r_br")
+
if __name__ == "__main__":
--
GitLab