la propriétée "depart" est maintenant respectée
This commit is contained in:
parent
237bf6c2b9
commit
a624ba4b17
7
Car.py
7
Car.py
@ -35,7 +35,7 @@ class Car():
|
||||
|
||||
#print(f"{self.id} : {startEdge.getID()} -> {nextEdge.getID()} via {laneId}")
|
||||
|
||||
def __init__(self,carID,route,parentMap,parentController,infoWidg):
|
||||
def __init__(self,carID,route,startTime,parentMap,parentController,infoWidg):
|
||||
self.id=carID
|
||||
self.map=parentMap
|
||||
self.controller=parentController
|
||||
@ -46,6 +46,8 @@ class Car():
|
||||
self.laneShape=None
|
||||
self.laneId=0
|
||||
self.leader=None
|
||||
self.startTime=float(startTime)
|
||||
|
||||
self.signals=updateSignals()
|
||||
self.signals.updateDisp.connect(self.infoWidg.setVal)
|
||||
self.signals.addGraphPt.connect(self.infoWidg.addSpeedPoint)
|
||||
@ -166,6 +168,9 @@ class Car():
|
||||
self.signals.addGraphPt.emit((1,self.controller.t,vsec))
|
||||
|
||||
def update(self,dt):
|
||||
if self.controller.t < self.startTime:
|
||||
return
|
||||
|
||||
self.leader=self.getLeader(100)
|
||||
|
||||
self.conduite(self.vmax,self.leader,dt)
|
||||
|
@ -84,7 +84,7 @@ class CarController:
|
||||
for vehicle in sumolib.xml.parse(path,"vehicle"):
|
||||
route=vehicle.route[0].edges.split()
|
||||
wId=self.infoWidget.addItem(carInfo(self.infoWidget), vehicle.id)
|
||||
self.cars.append(Car(vehicle.id,route,self.map,self,self.infoWidget.widget(wId)))
|
||||
self.cars.append(Car(vehicle.id,route,vehicle.depart,self.map,self,self.infoWidget.widget(wId)))
|
||||
|
||||
def prepareRoute(self):
|
||||
for car in self.cars:
|
||||
@ -100,7 +100,7 @@ class CarController:
|
||||
def update(self):
|
||||
if self.map.net is None:
|
||||
return
|
||||
self.t+=1
|
||||
self.t+=1/60
|
||||
for car in self.cars:
|
||||
car.update(1.0/60)
|
||||
|
||||
|
@ -44,22 +44,22 @@
|
||||
<vehicle id="vehicle_0" depart="0.00">
|
||||
<route edges="gneE13 gneE16 gneE19 gneE22 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_1" depart="0.00">
|
||||
<vehicle id="vehicle_1" depart="1.00">
|
||||
<route edges="gneE13 gneE16 gneE26 gneE20 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_2" depart="0.00">
|
||||
<vehicle id="vehicle_2" depart="2.00">
|
||||
<route edges="gneE13 gneE24 gneE17 gneE20 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_3" depart="0.00">
|
||||
<vehicle id="vehicle_3" depart="3.00">
|
||||
<route edges="gneE14 gneE17 gneE20 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_4" depart="0.00">
|
||||
<vehicle id="vehicle_4" depart="4.00">
|
||||
<route edges="gneE14 gneE28 gneE18 gneE21 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_5" depart="0.00">
|
||||
<vehicle id="vehicle_5" depart="5.00">
|
||||
<route edges="gneE14 gneE17 gneE27 gneE21 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
<vehicle id="vehicle_6" depart="0.00">
|
||||
<vehicle id="vehicle_6" depart="6.00">
|
||||
<route edges="gneE15 gneE18 gneE21 gneE23 gneE31" color="cyan"/>
|
||||
</vehicle>
|
||||
</routes>
|
||||
|
Loading…
x
Reference in New Issue
Block a user