opti
This commit is contained in:
parent
b69367ecde
commit
ef5ecad22e
@ -14,20 +14,33 @@ class carInfo(QWidget):
|
|||||||
self.maxV = 0
|
self.maxV = 0
|
||||||
|
|
||||||
self.chart = self.ui.speedGraph.chart()
|
self.chart = self.ui.speedGraph.chart()
|
||||||
|
#self.chart.setAnimationOptions(QChart.AllAnimations)
|
||||||
|
|
||||||
speedsNames = ["vmax","vsec","Vitesse (m.s^-1)"]
|
speedsNames = ["vmax","vsec","Vitesse (m.s^-1)"]
|
||||||
self.speedSeries = []
|
self.speedSeries = []
|
||||||
for ind,s in enumerate(speedsNames):
|
for ind,s in enumerate(speedsNames):
|
||||||
self.speedSeries.append(QLineSeries())
|
self.speedSeries.append(QLineSeries())
|
||||||
self.speedSeries[ind].setName(s)
|
self.speedSeries[ind].setName(s)
|
||||||
|
# self.speedSeries[ind].setPointsVisible()
|
||||||
self.chart.addSeries(self.speedSeries[ind])
|
self.chart.addSeries(self.speedSeries[ind])
|
||||||
self.chart.createDefaultAxes()
|
self.chart.createDefaultAxes()
|
||||||
|
|
||||||
def addSpeedPoint(self,ind,t,val):
|
def addSpeedPoint(self,ind,t,val):
|
||||||
if(t>500):
|
if(self.speedSeries[ind].count()>1 and self.speedSeries[ind].at(1).x()<t-500):
|
||||||
self.speedSeries[ind].remove(0)
|
self.speedSeries[ind].remove(0)
|
||||||
self.speedSeries[ind].append(t,val)
|
self.speedSeries[ind].append(t,val)
|
||||||
|
|
||||||
|
if(self.speedSeries[ind].count()>2):
|
||||||
|
i = self.speedSeries[ind].count()-1
|
||||||
|
pm2 = self.speedSeries[ind].at(i-2)
|
||||||
|
pm1 = self.speedSeries[ind].at(i-1)
|
||||||
|
pm0 = self.speedSeries[ind].at(i)
|
||||||
|
diffL = (pm1.y() - pm2.y())/(pm1.x() - pm2.x())
|
||||||
|
diffR = (pm0.y() - pm1.y())/(pm0.x() - pm1.x())
|
||||||
|
diff2 = diffR - diffL
|
||||||
|
if(diff2 == 0):
|
||||||
|
self.speedSeries[ind].remove(i-1)
|
||||||
|
|
||||||
xAxis = self.chart.axes(Qt.Horizontal,self.speedSeries[ind])[0]
|
xAxis = self.chart.axes(Qt.Horizontal,self.speedSeries[ind])[0]
|
||||||
xAxis.setRange(max(t-500,0),t)
|
xAxis.setRange(max(t-500,0),t)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user