Merge branch 'master' of evefit.org:pyfa

This commit is contained in:
cncfanatics
2010-10-20 17:52:53 +02:00

View File

@@ -298,22 +298,34 @@ class PyGauge(wx.PyWindow):
c1 = map(lambda t: sum(t), zip(c1, (0,pv/3,-pv,0)))
c2 = map(lambda t: sum(t), zip(c2, (0,pv/3,-pv,0)))
else:
if pv <=102.5:
if pv <=101:
xv = pv -100
c1 = map(lambda t: sum(t), zip(c1, (0,100/3,-100,0)))
c1 = map(lambda t: sum(t), zip(c1, (xv*10,xv*10,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (xv*10,xv*20,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (0,100/3,-100,0)))
c2 = map(lambda t: sum(t), zip(c2, (xv*10,xv*10,0,0)))
elif pv <= 105:
xv = pv -102.5
c2 = map(lambda t: sum(t), zip(c2, (xv*10,xv*20,0,0)))
elif pv <= 103:
xv = pv -101
c1 = map(lambda t: sum(t), zip(c1, (0,100/3,-100,0)))
c1 = map(lambda t: sum(t), zip(c1, (2.5*10,2.5*10,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (xv*10,-xv*20,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (1*10,1*20,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (xv*30,-xv*30,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (0,100/3,-100,0)))
c2 = map(lambda t: sum(t), zip(c2, (2.5*10,2.5*10,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (xv*10,-xv*20,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (1*10,1*20,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (xv*30,-xv*30,0,0)))
elif pv <= 105:
xv = pv -103
c1 = map(lambda t: sum(t), zip(c1, (0,100/3,-100,0)))
c1 = map(lambda t: sum(t), zip(c1, (1*10,1*20,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (2*30,-2*30,0,0)))
c1 = map(lambda t: sum(t), zip(c1, (xv*10,-xv*30,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (0,100/3,-100,0)))
c2 = map(lambda t: sum(t), zip(c2, (1*10,1*20,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (2*30,-2*30,0,0)))
c2 = map(lambda t: sum(t), zip(c2, (xv*10,-xv*30,0,0)))
else:
pv = 106