leo/IRESTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixé qqus bugs

Browse Source
This commit is contained in:
leo 2022-02-07 18:28:37 +01:00
parent bde77c760d
commit 631dac180f
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Car.py
View File

@ -7,13 +7,15 @@ class Car:
startEdge=self.map.getEdge(self.route[self.index]) startEdge=self.map.getEdge(self.route[self.index])
nextEdge=self.map.getEdge(self.route[self.index+1]) nextEdge=self.map.getEdge(self.route[self.index+1])
inverted=not (startEdge.getToNode()==nextEdge.getFromNode() or startEdge.getToNode()==nextEdge.getToNode) inverted=not (startEdge.getToNode()==nextEdge.getFromNode() or startEdge.getToNode()==nextEdge.getToNode())
laneId=0 if inverted else 1 laneId=0 if not inverted else 1
self.laneShape=startEdge.getLane(laneId).getShape() self.laneShape=startEdge.getLane(laneId).getShape()
if(inverted): if(inverted):
self.laneShape.reverse() self.laneShape.reverse()
print(f"{self.id} : {startEdge.getID()} -> {nextEdge.getID()} via {laneId}")
def __init__(self,carID,route,parentMap,surface): def __init__(self,carID,route,parentMap,surface):
self.id=carID self.id=carID
self.route=route self.route=route

12
Map.py
View File

@ -13,7 +13,11 @@ class Map:
def fromPath(self,path): def fromPath(self,path):
self.net = sumolib.net.readNet(path,withInternal=True) self.net = sumolib.net.readNet(path,withInternal=True)
def draw(self,screen): def text(self,text,pos,font):
img = font.render(text,True,(255,255,255))
self.surf.blit(img,pos)
def draw(self,screen,debug=False,font=None):
for edge in self.net.getEdges(): for edge in self.net.getEdges():
color=(255,255,255) color=(255,255,255)
if(edge.getFunction()=="internal"): if(edge.getFunction()=="internal"):
@ -23,6 +27,10 @@ class Map:
pts=map(self.convertPos,pts) pts=map(self.convertPos,pts)
pg.draw.lines(self.surf,color,False,list(pts)) pg.draw.lines(self.surf,color,False,list(pts))
if(debug):
for node in self.net.getNodes():
self.text(node.getID(),self.convertPos(node.getCoord()),font)
screen.blit(self.surf,(0,0)) screen.blit(self.surf,(0,0))
def getEdge(self,edgeID): def getEdge(self,edgeID):
@ -42,4 +50,4 @@ class Map:
x=pos[0]*scale-bounds[0] x=pos[0]*scale-bounds[0]
y=pos[1]*scale-bounds[1] y=pos[1]*scale-bounds[1]
return (x,y) return (x,self.surf.get_height()-y)

4
main.py
View File

@ -13,6 +13,8 @@ from CarController import CarController
pg.init() pg.init()
font = pg.font.SysFont(None, 20)
screen = pg.display.set_mode((1280, 480), pg.SCALED) screen = pg.display.set_mode((1280, 480), pg.SCALED)
pg.display.set_caption("Traffic") pg.display.set_caption("Traffic")
@ -38,7 +40,7 @@ while running:
running = False running = False
carSurf.fill((0,0,0)) carSurf.fill((0,0,0))
m.draw(screen) m.draw(screen,debug=True,font=font)
cc.update() cc.update()
cc.draw(screen) cc.draw(screen)
pg.display.flip() pg.display.flip()

2
test3.rou.xml
View File

@ -45,7 +45,7 @@
<route edges="gneE19 gneE20 gneE21 gneE22 gneE23 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/> <route edges="gneE19 gneE20 gneE21 gneE22 gneE23 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_1" depart="0.00"> <vehicle id="vehicle_1" depart="0.00">
<route edges="gneE20 gneE21 gneE22 gneE23 gneE25 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/> <route edges="gneE20 gneE21 gneE22 gneE23 gneE25 gneE27 gneE28 gneE29 gneE30 gneE31" color="cyan"/>
</vehicle> </vehicle>
<vehicle id="vehicle_2" depart="0.00"> <vehicle id="vehicle_2" depart="0.00">
<route edges="gneE15 gneE16 gneE17 gneE18 gneE19 gneE20 gneE21 gneE22 gneE23 gneE24" color="cyan"/> <route edges="gneE15 gneE16 gneE17 gneE18 gneE19 gneE20 gneE21 gneE22 gneE23 gneE24" color="cyan"/>