diff --git a/Objet/__pycache__/gestion_clavier.cpython-311.pyc b/Objet/__pycache__/gestion_clavier.cpython-311.pyc
index 2ca9ead3ec6065097d9c5ada09bf14ebe9b235a1..eaade919f0cdd4c1a5940f4904e68c0949242617 100644
Binary files a/Objet/__pycache__/gestion_clavier.cpython-311.pyc and b/Objet/__pycache__/gestion_clavier.cpython-311.pyc differ
diff --git a/Objet/__pycache__/parameters.cpython-311.pyc b/Objet/__pycache__/parameters.cpython-311.pyc
index 8f49743d82bc9d6ff302d10b690c7442891f5810..54fc99c8041bc2f125d44304fa6dc4616d08d1ea 100644
Binary files a/Objet/__pycache__/parameters.cpython-311.pyc and b/Objet/__pycache__/parameters.cpython-311.pyc differ
diff --git a/Objet/__pycache__/ui.cpython-311.pyc b/Objet/__pycache__/ui.cpython-311.pyc
index 5c5313efcff79b4537e56608588effa95da0c2bf..e884539f6ffa50148a0334d979e402cca22dce3e 100644
Binary files a/Objet/__pycache__/ui.cpython-311.pyc and b/Objet/__pycache__/ui.cpython-311.pyc differ
diff --git a/Objet/parameters.py b/Objet/parameters.py
index 5d0c43bdcb61d8a77aa8c7b0e5eedfb13da2acdc..dea29ba671d6343cbb3a0a4b3b56ea8aaeacaeae 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 1438be3486572828c7ebc84a724e9c94779fccea..2cd559625fb45004f927d15c54029f2a24bdb066 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__":