From 237bf6c2b90ca4f8b042b4da36a0e2fa5225005f Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 26 Feb 2022 12:28:53 +0100 Subject: [PATCH] vroom --- Car.py | 20 ++++++++++++++++++- test3.net.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++ test4.net.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ test6.rou.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++ test7.rou.xml | 33 +++++++++++++++++++++++++++++++ 5 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 test3.net.xml create mode 100644 test4.net.xml create mode 100644 test6.rou.xml create mode 100644 test7.rou.xml diff --git a/Car.py b/Car.py index 7841bfd..e8db4bb 100644 --- a/Car.py +++ b/Car.py @@ -1,5 +1,6 @@ import sumolib -from math import dist +from math import dist, ceil +from random import randint from PySide6.QtGui import QPainter from PySide6.QtCore import QPointF, Signal, QObject @@ -55,6 +56,8 @@ class Car(): self.b=20 self.vmax=0 + + self.vroom = 0 self.signals.updateDisp.emit(("Position",self.pos)) self.signals.updateDisp.emit(("Vitesse",self.v)) @@ -129,6 +132,18 @@ class Car(): def draw(self,painter): pt = QPointF(*self.pos) painter.drawEllipse(pt,3,3) + + if self.vroom != 0: + painter.save() + d=(60-self.vroom)*0.2 + painter.translate(pt + QPointF(0,d)) + painter.scale(1,-1) + font = painter.font(); + font.setPixelSize(ceil(self.vroom*0.2)); + painter.setFont(font) + painter.drawText(QPointF(0,0),"vroom") + self.vroom -= 1 + painter.restore() #painter.drawEllipse(pt,100,100) def conduite(self,vmax,leader,dt): @@ -181,3 +196,6 @@ class Car(): self.signals.updateDisp.emit(("Position", self.pos)) self.signals.updateDisp.emit(("Vitesse", self.v)) self.signals.updateDisp.emit(("Leader", self.leader if self.leader is None else f"{self.leader.id} @ {self.leaderDist:.2f}m")) + + if randint(0,100) == 0: + self.vroom = 60 diff --git a/test3.net.xml b/test3.net.xml new file mode 100644 index 0000000..d1d270f --- /dev/null +++ b/test3.net.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test4.net.xml b/test4.net.xml new file mode 100644 index 0000000..ebba782 --- /dev/null +++ b/test4.net.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test6.rou.xml b/test6.rou.xml new file mode 100644 index 0000000..cea4bda --- /dev/null +++ b/test6.rou.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + diff --git a/test7.rou.xml b/test7.rou.xml new file mode 100644 index 0000000..e311655 --- /dev/null +++ b/test7.rou.xml @@ -0,0 +1,33 @@ + + + + + + + + +