|
@@ -119,19 +119,19 @@ class OSZI():
|
|
|
def __init__(self):
|
|
|
self._x=0
|
|
|
self.sdata={}
|
|
|
- self.lz = time.time()
|
|
|
+ self.lz = 0
|
|
|
self.c=0
|
|
|
|
|
|
def draw_graph(self,screen,oszi_data,univ=0,NR2=0,label="ABCDEFGHIJK"):
|
|
|
x=int(self._x)
|
|
|
|
|
|
if time.time() > self.lz:
|
|
|
- self.lz = time.time()+6
|
|
|
+ self.lz = time.time()+7.5
|
|
|
self._x=0
|
|
|
x=0
|
|
|
|
|
|
- rec = pygame.Rect(x+1,T.get_y(10),30,245) # clear balken
|
|
|
- pygame.draw.rect(screen,(10,10,0),rec)
|
|
|
+ #rec = pygame.Rect(x+1,T.get_y(10),30,245) # clear balken
|
|
|
+ #pygame.draw.rect(screen,(10,10,0),rec)
|
|
|
|
|
|
|
|
|
T.y=-260
|
|
@@ -142,11 +142,15 @@ class OSZI():
|
|
|
pygame.gfxdraw.pixel(screen,x,T.get_y(255),(255,0,0))
|
|
|
pygame.gfxdraw.pixel(screen,x,T.get_y(0),(10,10,25))
|
|
|
|
|
|
- rec = pygame.Rect(x+4,T.get_y(0),20,-80) # clear balken
|
|
|
- pygame.draw.rect(screen,(c,210,110),rec)
|
|
|
- rec = pygame.Rect(x+2,T.get_y(0),30,-80) # clear balken
|
|
|
- pygame.draw.rect(screen,(c,10,110),rec)
|
|
|
- text = font.render( str(y), True, (0,0,0))
|
|
|
+ #rec = pygame.Rect(x+4,T.get_y(0),20,-80) # clear balken
|
|
|
+ #pygame.draw.rect(screen,(c,210,110),rec)
|
|
|
+
|
|
|
+ rec = pygame.Rect(x+2,T.get_y(250),20,80) # clear balken
|
|
|
+ pygame.draw.rect(screen,(10,10,10),rec)
|
|
|
+ rec = pygame.Rect(x+4,T.get_y(235),20,70) # clear balken
|
|
|
+ pygame.draw.rect(screen,(110,110,110),rec)
|
|
|
+
|
|
|
+ #text = font.render( str(y), True, (0,0,0))
|
|
|
|
|
|
pygame.draw.circle(screen,(255,155,0),(x,T.get_y(y)),1)
|
|
|
|