diff --git a/Car.py b/Car.py
index 38934f7..e9091d9 100644
--- a/Car.py
+++ b/Car.py
@@ -170,6 +170,7 @@ class Car():
if(leader is None):
self.v = self.vmax
+ self.updateGraph(self.v, vmax, 0)
return
vleader=50#self.v
bleader=self.b
@@ -198,12 +199,17 @@ class Car():
self.v=max(0,vd)
+ self.updateGraph(self.v, vmax, vsec)
+
+ def updateGraph(self, v, vmax, vsec):
if self.infoWidg is None:
return
self.signals.addGraphPt.emit((2,self.controller.t,self.v))
self.signals.addGraphPt.emit((0,self.controller.t,vmax))
self.signals.addGraphPt.emit((1,self.controller.t,vsec))
+
+
def update(self,dt):
if self.controller.t < self.startTime:
return
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000..6d97a9c
Binary files /dev/null and b/logo.png differ
diff --git a/mainLoop.py b/mainLoop.py
index 890be5e..17e49d7 100644
--- a/mainLoop.py
+++ b/mainLoop.py
@@ -85,9 +85,9 @@ class mainLoop(QObject):
@threadSafe
def quickLoad(self):
- self.map.fromPath("test4.net.xml")
+ self.map.fromPath("test7.net.xml")
self.painter.generateTransform()
- self.controller.fromPath("test8.rou.xml")
+ self.controller.fromPath("test12.rou.xml")
self.controller.prepareRoute()
def updateFps(self):
diff --git a/test10.rou.xml b/test10.rou.xml
new file mode 100644
index 0000000..9affaf2
--- /dev/null
+++ b/test10.rou.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test11.rou.xml b/test11.rou.xml
new file mode 100644
index 0000000..fa850bc
--- /dev/null
+++ b/test11.rou.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test12.rou.xml b/test12.rou.xml
new file mode 100644
index 0000000..1a84b6f
--- /dev/null
+++ b/test12.rou.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test6.net.xml b/test6.net.xml
index 2f47b9e..1c27f6d 100644
--- a/test6.net.xml
+++ b/test6.net.xml
@@ -1,6 +1,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+